Merge branch 'main' into release/2.5.0-hotfix.1

Author: cloudwebrtc

example/web/e2ee.worker.dart.js

@@ -1101,17 +1101,17 @@ extension RoomHardwareManagementMethods on Room {
     final currentDeviceId =
         engine.roomOptions.defaultCameraCaptureOptions.deviceId;
 
-    // Always update roomOptions so future tracks use the correct device
-    engine.roomOptions = engine.roomOptions.copyWith(
-      defaultCameraCaptureOptions: roomOptions.defaultCameraCaptureOptions
-          .copyWith(deviceId: device.deviceId),
-    );
-
     try {
       if (track != null && selectedVideoInputDeviceId != device.deviceId) {
         await track.switchCamera(device.deviceId);
         Hardware.instance.selectedVideoInput = device;
       }
+
+      // Always update roomOptions so future tracks use the correct device
+      engine.roomOptions = engine.roomOptions.copyWith(
+        defaultCameraCaptureOptions: roomOptions.defaultCameraCaptureOptions
+            .copyWith(deviceId: device.deviceId),
+      );
     } catch (e) {
       // if the switching actually fails, reset it to the previous deviceId
       engine.roomOptions = engine.roomOptions.copyWith(

example/web/e2ee.worker.dart.js.map

@@ -11,6 +11,8 @@ project(${PROJECT_NAME} LANGUAGES CXX C)
 # not be changed.
 set(PLUGIN_NAME "livekit_client_plugin")
 
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 add_definitions(-D_USE_MATH_DEFINES)
 add_definitions(-DRTC_DESKTOP_DEVICE)