chore(blink): use new errors for play and pause

Satellite-im · Nov 2, 2023 · d5ba221 · d5ba221
1 parent b83dec4
commit d5ba221
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 21 deletions.
diff --git a/extensions/warp-blink-wrtc/src/host_media/audio/opus/sink/mod.rs b/extensions/warp-blink-wrtc/src/host_media/audio/opus/sink/mod.rs
@@ -188,17 +188,18 @@ impl SinkTrack for OpusSink {
 
     fn play(&self) -> Result<(), Error> {
         *self.muted.write() = false;
-        self.stream
-            .play()
-            .map_err(|x| Error::OtherWithContext(x.to_string()))?;
-        Ok(())
+        self.stream.play().map_err(|err| match err {
+            cpal::PlayStreamError::DeviceNotAvailable => Error::AudioDeviceDisconnected,
+            _ => Error::OtherWithContext(err.to_string()),
+        })
     }
+
     fn pause(&self) -> Result<(), Error> {
         *self.muted.write() = true;
-        self.stream
-            .pause()
-            .map_err(|x| Error::OtherWithContext(x.to_string()))?;
-        Ok(())
+        self.stream.pause().map_err(|err| match err {
+            cpal::PauseStreamError::DeviceNotAvailable => Error::AudioDeviceDisconnected,
+            _ => Error::OtherWithContext(err.to_string()),
+        })
     }
     fn change_output_device(
         &mut self,
@@ -219,9 +220,10 @@ impl SinkTrack for OpusSink {
         )?;
         *self = new_sink;
         if !*self.muted.read() {
-            self.stream
-                .play()
-                .map_err(|x| Error::OtherWithContext(x.to_string()))?;
+            self.stream.play().map_err(|err| match err {
+                cpal::PlayStreamError::DeviceNotAvailable => Error::AudioDeviceDisconnected,
+                _ => Error::OtherWithContext(err.to_string()),
+            })?;
         }
 
         Ok(())

diff --git a/extensions/warp-blink-wrtc/src/host_media/audio/opus/source/mod.rs b/extensions/warp-blink-wrtc/src/host_media/audio/opus/source/mod.rs
@@ -83,16 +83,18 @@ impl SourceTrack for OpusSource {
     }
 
     fn play(&self) -> Result<(), Error> {
-        self.stream
-            .play()
-            .map_err(|x| Error::OtherWithContext(x.to_string()))?;
+        self.stream.play().map_err(|err| match err {
+            cpal::PlayStreamError::DeviceNotAvailable => Error::AudioDeviceDisconnected,
+            _ => Error::OtherWithContext(err.to_string()),
+        })?;
         *self.muted.write() = false;
         Ok(())
     }
     fn pause(&self) -> Result<(), Error> {
-        self.stream
-            .pause()
-            .map_err(|x| Error::OtherWithContext(x.to_string()))?;
+        self.stream.pause().map_err(|err| match err {
+            cpal::PauseStreamError::DeviceNotAvailable => Error::AudioDeviceDisconnected,
+            _ => Error::OtherWithContext(err.to_string()),
+        })?;
         *self.muted.write() = true;
         Ok(())
     }
@@ -118,9 +120,10 @@ impl SourceTrack for OpusSource {
         self.stream = stream;
         self.packetizer_handle = handle;
         if !*self.muted.read() {
-            self.stream
-                .play()
-                .map_err(|x| Error::OtherWithContext(x.to_string()))?;
+            self.stream.play().map_err(|err| match err {
+                cpal::PlayStreamError::DeviceNotAvailable => Error::AudioDeviceDisconnected,
+                _ => Error::OtherWithContext(err.to_string()),
+            })?;
         }
         Ok(())
     }

diff --git a/warp/src/error.rs b/warp/src/error.rs
@@ -215,8 +215,10 @@ pub enum Error {
     InvalidDataType,
 
     //Blink Errors
-    #[error("Device not found")]
+    #[error("Audio device not found")]
     AudioDeviceNotFound,
+    #[error("AudioDeviceDisconnected")]
+    AudioDeviceDisconnected,
     // indicates a problem enumerating audio I/O devices
     #[error("AudioHostError: {_0}")]
     AudioHostError(String),