refactor(core): rename camera setter/getter to cameraId

ThibaultBee · Nov 30, 2024 · eb99947 · eb99947
1 parent 0d1e69b
commit eb99947
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/core/src/main/java/io/github/thibaultbee/streampack/core/streamers/DefaultCameraStreamer.kt b/core/src/main/java/io/github/thibaultbee/streampack/core/streamers/DefaultCameraStreamer.kt
@@ -86,7 +86,7 @@ open class DefaultCameraStreamer(
      * Get/Set current camera id.
      * It is a shortcut for [CameraSource.cameraId]
      */
-    override var camera: String
+    override var cameraId: String
         /**
          * Get current camera id.
          *

diff --git a/...o/github/thibaultbee/streampack/core/streamers/callbacks/DefaultCameraCallbackStreamer.kt b/...o/github/thibaultbee/streampack/core/streamers/callbacks/DefaultCameraCallbackStreamer.kt
@@ -45,7 +45,7 @@ class DefaultCameraCallbackStreamer(
      * Get/Set current camera id.
      * It is a shortcut for [CameraSource.cameraId]
      */
-    override var camera: String
+    override var cameraId: String
         /**
          * Get current camera id.
          *

diff --git a/...c/main/java/io/github/thibaultbee/streampack/core/streamers/interfaces/ICameraStreamer.kt b/...c/main/java/io/github/thibaultbee/streampack/core/streamers/interfaces/ICameraStreamer.kt
@@ -34,7 +34,7 @@ interface ICameraStreamer {
      * Gets/Sets current camera id.
      * It is a shortcut for [videoSource.cameraId].
      */
-    var camera: String
+    var cameraId: String
 
     /**
      * Sets a preview surface.

diff --git a/demos/camera/src/main/java/io/github/thibaultbee/streampack/app/utils/StreamerManager.kt b/demos/camera/src/main/java/io/github/thibaultbee/streampack/app/utils/StreamerManager.kt
@@ -253,13 +253,13 @@ class StreamerManager(
         if (streamer is ICameraStreamer) {
             val streamer = (streamer as ICameraStreamer)
             // Handle devices with only one camera
-            val cameras = if (context.isBackCamera(streamer.camera)) {
+            val cameras = if (context.isBackCamera(streamer.cameraId)) {
                 context.frontCameras
             } else {
                 context.backCameras
             }
             if (cameras.isNotEmpty()) {
-                streamer.camera = cameras[0]
+                streamer.cameraId = cameras[0]
             }
         }
     }

diff --git a/ui/src/main/java/io/github/thibaultbee/streampack/ui/views/PreviewView.kt b/ui/src/main/java/io/github/thibaultbee/streampack/ui/views/PreviewView.kt
@@ -303,7 +303,7 @@ class PreviewView @JvmOverloads constructor(
     private suspend fun setPreview(
         streamer: ICameraStreamer,
         targetViewSize: Size,
-    ) = setPreviewInternal(streamer, streamer.camera, targetViewSize)
+    ) = setPreviewInternal(streamer, streamer.cameraId, targetViewSize)
 
     private suspend fun setPreviewInternal(
         streamer: ICameraStreamer, camera: String, targetViewSize: Size

diff --git a/ui/src/main/java/io/github/thibaultbee/streampack/ui/views/StreamerExtensions.kt b/ui/src/main/java/io/github/thibaultbee/streampack/ui/views/StreamerExtensions.kt
@@ -44,7 +44,7 @@ suspend fun ICameraCoroutineStreamer.setPreview(
     previewSize: Size
 ): ViewfinderSurfaceRequest {
     val builder = ViewfinderSurfaceRequest.Builder(previewSize)
-    val cameraCharacteristics = viewfinder.context.getCameraCharacteristics(camera)
+    val cameraCharacteristics = viewfinder.context.getCameraCharacteristics(cameraId)
     val request = builder.populateFromCharacteristics(cameraCharacteristics).build()
     setPreview(viewfinder.requestSurface(request))
     return request
@@ -61,7 +61,7 @@ fun ICameraCallbackStreamer.startPreview(
     viewfinder: CameraViewfinder,
     previewSize: Size
 ): ViewfinderSurfaceRequest {
-    val cameraCharacteristics = viewfinder.context.getCameraCharacteristics(camera)
+    val cameraCharacteristics = viewfinder.context.getCameraCharacteristics(cameraId)
     return executeSurfaceRequest(
         viewfinder.context,
         viewfinder,
@@ -83,7 +83,7 @@ fun ICameraCallbackStreamer.setPreview(
     viewfinder: CameraViewfinder,
     previewSize: Size
 ): ViewfinderSurfaceRequest {
-    val cameraCharacteristics = viewfinder.context.getCameraCharacteristics(camera)
+    val cameraCharacteristics = viewfinder.context.getCameraCharacteristics(cameraId)
     return executeSurfaceRequest(
         viewfinder.context,
         viewfinder,