stephenseo/mpd_info_screen
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Minor refactorings

Browse source
This commit is contained in:
Stephen Seo 2024-06-24 15:45:21 +09:00
parent 08b78467b5
commit d276482c8b
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/display.rs
View file

@ -801,6 +801,8 @@ impl EventHandler for MPDDisplay {
} }
} }
self.prev_mpd_play_state = self.mpd_play_state;
if self.is_valid && self.is_initialized && self.poll_instant.elapsed() > POLL_TIME { if self.is_valid && self.is_initialized && self.poll_instant.elapsed() > POLL_TIME {
self.poll_instant = Instant::now(); self.poll_instant = Instant::now();
if self.dirty_flag.is_some() if self.dirty_flag.is_some()
@ -835,10 +837,8 @@ impl EventHandler for MPDDisplay {
self.length = 0.0; self.length = 0.0;
self.album_art = None; self.album_art = None;
} }
self.prev_mpd_play_state = self.mpd_play_state;
self.mpd_play_state = shared.mpd_play_state; self.mpd_play_state = shared.mpd_play_state;
} else { } else {
self.prev_mpd_play_state = self.mpd_play_state;
self.mpd_play_state = MPDPlayState::Playing; self.mpd_play_state = MPDPlayState::Playing;
if !shared.title.is_empty() { if !shared.title.is_empty() {
if shared.title != self.title_string_cache { if shared.title != self.title_string_cache {
@ -937,8 +937,7 @@ impl EventHandler for MPDDisplay {
self.timer += delta.as_secs_f64(); self.timer += delta.as_secs_f64();
let mut timer_diff = seconds_to_time(self.length - self.timer); let mut timer_diff = seconds_to_time(self.length - self.timer);
if !self.opts.disable_show_percentage { if !self.opts.disable_show_percentage {
let timer_percentage = time_to_percentage(self.length, self.timer); timer_diff = timer_diff + " " + &time_to_percentage(self.length, self.timer);
timer_diff = timer_diff + " " + &timer_percentage;
} }
let timer_diff_len = timer_diff.len(); let timer_diff_len = timer_diff.len();
self.timer_text = Text::new(timer_diff); self.timer_text = Text::new(timer_diff);
@ -953,7 +952,6 @@ impl EventHandler for MPDDisplay {
&& self.prev_mpd_play_state == MPDPlayState::Playing && self.prev_mpd_play_state == MPDPlayState::Playing
{ {
self.update_bg_mesh(ctx)?; self.update_bg_mesh(ctx)?;
self.prev_mpd_play_state = self.mpd_play_state;
} }
Ok(()) Ok(())