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

EpisodeWidget: Replace Arc<Mutex<Widget>> with Rc<RefCell<Widget>>.

Browse Source 
Since gtk Widgets are not Send, and the callbacks all run in the gtk
main loop, it *should* not be possible that 2 things try to access the
same widget at the same time.
This commit is contained in:
Jordan Petridis 2018-04-20 07:24:20 +03:00
parent a9196d27d6
commit af5b27d0fc
No known key found for this signature in database
GPG Key ID: CEABAD9F5683B9A6
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
hammond-gtk/src/widgets/episode.rs
View File

@ -28,7 +28,7 @@ pub struct EpisodeWidget {
date: DateMachine, date: DateMachine,
duration: DurationMachine, duration: DurationMachine,
title: Rc<RefCell<TitleMachine>>, title: Rc<RefCell<TitleMachine>>,
media: Arc<Mutex<MediaMachine>>, media: Rc<RefCell<MediaMachine>>,
} }
impl Default for EpisodeWidget { impl Default for EpisodeWidget {
@ -66,7 +66,7 @@ impl Default for EpisodeWidget {
separator2, separator2,
prog_separator, prog_separator,
); );
let media_machine = Arc::new(Mutex::new(media)); let media_machine = Rc::new(RefCell::new(media));
EpisodeWidget { EpisodeWidget {
container, container,
@ -110,7 +110,7 @@ impl EpisodeWidget {
#[inline] #[inline]
fn connect_buttons(&self, episode: Arc<Mutex<EpisodeWidgetQuery>>, sender: Sender<Action>) { fn connect_buttons(&self, episode: Arc<Mutex<EpisodeWidgetQuery>>, sender: Sender<Action>) {
let title = self.title.clone(); let title = self.title.clone();
if let Ok(media) = self.media.lock() { if let Ok(media) = self.media.try_borrow_mut() {
media.play_connect_clicked(clone!(episode, sender => move |_| { media.play_connect_clicked(clone!(episode, sender => move |_| {
if let Ok(mut ep) = episode.lock() { if let Ok(mut ep) = episode.lock() {
on_play_bttn_clicked(&mut ep, title.clone(), sender.clone()) on_play_bttn_clicked(&mut ep, title.clone(), sender.clone())
@ -167,7 +167,7 @@ impl EpisodeWidget {
#[inline] #[inline]
fn determine_media_state( fn determine_media_state(
media_machine: Arc<Mutex<MediaMachine>>, media_machine: Rc<RefCell<MediaMachine>>,
episode: &EpisodeWidgetQuery, episode: &EpisodeWidgetQuery,
) -> Result<(), Error> { ) -> Result<(), Error> {
let id = episode.rowid(); let id = episode.rowid();
@ -179,7 +179,7 @@ fn determine_media_state(
Ok(m.get(&id).cloned()) Ok(m.get(&id).cloned())
}()?; }()?;
let mut lock = media_machine.lock().map_err(|err| format_err!("{}", err))?; let mut lock = media_machine.try_borrow_mut()?;
take_mut::take(lock.deref_mut(), |media| { take_mut::take(lock.deref_mut(), |media| {
media.determine_state( media.determine_state(
episode.length(), episode.length(),
@ -196,7 +196,7 @@ fn determine_media_state(
m.cancel(); m.cancel();
} }
if let Ok(mut lock) = media_machine.lock() { if let Ok(mut lock) = media_machine.try_borrow_mut() {
take_mut::take(lock.deref_mut(), |media| { take_mut::take(lock.deref_mut(), |media| {
media.determine_state( media.determine_state(
episode.length(), episode.length(),
@ -272,21 +272,21 @@ fn open_uri(rowid: i32) -> Result<(), Error> {
#[cfg_attr(feature = "cargo-clippy", allow(if_same_then_else))] #[cfg_attr(feature = "cargo-clippy", allow(if_same_then_else))]
fn update_progressbar_callback( fn update_progressbar_callback(
prog: Arc<Mutex<manager::Progress>>, prog: Arc<Mutex<manager::Progress>>,
media: Arc<Mutex<MediaMachine>>, media: Rc<RefCell<MediaMachine>>,
episode_rowid: i32, episode_rowid: i32,
) { ) {
let callback = clone!(prog, media => move || { let callback = clone!(prog, media => move || {
progress_bar_helper(prog.clone(), media.clone(), episode_rowid) progress_bar_helper(prog.clone(), media.clone(), episode_rowid)
.unwrap_or(glib::Continue(false)) .unwrap_or(glib::Continue(false))
}); });
timeout_add(400, callback); timeout_add(300, callback);
} }
#[inline] #[inline]
#[allow(if_same_then_else)] #[allow(if_same_then_else)]
fn progress_bar_helper( fn progress_bar_helper(
prog: Arc<Mutex<manager::Progress>>, prog: Arc<Mutex<manager::Progress>>,
media: Arc<Mutex<MediaMachine>>, media: Rc<RefCell<MediaMachine>>,
episode_rowid: i32, episode_rowid: i32,
) -> Result<glib::Continue, Error> { ) -> Result<glib::Continue, Error> {
let (fraction, downloaded) = { let (fraction, downloaded) = {
@ -303,8 +303,9 @@ fn progress_bar_helper(
.file_size(SIZE_OPTS.clone()) .file_size(SIZE_OPTS.clone())
.map_err(|err| format_err!("{}", err))?; .map_err(|err| format_err!("{}", err))?;
let mut m = media.lock().unwrap(); if let Ok(mut m) = media.try_borrow_mut() {
m.update_progress(&size, fraction); m.update_progress(&size, fraction);
}
} }
// info!("Fraction: {}", progress_bar.get_fraction()); // info!("Fraction: {}", progress_bar.get_fraction());
@ -333,7 +334,7 @@ fn progress_bar_helper(
#[inline] #[inline]
fn update_total_size_callback( fn update_total_size_callback(
prog: Arc<Mutex<manager::Progress>>, prog: Arc<Mutex<manager::Progress>>,
media: Arc<Mutex<MediaMachine>>, media: Rc<RefCell<MediaMachine>>,
) { ) {
let callback = clone!(prog, media => move || { let callback = clone!(prog, media => move || {
total_size_helper(prog.clone(), media.clone()).unwrap_or(glib::Continue(true)) total_size_helper(prog.clone(), media.clone()).unwrap_or(glib::Continue(true))
@ -344,7 +345,7 @@ fn update_total_size_callback(
#[inline] #[inline]
fn total_size_helper( fn total_size_helper(
prog: Arc<Mutex<manager::Progress>>, prog: Arc<Mutex<manager::Progress>>,
media: Arc<Mutex<MediaMachine>>, media: Rc<RefCell<MediaMachine>>,
) -> Result<glib::Continue, Error> { ) -> Result<glib::Continue, Error> {
// Get the total_bytes. // Get the total_bytes.
let total_bytes = { let total_bytes = {
@ -356,7 +357,7 @@ fn total_size_helper(
debug!("Total Size: {}", total_bytes); debug!("Total Size: {}", total_bytes);
if total_bytes != 0 { if total_bytes != 0 {
// Update the total_size label // Update the total_size label
if let Ok(mut m) = media.lock() { if let Ok(mut m) = media.try_borrow_mut() {
take_mut::take(m.deref_mut(), |machine| { take_mut::take(m.deref_mut(), |machine| {
machine.set_size(Some(total_bytes as i32)) machine.set_size(Some(total_bytes as i32))
}); });