johrpan/musicus
1
0
Fork 0
mirror of https://github.com/johrpan/musicus.git synced 2025-10-26 11:47:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

main screen: Add button to start random playback

Browse source
This commit is contained in:
Elias Projahn 2022-02-08 18:18:29 +01:00
parent 487fd0a048
commit 3350c6be95
5 changed files with 57 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

47
backend/src/player.rs
View file

@ -110,18 +110,18 @@ impl Player {
result
.mpris
.connect_play_pause(clone!(@weak result => move || {
result.play_pause();
result.play_pause().unwrap();
}));
result.mpris.connect_play(clone!(@weak result => move || {
if !result.is_playing() {
result.play_pause();
result.play_pause().unwrap();
}
}));
result.mpris.connect_pause(clone!(@weak result => move || {
if result.is_playing() {
result.play_pause();
result.play_pause().unwrap();
}
}));
@ -223,7 +223,7 @@ impl Player {
Ok(())
}
pub fn play_pause(&self) {
pub fn play_pause(&self) -> Result<()> {
if self.is_playing() {
self.player.pause();
self.playing.set(false);
@ -235,6 +235,10 @@ impl Player {
#[cfg(target_os = "linux")]
self.mpris.set_playback_status(PlaybackStatus::Paused);
} else {
if self.current_track.get().is_none() {
self.next()?;
}
self.player.play();
self.playing.set(true);
@ -245,6 +249,8 @@ impl Player {
#[cfg(target_os = "linux")]
self.mpris.set_playback_status(PlaybackStatus::Playing);
}
Ok(())
}
pub fn seek(&self, ms: u64) {
@ -287,23 +293,30 @@ impl Player {
}
pub fn next(&self) -> Result<()> {
let mut current_track = self.current_track.get().ok_or_else(|| {
Error::Other(String::from(
"Player tried to access non existant current track.",
))
})?;
let current_track = self.current_track.get();
let cb = self.generate_next_track_cb.borrow();
if current_track + 1 < self.playlist.borrow().len() {
current_track += 1;
} else if let Some(cb) = &*self.generate_next_track_cb.borrow() {
if let Some(current_track) = current_track {
if current_track + 1 >= self.playlist.borrow().len() {
if let Some(cb) = &*cb {
let new_track = cb();
self.add_item(new_track)?;
} else {
return Err(Error::Other(String::from("No existing next track.")));
}
}
self.set_track(current_track + 1)?;
Ok(())
} else if let Some(cb) = &*cb {
let new_track = cb();
self.add_item(new_track)?;
current_track += 1;
} else {
return Err(Error::Other(String::from("No existing next track.")));
}
self.set_track(current_track)
Ok(())
} else {
Err(Error::Other(String::from("No existing next track.")))
}
}
pub fn set_track(&self, current_track: usize) -> Result<()> {