diff --git a/Main/src/main/java/com/chameleonvision/settings/SettingsManager.java b/Main/src/main/java/com/chameleonvision/settings/SettingsManager.java index 2309d9be7..db73c36c7 100644 --- a/Main/src/main/java/com/chameleonvision/settings/SettingsManager.java +++ b/Main/src/main/java/com/chameleonvision/settings/SettingsManager.java @@ -93,8 +93,9 @@ public class SettingsManager { private void InitiateUsbCameras() { for (Map.Entry entry : USBCamerasInfo.entrySet()) { var device = entry.getValue(); - var camera = new UsbCamera(device.name, device.dev); - UsbCameras.put(device.name, camera); + var name = entry.getKey(); + UsbCamera camera = new UsbCamera(name, device.dev); + UsbCameras.put(name, camera); } } @@ -222,27 +223,6 @@ public class SettingsManager { } - public void SetCameraSettings(String cameraName, String field, Object value) { - switch (field) { - case "brightness": - UsbCameras.get(cameraName).setBrightness((int) value); - break; - case "exposure": - UsbCameras.get(cameraName).setExposureManual((int) value); - break; - case "resolution": - VideoMode videoMode = UsbCameras.get(cameraName).enumerateVideoModes()[(int) value]; - Camera cam = Cameras.get(cameraName); - cam.camVideoMode.height = videoMode.height; - cam.camVideoMode.width = videoMode.width; - cam.camVideoMode.fps = videoMode.fps; - //cam.camVideoMode.pixel_format=videoMode.pixelFormat.toString().split(".")[1];//legacy from python - cam.camVideoMode.pixel_format = videoMode.pixelFormat.toString(); - break; - } - - } - //Savers public void SaveSettings() { SaveCameras(); diff --git a/Main/src/main/java/com/chameleonvision/web/Server.java b/Main/src/main/java/com/chameleonvision/web/Server.java index fef7c6bcf..42c61c665 100644 --- a/Main/src/main/java/com/chameleonvision/web/Server.java +++ b/Main/src/main/java/com/chameleonvision/web/Server.java @@ -69,7 +69,6 @@ public class Server { int newResolution = (int) value; System.out.printf("Changing resolution mode to %d\n", newResolution); SettingsManager.getInstance().GetCurrentCamera().resolution = newResolution; - SettingsManager.getInstance().SetCameraSettings(SettingsManager.GeneralSettings.curr_camera, "resolution", newResolution); SettingsManager.getInstance().SaveSettings(); break; case "fov":