diff options
Diffstat (limited to 'src/mpris.rs')
| -rw-r--r-- | src/mpris.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mpris.rs b/src/mpris.rs index de19113..9daf516 100644 --- a/src/mpris.rs +++ b/src/mpris.rs | |||
| @@ -204,7 +204,7 @@ impl MprisPlayer { | |||
| 204 | if let Ok(mut s) = self.scrobble_state.lock() { | 204 | if let Ok(mut s) = self.scrobble_state.lock() { |
| 205 | s.start(track.clone()); | 205 | s.start(track.clone()); |
| 206 | } | 206 | } |
| 207 | let fmt = Config::load().ok().and_then(|c| c.display_format.clone()); | 207 | let fmt = Config::cached().ok().and_then(|c| c.display_format.clone()); |
| 208 | notification::notify_track(&track, fmt.as_deref()); | 208 | notification::notify_track(&track, fmt.as_deref()); |
| 209 | } else { | 209 | } else { |
| 210 | self.audio.stop(); | 210 | self.audio.stop(); |
| @@ -226,7 +226,7 @@ impl MprisPlayer { | |||
| 226 | if let Ok(mut s) = self.scrobble_state.lock() { | 226 | if let Ok(mut s) = self.scrobble_state.lock() { |
| 227 | s.start(track.clone()); | 227 | s.start(track.clone()); |
| 228 | } | 228 | } |
| 229 | let fmt = Config::load().ok().and_then(|c| c.display_format.clone()); | 229 | let fmt = Config::cached().ok().and_then(|c| c.display_format.clone()); |
| 230 | notification::notify_track(&track, fmt.as_deref()); | 230 | notification::notify_track(&track, fmt.as_deref()); |
| 231 | } | 231 | } |
| 232 | } | 232 | } |
| @@ -271,7 +271,7 @@ impl MprisPlayer { | |||
| 271 | if let Ok(mut s) = self.scrobble_state.lock() { | 271 | if let Ok(mut s) = self.scrobble_state.lock() { |
| 272 | s.start(track.clone()); | 272 | s.start(track.clone()); |
| 273 | } | 273 | } |
| 274 | let fmt = Config::load().ok().and_then(|c| c.display_format.clone()); | 274 | let fmt = Config::cached().ok().and_then(|c| c.display_format.clone()); |
| 275 | notification::notify_track(track, fmt.as_deref()); | 275 | notification::notify_track(track, fmt.as_deref()); |
| 276 | } | 276 | } |
| 277 | } | 277 | } |
| @@ -319,7 +319,7 @@ impl MprisPlayer { | |||
| 319 | if let Ok(mut s) = self.scrobble_state.lock() { | 319 | if let Ok(mut s) = self.scrobble_state.lock() { |
| 320 | s.start(t.clone()); | 320 | s.start(t.clone()); |
| 321 | } | 321 | } |
| 322 | let fmt = Config::load().ok().and_then(|c| c.display_format.clone()); | 322 | let fmt = Config::cached().ok().and_then(|c| c.display_format.clone()); |
| 323 | notification::notify_track(t, fmt.as_deref()); | 323 | notification::notify_track(t, fmt.as_deref()); |
| 324 | } | 324 | } |
| 325 | } else if path.is_file() { | 325 | } else if path.is_file() { |
| @@ -331,7 +331,7 @@ impl MprisPlayer { | |||
| 331 | if let Ok(mut s) = self.scrobble_state.lock() { | 331 | if let Ok(mut s) = self.scrobble_state.lock() { |
| 332 | s.start(track.clone()); | 332 | s.start(track.clone()); |
| 333 | } | 333 | } |
| 334 | let fmt = Config::load().ok().and_then(|c| c.display_format.clone()); | 334 | let fmt = Config::cached().ok().and_then(|c| c.display_format.clone()); |
| 335 | notification::notify_track(&track, fmt.as_deref()); | 335 | notification::notify_track(&track, fmt.as_deref()); |
| 336 | } | 336 | } |
| 337 | } | 337 | } |
| @@ -417,7 +417,7 @@ impl MprisPlayer { | |||
| 417 | fn set_volume(&self, value: f64) { | 417 | fn set_volume(&self, value: f64) { |
| 418 | let level = (value * 100.0).clamp(0.0, 100.0) as u8; | 418 | let level = (value * 100.0).clamp(0.0, 100.0) as u8; |
| 419 | self.audio.set_volume(level as f32 / 100.0); | 419 | self.audio.set_volume(level as f32 / 100.0); |
| 420 | if let Ok(mut config) = Config::load() { | 420 | if let Ok(mut config) = Config::cached() { |
| 421 | config.volume = Some(level); | 421 | config.volume = Some(level); |
| 422 | let _ = config.save(); | 422 | let _ = config.save(); |
| 423 | } | 423 | } |
