Use enum instead of boolean for CPULevel

MozillaReality · Apr 8, 2019 · cf41265 · cf41265
1 parent 6cbf070
commit cf41265
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java b/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java
@@ -68,6 +68,7 @@
 import java.util.HashMap;
 import java.util.LinkedList;
 
+import androidx.annotation.IntDef;
 import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
 
@@ -767,7 +768,7 @@ public void addWidgets(final Iterable<Widget> aWidgets) {
     // VideoAvailabilityListener
     @Override
     public void onVideoAvailabilityChanged(boolean aVideosAvailable) {
-        queueRunnable(() -> setCPULevelNative(aVideosAvailable));
+        queueRunnable(() -> setCPULevelNative(aVideosAvailable ? CPU_LEVEL_HIGH : CPU_LEVEL_NORMAL));
     }
 
     // WidgetManagerDelegate
@@ -1036,6 +1037,13 @@ public void setCylinderDensity(final float aDensity) {
     private native void setControllersVisibleNative(boolean aVisible);
     private native void runCallbackNative(long aCallback);
     private native void setCylinderDensityNative(float aDensity);
-    private native void setCPULevelNative(boolean aHighLevel);
+    private native void setCPULevelNative(@CPULevelFlags int aCPULevel);
     private native void setIsServo(boolean aIsServo);
+
+
+    @IntDef(value = { CPU_LEVEL_NORMAL, CPU_LEVEL_HIGH})
+    private @interface CPULevelFlags {}
+
+    private static final int CPU_LEVEL_NORMAL = 0;
+    private static final int CPU_LEVEL_HIGH = 1;
 }
diff --git a/app/src/main/cpp/BrowserWorld.cpp b/app/src/main/cpp/BrowserWorld.cpp
@@ -954,8 +954,8 @@ BrowserWorld::SetCylinderDensity(const float aDensity) {
 }
 
 void
-BrowserWorld::SetCPULevel(const bool aHighLevel) {
-  m.device->SetCPULevel(aHighLevel ? device::CPULevel::High : device::CPULevel::Normal);
+BrowserWorld::SetCPULevel(const device::CPULevel aLevel) {
+  m.device->SetCPULevel(aLevel);
 }
 
 void
@@ -1343,8 +1343,8 @@ JNI_METHOD(void, runCallbackNative)
 }
 
 JNI_METHOD(void, setCPULevelNative)
-(JNIEnv* aEnv, jobject, jboolean aHighLevel) {
-  crow::BrowserWorld::Instance().SetCPULevel(aHighLevel);
+(JNIEnv* aEnv, jobject, int aCPULevel) {
+  crow::BrowserWorld::Instance().SetCPULevel(static_cast<crow::device::CPULevel>(aCPULevel));
 }
 
 JNI_METHOD(void, setIsServo)

diff --git a/app/src/main/cpp/BrowserWorld.h b/app/src/main/cpp/BrowserWorld.h
@@ -57,7 +57,7 @@ class BrowserWorld {
   void ResetUIYaw();
   void SetCylinderDensity(const float aDensity);
   void SetIsServo(const bool aIsServo);
-  void SetCPULevel(const bool aHighLevel);
+  void SetCPULevel(const device::CPULevel aLevel);
   JNIEnv* GetJNIEnv() const;
 protected:
   struct State;

diff --git a/app/src/main/cpp/Device.h b/app/src/main/cpp/Device.h
@@ -19,7 +19,7 @@ const CapabilityFlags MountDetection = 1 << 8;
 const CapabilityFlags PositionEmulated = 1 << 9;
 enum class Eye { Left, Right };
 enum class RenderMode { StandAlone, Immersive };
-enum class CPULevel { Normal, High };
+enum class CPULevel { Normal = 0, High };
 const int32_t EyeCount = 2;
 inline int32_t EyeIndex(const Eye aEye) { return aEye == Eye::Left ? 0 : 1; }