fix

instrumentisto · Oct 20, 2023 · c8a2be1 · c8a2be1
1 parent 339fb57
commit c8a2be1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 16 deletions.
diff --git a/src/media/constraints.rs b/src/media/constraints.rs
@@ -997,10 +997,7 @@ impl AudioTrackConstraints {
     ) -> bool {
         let track = track.as_ref();
         satisfies_track(track, MediaKind::Audio).await
-            && ConstrainString::satisfies(
-                &self.device_id,
-                &Some(track.device_id()),
-            )
+            && ConstrainString::satisfies(&self.device_id, &track.device_id())
         // TODO returns Result<bool, Error>
     }
 
@@ -1213,10 +1210,7 @@ impl DeviceVideoTrackConstraints {
     ) -> bool {
         let track = track.as_ref();
         satisfies_track(track, MediaKind::Video).await
-            && ConstrainString::satisfies(
-                &self.device_id,
-                &Some(track.device_id()),
-            )
+            && ConstrainString::satisfies(&self.device_id, &track.device_id())
             && ConstrainString::satisfies(
                 &self.facing_mode,
                 &track.facing_mode(),
@@ -1301,10 +1295,7 @@ impl DisplayVideoTrackConstraints {
     ) -> bool {
         let track = track.as_ref();
         satisfies_track(track, MediaKind::Video).await
-            && ConstrainString::satisfies(
-                &self.device_id,
-                &Some(track.device_id()),
-            )
+            && ConstrainString::satisfies(&self.device_id, &track.device_id())
             && ConstrainU32::satisfies(self.height, track.height())
             && ConstrainU32::satisfies(self.width, track.width())
             && track.guess_is_from_display()

diff --git a/src/platform/dart/media_track.rs b/src/platform/dart/media_track.rs
@@ -163,10 +163,10 @@ impl MediaStreamTrack {
     /// [1]: https://w3.org/TR/mediacapture-streams#dfn-deviceid
     #[inline]
     #[must_use]
-    pub fn device_id(&self) -> String {
+    pub fn device_id(&self) -> Option<String> {
         let device_id =
             unsafe { media_stream_track::device_id(self.inner.get()) };
-        unsafe { dart_string_into_rust(device_id) }
+        Some(unsafe { dart_string_into_rust(device_id) })
     }
 
     /// Returns [kind][1] of this [`MediaStreamTrack`].

diff --git a/src/platform/wasm/media_track.rs b/src/platform/wasm/media_track.rs
@@ -116,12 +116,11 @@ impl MediaStreamTrack {
     /// [1]: https://tinyurl.com/w3-streams#dom-mediatracksettings-deviceid
     /// [2]: https://w3.org/TR/mediacapture-streams#mediastreamtrack
     #[must_use]
-    pub fn device_id(&self) -> String {
+    pub fn device_id(&self) -> Option<String> {
         #[allow(clippy::unwrap_used)]
         get_property_by_name(&self.sys_track.get_settings(), "deviceId", |v| {
             v.as_string()
         })
-        .unwrap()
     }
 
     /// Return a [`facingMode`][1] of the underlying [MediaStreamTrack][2].