diff --git a/examples/audio_decoder.rs b/examples/audio_decoder.rs index dc246f7b..3dbafe59 100644 --- a/examples/audio_decoder.rs +++ b/examples/audio_decoder.rs @@ -86,9 +86,7 @@ fn run_example(servo_media: Arc) { fn main() { ServoMedia::init::(); - if let Ok(servo_media) = ServoMedia::get() { - run_example(servo_media); - } else { - unreachable!() - } + let servo_media = ServoMedia::get(); + run_example(servo_media); + } diff --git a/examples/audioinput_stream.rs b/examples/audioinput_stream.rs index 4fc0ff61..e2ac5435 100644 --- a/examples/audioinput_stream.rs +++ b/examples/audioinput_stream.rs @@ -17,9 +17,6 @@ fn run_example(servo_media: Arc) { fn main() { ServoMedia::init::(); - if let Ok(servo_media) = ServoMedia::get() { - run_example(servo_media); - } else { - unreachable!(); - } + let servo_media = ServoMedia::get(); + run_example(servo_media); } diff --git a/examples/biquad.rs b/examples/biquad.rs index 5a63f47c..149937a8 100644 --- a/examples/biquad.rs +++ b/examples/biquad.rs @@ -65,9 +65,6 @@ fn run_example(servo_media: Arc) { fn main() { ServoMedia::init::(); - if let Ok(servo_media) = ServoMedia::get() { - run_example(servo_media); - } else { - unreachable!(); - } + let servo_media = ServoMedia::get(); + run_example(servo_media); } diff --git a/examples/channels.rs b/examples/channels.rs index 57336a57..065266a1 100644 --- a/examples/channels.rs +++ b/examples/channels.rs @@ -53,9 +53,6 @@ fn run_example(servo_media: Arc) { fn main() { ServoMedia::init::(); - if let Ok(servo_media) = ServoMedia::get() { - run_example(servo_media); - } else { - unreachable!(); - } + let servo_media = ServoMedia::get(); + run_example(servo_media); } diff --git a/examples/channelsum.rs b/examples/channelsum.rs index ad2c2dd7..3e49be2a 100644 --- a/examples/channelsum.rs +++ b/examples/channelsum.rs @@ -64,9 +64,6 @@ fn run_example(servo_media: Arc) { fn main() { ServoMedia::init::(); - if let Ok(servo_media) = ServoMedia::get() { - run_example(servo_media); - } else { - unreachable!(); - } + let servo_media = ServoMedia::get(); + run_example(servo_media); } diff --git a/examples/constant_source.rs b/examples/constant_source.rs index 8b353a72..1c1cc8ad 100644 --- a/examples/constant_source.rs +++ b/examples/constant_source.rs @@ -91,9 +91,6 @@ fn run_example(servo_media: Arc) { fn main() { ServoMedia::init::(); - if let Ok(servo_media) = ServoMedia::get() { - run_example(servo_media); - } else { - unreachable!(); - } + let servo_media = ServoMedia::get(); + run_example(servo_media); } diff --git a/examples/dummy.rs b/examples/dummy.rs index 5feac9e6..fdcacb8a 100644 --- a/examples/dummy.rs +++ b/examples/dummy.rs @@ -6,5 +6,5 @@ use servo_media_dummy::DummyBackend; fn main() { ServoMedia::init::(); - ServoMedia::get().expect("couldn't create a dummy backend?"); + ServoMedia::get(); } diff --git a/examples/iir_filter.rs b/examples/iir_filter.rs index 08229c6d..6b19745e 100644 --- a/examples/iir_filter.rs +++ b/examples/iir_filter.rs @@ -76,9 +76,6 @@ fn run_example(servo_media: Arc) { fn main() { ServoMedia::init::(); - if let Ok(servo_media) = ServoMedia::get() { - run_example(servo_media); - } else { - unreachable!(); - } + let servo_media = ServoMedia::get(); + run_example(servo_media); } diff --git a/examples/media_element_source_node.rs b/examples/media_element_source_node.rs index b2507b44..511fabb2 100644 --- a/examples/media_element_source_node.rs +++ b/examples/media_element_source_node.rs @@ -314,9 +314,6 @@ fn run_example(servo_media: Arc) { fn main() { ServoMedia::init::(); - if let Ok(servo_media) = ServoMedia::get() { - run_example(servo_media); - } else { - unreachable!(); - } + let servo_media = ServoMedia::get(); + run_example(servo_media); } diff --git a/examples/muted_audiocontext.rs b/examples/muted_audiocontext.rs index cff9a60d..0a560b88 100644 --- a/examples/muted_audiocontext.rs +++ b/examples/muted_audiocontext.rs @@ -82,9 +82,6 @@ fn run_example(servo_media: Arc) { fn main() { ServoMedia::init::(); - if let Ok(servo_media) = ServoMedia::get() { - run_example(servo_media); - } else { - unreachable!(); - } + let servo_media = ServoMedia::get(); + run_example(servo_media); } diff --git a/examples/muted_player.rs b/examples/muted_player.rs index debc6015..61944afe 100644 --- a/examples/muted_player.rs +++ b/examples/muted_player.rs @@ -127,7 +127,6 @@ fn run_example(servo_media: Arc) { fn main() { ServoMedia::init::(); - if let Ok(servo_media) = ServoMedia::get() { - run_example(servo_media); - } + let servo_media = ServoMedia::get(); + run_example(servo_media); } diff --git a/examples/offline_context.rs b/examples/offline_context.rs index 5b1e1743..1ce35cd7 100644 --- a/examples/offline_context.rs +++ b/examples/offline_context.rs @@ -76,9 +76,6 @@ fn run_example(servo_media: Arc) { fn main() { ServoMedia::init::(); - if let Ok(servo_media) = ServoMedia::get() { - run_example(servo_media); - } else { - unreachable!() - } + let servo_media = ServoMedia::get(); + run_example(servo_media); } diff --git a/examples/oscillator.rs b/examples/oscillator.rs index 7e4b89b8..bc106c60 100644 --- a/examples/oscillator.rs +++ b/examples/oscillator.rs @@ -126,9 +126,6 @@ fn run_example(servo_media: Arc) { fn main() { ServoMedia::init::(); - if let Ok(servo_media) = ServoMedia::get() { - run_example(servo_media); - } else { - unreachable!(); - } + let servo_media = ServoMedia::get(); + run_example(servo_media); } diff --git a/examples/panner.rs b/examples/panner.rs index 913be90b..bd3d818a 100644 --- a/examples/panner.rs +++ b/examples/panner.rs @@ -176,9 +176,6 @@ fn run_example(servo_media: Arc) { fn main() { ServoMedia::init::(); - if let Ok(servo_media) = ServoMedia::get() { - run_example(servo_media); - } else { - unreachable!(); - } + let servo_media = ServoMedia::get(); + run_example(servo_media); } diff --git a/examples/params.rs b/examples/params.rs index fd482d7a..e20c5a0c 100644 --- a/examples/params.rs +++ b/examples/params.rs @@ -98,9 +98,6 @@ fn run_example(servo_media: Arc) { fn main() { ServoMedia::init::(); - if let Ok(servo_media) = ServoMedia::get() { - run_example(servo_media); - } else { - unreachable!(); - } + let servo_media = ServoMedia::get(); + run_example(servo_media); } diff --git a/examples/params_connect.rs b/examples/params_connect.rs index 47456f3c..c2b00707 100644 --- a/examples/params_connect.rs +++ b/examples/params_connect.rs @@ -53,9 +53,6 @@ fn run_example(servo_media: Arc) { fn main() { ServoMedia::init::(); - if let Ok(servo_media) = ServoMedia::get() { - run_example(servo_media); - } else { - unreachable!(); - } + let servo_media = ServoMedia::get(); + run_example(servo_media); } diff --git a/examples/params_connect2.rs b/examples/params_connect2.rs index b09c9acb..c2ebf0ea 100644 --- a/examples/params_connect2.rs +++ b/examples/params_connect2.rs @@ -53,9 +53,6 @@ fn run_example(servo_media: Arc) { fn main() { ServoMedia::init::(); - if let Ok(servo_media) = ServoMedia::get() { - run_example(servo_media); - } else { - unreachable!(); - } + let servo_media = ServoMedia::get(); + run_example(servo_media); } diff --git a/examples/params_settarget.rs b/examples/params_settarget.rs index 1d970d70..457aa89a 100644 --- a/examples/params_settarget.rs +++ b/examples/params_settarget.rs @@ -62,9 +62,6 @@ fn run_example(servo_media: Arc) { fn main() { ServoMedia::init::(); - if let Ok(servo_media) = ServoMedia::get() { - run_example(servo_media); - } else { - unreachable!(); - } + let servo_media = ServoMedia::get(); + run_example(servo_media); } diff --git a/examples/play.rs b/examples/play.rs index 00949ddc..82718b5c 100644 --- a/examples/play.rs +++ b/examples/play.rs @@ -86,9 +86,6 @@ fn run_example(servo_media: Arc) { fn main() { ServoMedia::init::(); - if let Ok(servo_media) = ServoMedia::get() { - run_example(servo_media); - } else { - unreachable!(); - } + let servo_media = ServoMedia::get(); + run_example(servo_media); } diff --git a/examples/play_media_stream.rs b/examples/play_media_stream.rs index f7489927..62d0233c 100644 --- a/examples/play_media_stream.rs +++ b/examples/play_media_stream.rs @@ -83,7 +83,6 @@ fn run_example(servo_media: Arc) { fn main() { ServoMedia::init::(); - if let Ok(servo_media) = ServoMedia::get() { - run_example(servo_media); - } + let servo_media = ServoMedia::get(); + run_example(servo_media); } diff --git a/examples/play_noise.rs b/examples/play_noise.rs index bdb89d81..ac058657 100644 --- a/examples/play_noise.rs +++ b/examples/play_noise.rs @@ -50,9 +50,6 @@ fn run_example(servo_media: Arc) { fn main() { ServoMedia::init::(); - if let Ok(servo_media) = ServoMedia::get() { - run_example(servo_media); - } else { - unreachable!() - } + let servo_media = ServoMedia::get(); + run_example(servo_media); } diff --git a/examples/player/app.rs b/examples/player/app.rs index f1ce6669..f5ebcb39 100644 --- a/examples/player/app.rs +++ b/examples/player/app.rs @@ -184,8 +184,7 @@ impl App { // player let (player_event_sender, player_event_receiver) = ipc::channel::()?; - let servo_media = - ServoMedia::get().map_err(|error| MiscError(format!("Failed to get media backend: {error:?}")))?; + let servo_media = ServoMedia::get(); let frame_renderer = if !opts.no_video { Some(Arc::new(Mutex::new(MediaFrameRenderer::new( diff --git a/examples/set_value_curve.rs b/examples/set_value_curve.rs index 5d04fddb..0d38fb19 100644 --- a/examples/set_value_curve.rs +++ b/examples/set_value_curve.rs @@ -84,9 +84,6 @@ fn run_example(servo_media: Arc) { fn main() { ServoMedia::init::(); - if let Ok(servo_media) = ServoMedia::get() { - run_example(servo_media); - } else { - unreachable!(); - } + let servo_media = ServoMedia::get(); + run_example(servo_media); } diff --git a/examples/simple_player.rs b/examples/simple_player.rs index e6f0e075..9e53bbb3 100644 --- a/examples/simple_player.rs +++ b/examples/simple_player.rs @@ -167,7 +167,6 @@ fn run_example(servo_media: Arc) { fn main() { ServoMedia::init::(); - if let Ok(servo_media) = ServoMedia::get() { - run_example(servo_media); - } + let servo_media = ServoMedia::get(); + run_example(servo_media); } diff --git a/examples/simple_webrtc.rs b/examples/simple_webrtc.rs index 394eca89..d08a2693 100644 --- a/examples/simple_webrtc.rs +++ b/examples/simple_webrtc.rs @@ -399,9 +399,6 @@ fn run_example(servo_media: Arc) { fn main() { ServoMedia::init::(); - if let Ok(servo_media) = ServoMedia::get() { - run_example(servo_media); - } else { - unreachable!(); - } + let servo_media = ServoMedia::get(); + run_example(servo_media); } diff --git a/examples/stereo_panner.rs b/examples/stereo_panner.rs index 1d580f50..02d42713 100644 --- a/examples/stereo_panner.rs +++ b/examples/stereo_panner.rs @@ -54,9 +54,6 @@ fn run_example(servo_media: Arc) { fn main() { ServoMedia::init::(); - if let Ok(servo_media) = ServoMedia::get() { - run_example(servo_media); - } else { - unreachable!(); - } + let servo_media = ServoMedia::get(); + run_example(servo_media); } diff --git a/examples/stream_dest_node.rs b/examples/stream_dest_node.rs index 908096b1..57cef365 100644 --- a/examples/stream_dest_node.rs +++ b/examples/stream_dest_node.rs @@ -41,9 +41,6 @@ fn run_example(servo_media: Arc) { fn main() { ServoMedia::init::(); - if let Ok(servo_media) = ServoMedia::get() { - run_example(servo_media); - } else { - unreachable!(); - } + let servo_media = ServoMedia::get(); + run_example(servo_media); } diff --git a/examples/stream_reader_node.rs b/examples/stream_reader_node.rs index 87ee4ad8..828e4891 100644 --- a/examples/stream_reader_node.rs +++ b/examples/stream_reader_node.rs @@ -26,9 +26,6 @@ fn run_example(servo_media: Arc) { fn main() { ServoMedia::init::(); - if let Ok(servo_media) = ServoMedia::get() { - run_example(servo_media); - } else { - unreachable!(); - } + let servo_media = ServoMedia::get(); + run_example(servo_media); } diff --git a/examples/videoinput_stream.rs b/examples/videoinput_stream.rs index 7bf25c0b..aec39670 100644 --- a/examples/videoinput_stream.rs +++ b/examples/videoinput_stream.rs @@ -17,9 +17,6 @@ fn run_example(servo_media: Arc) { fn main() { ServoMedia::init::(); - if let Ok(servo_media) = ServoMedia::get() { - run_example(servo_media); - } else { - unreachable!(); - } + let servo_media = ServoMedia::get(); + run_example(servo_media); } diff --git a/examples/wave_shaper.rs b/examples/wave_shaper.rs index 64b0dcce..e67ad94a 100644 --- a/examples/wave_shaper.rs +++ b/examples/wave_shaper.rs @@ -94,9 +94,6 @@ fn run_example(servo_media: Arc) { fn main() { ServoMedia::init::(); - if let Ok(servo_media) = ServoMedia::get() { - run_example(servo_media); - } else { - unreachable!(); - } + let servo_media = ServoMedia::get(); + run_example(servo_media); } diff --git a/servo-media/lib.rs b/servo-media/lib.rs index 3f3755da..9b2cfcfe 100644 --- a/servo-media/lib.rs +++ b/servo-media/lib.rs @@ -106,8 +106,8 @@ impl ServoMedia { thread::spawn(move || INSTANCE.get_or_init(|| Arc::new(ServoMedia(backend_factory())))); } - pub fn get() -> Result, ()> { - Ok(INSTANCE.wait().clone()) + pub fn get() -> Arc { + INSTANCE.wait().clone() } }