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

Jump to bottom

Fix cargo check --all-features build #418

Merged
merged 1 commit into from
Feb 29, 2024
Merged

Fix cargo check --all-features build #418

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
20 changes: 10 additions & 10 deletions examples/player/app.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ struct SMError(std::string::String);

#[derive(Debug, Fail)]
#[fail(display = "Error: {}", _0)]
struct MiscError(&'static str);
struct MiscError(std::string::String);

#[path = "renderer.rs"]
mod renderer;
Expand Down Expand Up @@ -185,7 +185,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:?}").as_str()))?;
ServoMedia::get().map_err(|error| MiscError(format!("Failed to get media backend: {error:?}")))?;

let frame_renderer = if !opts.no_video {
Some(Arc::new(Mutex::new(MediaFrameRenderer::new(
Expand Down Expand Up @@ -219,7 +219,7 @@ impl App {
.lock()
.unwrap()
.set_input_size(metadata.len())
.map_err(|error| MiscError(format!("Failed to set media input size: {error:?}").as_str()))?;
.map_err(|error| MiscError(format!("Failed to set media input size: {error:?}")))?;

Ok(App {
events_loop,
Expand Down Expand Up @@ -252,7 +252,7 @@ pub fn main_loop(mut app: App) -> Result<glutin::WindowedContext<glutin::Possibl
let window_size = windowed_context
.window()
.get_inner_size()
.ok_or_else(|| MiscError("Failed to get window inner size"))?;
.ok_or_else(|| MiscError("Failed to get window inner size".to_owned()))?;
let mut framebuffer_size = {
let glutin::dpi::PhysicalSize { width, height } =
window_size.to_physical(device_pixel_ratio as f64);
Expand Down Expand Up @@ -283,7 +283,7 @@ pub fn main_loop(mut app: App) -> Result<glutin::WindowedContext<glutin::Possibl
.lock()
.unwrap()
.play()
.map_err(|error| MiscError(format!("Failed to start player: {error:?}").as_str()))?;
.map_err(|error| MiscError(format!("Failed to start player: {error:?}")))?;

let mut running = true;
let mut input_eos = false;
Expand Down Expand Up @@ -338,22 +338,22 @@ pub fn main_loop(mut app: App) -> Result<glutin::WindowedContext<glutin::Possibl
.lock()
.unwrap()
.stop()
.map_err(|error| MiscError(format!("Failed to stop player: {error:?}").as_str()))?;
.map_err(|error| MiscError(format!("Failed to stop player: {error:?}")))?;
input_eos = true;
}
PlayerCmd::Pause => {
player
.lock()
.unwrap()
.pause()
.map_err(|error| MiscError(format!("Failed to pause player: {error:?}").as_str()))?;
.map_err(|error| MiscError(format!("Failed to pause player: {error:?}")))?;
}
PlayerCmd::Play => {
player
.lock()
.unwrap()
.play()
.map_err(|error| MiscError(format!("Failed to start player: {error:?}").as_str()))?;
.map_err(|error| MiscError(format!("Failed to start player: {error:?}")))?;
}
PlayerCmd::Seek(time) => {
let time = playerstate.pos + time;
Expand All @@ -365,15 +365,15 @@ pub fn main_loop(mut app: App) -> Result<glutin::WindowedContext<glutin::Possibl
.lock()
.unwrap()
.seek(time)
.map_err(|error| MiscError(format!("Failed to seek: {error:?}").as_str()))?;
.map_err(|error| MiscError(format!("Failed to seek: {error:?}")))?;
}
PlayerCmd::Mute => {
playerstate.mute = !playerstate.mute;
player
.lock()
.unwrap()
.mute(playerstate.mute)
.map_err(|error| MiscError(format!("Failed to mute player: {error:?}").as_str()))?;
.map_err(|error| MiscError(format!("Failed to mute player: {error:?}")))?;
}
_ => (),
}
Expand Down
1 change: 1 addition & 0 deletions examples/player/context.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.

use glutin::os::ContextTraitExt;
use servo_media::player::context::*;

pub struct PlayerContextGlutin {
Expand Down
Loading