Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make ServoMedia::get infallible #430

Merged
merged 1 commit into from
Jan 17, 2025
Merged

Make ServoMedia::get infallible #430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions examples/audio_decoder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,7 @@ fn run_example(servo_media: Arc<ServoMedia>) {

fn main() {
ServoMedia::init::<servo_media_auto::Backend>();
if let Ok(servo_media) = ServoMedia::get() {
run_example(servo_media);
} else {
unreachable!()
}
let servo_media = ServoMedia::get();
run_example(servo_media);

}
7 changes: 2 additions & 5 deletions examples/audioinput_stream.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ fn run_example(servo_media: Arc<ServoMedia>) {

fn main() {
ServoMedia::init::<servo_media_auto::Backend>();
if let Ok(servo_media) = ServoMedia::get() {
run_example(servo_media);
} else {
unreachable!();
}
let servo_media = ServoMedia::get();
run_example(servo_media);
}
7 changes: 2 additions & 5 deletions examples/biquad.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,6 @@ fn run_example(servo_media: Arc<ServoMedia>) {

fn main() {
ServoMedia::init::<servo_media_auto::Backend>();
if let Ok(servo_media) = ServoMedia::get() {
run_example(servo_media);
} else {
unreachable!();
}
let servo_media = ServoMedia::get();
run_example(servo_media);
}
7 changes: 2 additions & 5 deletions examples/channels.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,6 @@ fn run_example(servo_media: Arc<ServoMedia>) {

fn main() {
ServoMedia::init::<servo_media_auto::Backend>();
if let Ok(servo_media) = ServoMedia::get() {
run_example(servo_media);
} else {
unreachable!();
}
let servo_media = ServoMedia::get();
run_example(servo_media);
}
7 changes: 2 additions & 5 deletions examples/channelsum.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,6 @@ fn run_example(servo_media: Arc<ServoMedia>) {

fn main() {
ServoMedia::init::<servo_media_auto::Backend>();
if let Ok(servo_media) = ServoMedia::get() {
run_example(servo_media);
} else {
unreachable!();
}
let servo_media = ServoMedia::get();
run_example(servo_media);
}
7 changes: 2 additions & 5 deletions examples/constant_source.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,6 @@ fn run_example(servo_media: Arc<ServoMedia>) {

fn main() {
ServoMedia::init::<servo_media_auto::Backend>();
if let Ok(servo_media) = ServoMedia::get() {
run_example(servo_media);
} else {
unreachable!();
}
let servo_media = ServoMedia::get();
run_example(servo_media);
}
2 changes: 1 addition & 1 deletion examples/dummy.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ use servo_media_dummy::DummyBackend;

fn main() {
ServoMedia::init::<DummyBackend>();
ServoMedia::get().expect("couldn't create a dummy backend?");
ServoMedia::get();
}
7 changes: 2 additions & 5 deletions examples/iir_filter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,6 @@ fn run_example(servo_media: Arc<ServoMedia>) {

fn main() {
ServoMedia::init::<servo_media_auto::Backend>();
if let Ok(servo_media) = ServoMedia::get() {
run_example(servo_media);
} else {
unreachable!();
}
let servo_media = ServoMedia::get();
run_example(servo_media);
}
7 changes: 2 additions & 5 deletions examples/media_element_source_node.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,9 +314,6 @@ fn run_example(servo_media: Arc<ServoMedia>) {

fn main() {
ServoMedia::init::<servo_media_auto::Backend>();
if let Ok(servo_media) = ServoMedia::get() {
run_example(servo_media);
} else {
unreachable!();
}
let servo_media = ServoMedia::get();
run_example(servo_media);
}
7 changes: 2 additions & 5 deletions examples/muted_audiocontext.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,6 @@ fn run_example(servo_media: Arc<ServoMedia>) {

fn main() {
ServoMedia::init::<servo_media_auto::Backend>();
if let Ok(servo_media) = ServoMedia::get() {
run_example(servo_media);
} else {
unreachable!();
}
let servo_media = ServoMedia::get();
run_example(servo_media);
}
5 changes: 2 additions & 3 deletions examples/muted_player.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@ fn run_example(servo_media: Arc<ServoMedia>) {

fn main() {
ServoMedia::init::<servo_media_auto::Backend>();
if let Ok(servo_media) = ServoMedia::get() {
run_example(servo_media);
}
let servo_media = ServoMedia::get();
run_example(servo_media);
}
7 changes: 2 additions & 5 deletions examples/offline_context.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,6 @@ fn run_example(servo_media: Arc<ServoMedia>) {

fn main() {
ServoMedia::init::<servo_media_auto::Backend>();
if let Ok(servo_media) = ServoMedia::get() {
run_example(servo_media);
} else {
unreachable!()
}
let servo_media = ServoMedia::get();
run_example(servo_media);
}
7 changes: 2 additions & 5 deletions examples/oscillator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,6 @@ fn run_example(servo_media: Arc<ServoMedia>) {

fn main() {
ServoMedia::init::<servo_media_auto::Backend>();
if let Ok(servo_media) = ServoMedia::get() {
run_example(servo_media);
} else {
unreachable!();
}
let servo_media = ServoMedia::get();
run_example(servo_media);
}
7 changes: 2 additions & 5 deletions examples/panner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,9 +176,6 @@ fn run_example(servo_media: Arc<ServoMedia>) {

fn main() {
ServoMedia::init::<servo_media_auto::Backend>();
if let Ok(servo_media) = ServoMedia::get() {
run_example(servo_media);
} else {
unreachable!();
}
let servo_media = ServoMedia::get();
run_example(servo_media);
}
7 changes: 2 additions & 5 deletions examples/params.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,6 @@ fn run_example(servo_media: Arc<ServoMedia>) {

fn main() {
ServoMedia::init::<servo_media_auto::Backend>();
if let Ok(servo_media) = ServoMedia::get() {
run_example(servo_media);
} else {
unreachable!();
}
let servo_media = ServoMedia::get();
run_example(servo_media);
}
7 changes: 2 additions & 5 deletions examples/params_connect.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,6 @@ fn run_example(servo_media: Arc<ServoMedia>) {

fn main() {
ServoMedia::init::<servo_media_auto::Backend>();
if let Ok(servo_media) = ServoMedia::get() {
run_example(servo_media);
} else {
unreachable!();
}
let servo_media = ServoMedia::get();
run_example(servo_media);
}
7 changes: 2 additions & 5 deletions examples/params_connect2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,6 @@ fn run_example(servo_media: Arc<ServoMedia>) {

fn main() {
ServoMedia::init::<servo_media_auto::Backend>();
if let Ok(servo_media) = ServoMedia::get() {
run_example(servo_media);
} else {
unreachable!();
}
let servo_media = ServoMedia::get();
run_example(servo_media);
}
7 changes: 2 additions & 5 deletions examples/params_settarget.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,6 @@ fn run_example(servo_media: Arc<ServoMedia>) {

fn main() {
ServoMedia::init::<servo_media_auto::Backend>();
if let Ok(servo_media) = ServoMedia::get() {
run_example(servo_media);
} else {
unreachable!();
}
let servo_media = ServoMedia::get();
run_example(servo_media);
}
7 changes: 2 additions & 5 deletions examples/play.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,6 @@ fn run_example(servo_media: Arc<ServoMedia>) {

fn main() {
ServoMedia::init::<servo_media_auto::Backend>();
if let Ok(servo_media) = ServoMedia::get() {
run_example(servo_media);
} else {
unreachable!();
}
let servo_media = ServoMedia::get();
run_example(servo_media);
}
5 changes: 2 additions & 3 deletions examples/play_media_stream.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ fn run_example(servo_media: Arc<ServoMedia>) {

fn main() {
ServoMedia::init::<servo_media_auto::Backend>();
if let Ok(servo_media) = ServoMedia::get() {
run_example(servo_media);
}
let servo_media = ServoMedia::get();
run_example(servo_media);
}
7 changes: 2 additions & 5 deletions examples/play_noise.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,6 @@ fn run_example(servo_media: Arc<ServoMedia>) {

fn main() {
ServoMedia::init::<servo_media_auto::Backend>();
if let Ok(servo_media) = ServoMedia::get() {
run_example(servo_media);
} else {
unreachable!()
}
let servo_media = ServoMedia::get();
run_example(servo_media);
}
3 changes: 1 addition & 2 deletions examples/player/app.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,7 @@ impl App {

// player
let (player_event_sender, player_event_receiver) = ipc::channel::<player::PlayerEvent>()?;
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(
Expand Down
7 changes: 2 additions & 5 deletions examples/set_value_curve.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,6 @@ fn run_example(servo_media: Arc<ServoMedia>) {

fn main() {
ServoMedia::init::<servo_media_auto::Backend>();
if let Ok(servo_media) = ServoMedia::get() {
run_example(servo_media);
} else {
unreachable!();
}
let servo_media = ServoMedia::get();
run_example(servo_media);
}
5 changes: 2 additions & 3 deletions examples/simple_player.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,6 @@ fn run_example(servo_media: Arc<ServoMedia>) {

fn main() {
ServoMedia::init::<servo_media_auto::Backend>();
if let Ok(servo_media) = ServoMedia::get() {
run_example(servo_media);
}
let servo_media = ServoMedia::get();
run_example(servo_media);
}
7 changes: 2 additions & 5 deletions examples/simple_webrtc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,9 +399,6 @@ fn run_example(servo_media: Arc<ServoMedia>) {

fn main() {
ServoMedia::init::<servo_media_auto::Backend>();
if let Ok(servo_media) = ServoMedia::get() {
run_example(servo_media);
} else {
unreachable!();
}
let servo_media = ServoMedia::get();
run_example(servo_media);
}
7 changes: 2 additions & 5 deletions examples/stereo_panner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,6 @@ fn run_example(servo_media: Arc<ServoMedia>) {

fn main() {
ServoMedia::init::<servo_media_auto::Backend>();
if let Ok(servo_media) = ServoMedia::get() {
run_example(servo_media);
} else {
unreachable!();
}
let servo_media = ServoMedia::get();
run_example(servo_media);
}
7 changes: 2 additions & 5 deletions examples/stream_dest_node.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@ fn run_example(servo_media: Arc<ServoMedia>) {

fn main() {
ServoMedia::init::<servo_media_auto::Backend>();
if let Ok(servo_media) = ServoMedia::get() {
run_example(servo_media);
} else {
unreachable!();
}
let servo_media = ServoMedia::get();
run_example(servo_media);
}
7 changes: 2 additions & 5 deletions examples/stream_reader_node.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@ fn run_example(servo_media: Arc<ServoMedia>) {

fn main() {
ServoMedia::init::<servo_media_auto::Backend>();
if let Ok(servo_media) = ServoMedia::get() {
run_example(servo_media);
} else {
unreachable!();
}
let servo_media = ServoMedia::get();
run_example(servo_media);
}
7 changes: 2 additions & 5 deletions examples/videoinput_stream.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ fn run_example(servo_media: Arc<ServoMedia>) {

fn main() {
ServoMedia::init::<servo_media_auto::Backend>();
if let Ok(servo_media) = ServoMedia::get() {
run_example(servo_media);
} else {
unreachable!();
}
let servo_media = ServoMedia::get();
run_example(servo_media);
}
7 changes: 2 additions & 5 deletions examples/wave_shaper.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,6 @@ fn run_example(servo_media: Arc<ServoMedia>) {

fn main() {
ServoMedia::init::<servo_media_auto::Backend>();
if let Ok(servo_media) = ServoMedia::get() {
run_example(servo_media);
} else {
unreachable!();
}
let servo_media = ServoMedia::get();
run_example(servo_media);
}
4 changes: 2 additions & 2 deletions servo-media/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ impl ServoMedia {
thread::spawn(move || INSTANCE.get_or_init(|| Arc::new(ServoMedia(backend_factory()))));
}

pub fn get() -> Result<Arc<ServoMedia>, ()> {
Ok(INSTANCE.wait().clone())
pub fn get() -> Arc<ServoMedia> {
INSTANCE.wait().clone()
}
}

Expand Down
Loading