toxblh/podcasts
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PlayerWidget: Connect to the errors callback.

Browse Source
This commit is contained in:
Jordan Petridis 2018-06-14 10:07:25 +03:00
parent 04e0a10c6b
commit 123248c016
No known key found for this signature in database
GPG Key ID: CEABAD9F5683B9A6
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hammond-gtk/src/app.rs
View File

@ -119,7 +119,7 @@ impl App {
// Add the overlay to the main Box // Add the overlay to the main Box
wrap.add(&overlay); wrap.add(&overlay);
let player = PlayerWidget::new(); let player = PlayerWidget::new(&sender);
// Add the player to the main Box // Add the player to the main Box
wrap.add(&player.action_bar); wrap.add(&player.action_bar);
// player.reveal(); // player.reveal();

16
hammond-gtk/src/widgets/player.rs
View File

@ -10,11 +10,13 @@ use gstreamer_player as gst_player;
use gtk; use gtk;
use gtk::prelude::*; use gtk::prelude::*;
use crossbeam_channel::Sender;
use failure::Error; use failure::Error;
use hammond_data::{dbqueries, USER_AGENT}; use hammond_data::{dbqueries, USER_AGENT};
use hammond_data::{EpisodeWidgetQuery, PodcastCoverQuery}; use hammond_data::{EpisodeWidgetQuery, PodcastCoverQuery};
use app::Action;
use utils::set_image_from_path; use utils::set_image_from_path;
use std::path::Path; use std::path::Path;
@ -160,20 +162,28 @@ impl Default for PlayerWidget {
} }
impl PlayerWidget { impl PlayerWidget {
pub fn new() -> Rc<Self> { pub fn new(sender: &Sender<Action>) -> Rc<Self> {
let w = Rc::new(Self::default()); let w = Rc::new(Self::default());
Self::init(&w); Self::init(&w, sender);
w w
} }
#[cfg_attr(rustfmt, rustfmt_skip)] #[cfg_attr(rustfmt, rustfmt_skip)]
fn init(s: &Rc<Self>) { fn init(s: &Rc<Self>, sender: &Sender<Action>) {
// Connect the play button to the gst Player. // Connect the play button to the gst Player.
s.controls.play.connect_clicked(clone!(s => move |_| s.play())); s.controls.play.connect_clicked(clone!(s => move |_| s.play()));
// Connect the pause button to the gst Player. // Connect the pause button to the gst Player.
s.controls.pause.connect_clicked(clone!(s => move |_| s.pause())); s.controls.pause.connect_clicked(clone!(s => move |_| s.pause()));
s.player.connect_error(clone!(sender => move |_, error| {
// FIXME: should never occur and should not be user facing.
sender.send(Action::ErrorNotification(format!("Player Error: {}", error)))
.map_err(|err| error!("Error: {}", err))
.ok();
}));
Self::connect_timers(s); Self::connect_timers(s);
} }