Apply supplied fix for change of camera

dceejay · dceejay · commit 8a9f4dbd96a9 · 2025-01-20T09:57:20.000Z
To fix issue #82
diff --git a/node-red-node-ui-webcam/package.json b/node-red-node-ui-webcam/package.json
@@ -1,6 +1,6 @@
 {
     "name": "node-red-node-ui-webcam",
-    "version": "0.4.0",
+    "version": "0.5.0",
     "description": "A Node-RED ui node to capture images from a webcam.",
     "author": "Nick O'Leary",
     "license": "Apache-2.0",
diff --git a/node-red-node-ui-webcam/ui_webcam.js b/node-red-node-ui-webcam/ui_webcam.js
@@ -383,16 +383,25 @@ module.exports = function(RED) {
                         $scope.$watch('msg', function(msg) {
                             if (!msg) { return; }
                             if (msg.camera !== undefined) {
-                                if (!isNaN(parseInt(msg.camera))) {
-                                    var c = parseInt(msg.camera);
-                                    if (c >= 0 || c < 16) {
-                                        oldActiveCamera = activeCamera;
-                                        $scope.disableCamera();
-                                        activeCamera = null;
-                                        window.localStorage.setItem("node-red-node-ui-webcam-activeCam",c);
-                                        if (active !== false) {
-                                            $scope.enableCamera();
-                                        }
+                                let c = parseInt(msg.camera);
+                                if (!isNaN(c)) {
+                                    // Check if cameras array is populated
+                                    if ($scope.data.cameras && $scope.data.cameras.length > c) {
+                                        $scope.changeCamera(c);
+                                    } else {
+                                        // Enumerate devices first, then change camera
+                                        navigator.mediaDevices.enumerateDevices().then(function(devices) {
+                                            $scope.data.cameras = devices.filter(function(device) {
+                                                return device.kind === "videoinput";
+                                            });
+                                            if (c >= 0 && c < $scope.data.cameras.length) {
+                                                $scope.changeCamera(c);
+                                            } else {
+                                                console.warn("Camera index out of range:", c);
+                                            }
+                                        }).catch(function(err) {
+                                            console.error("Error enumerating devices:", err);
+                                        });
                                     }
                                 }
                             }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "node-red-node-ui-webcam",`
`3`		`- "version": "0.4.0",`
	`3`	`+ "version": "0.5.0",`
`4`	`4`	`"description": "A Node-RED ui node to capture images from a webcam.",`
`5`	`5`	`"author": "Nick O'Leary",`
`6`	`6`	`"license": "Apache-2.0",`