mark/musicdb
1
0
Fork 0
mirror of https://github.com/Dummi26/musicdb.git synced 2025-03-10 14:13:53 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

-client now compiles with --no-default-features again + small bugfix for syncplayer

Browse Source
This commit is contained in:
Mark 2023-11-05 10:45:19 +01:00
parent ec475aa1af
commit a151aa8712
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
musicdb-client/src/main.rs
View File

@ -8,6 +8,7 @@ use std::{
};
use clap::{Parser, Subcommand};
#[cfg(feature = "speedy2d")]
use gui::GuiEvent;
use musicdb_lib::{
data::{
@ -40,6 +41,7 @@ mod gui_settings;
mod gui_text;
#[cfg(feature = "speedy2d")]
mod gui_wrappers;
#[cfg(feature = "speedy2d")]
mod textcfg;
#[derive(Parser, Debug)]
@ -91,7 +93,7 @@ fn main() {
thread::spawn(move || {
let mut player =
if matches!(mode, Mode::SyncplayerLocal { .. } | Mode::SyncplayerNetwork) {
Some(Player::new().unwrap())
Some(Player::new().unwrap().without_sending_commands())
} else {
None
};

21
musicdb-lib/src/player/mod.rs
View File

@ -24,6 +24,7 @@ pub struct Player {
manager: Manager,
current_song_id: SongOpt,
cached: HashSet<SongId>,
allow_sending_commands: bool,
}
pub enum SongOpt {
@ -42,8 +43,13 @@ impl Player {
source: None,
current_song_id: SongOpt::None,
cached: HashSet::new(),
allow_sending_commands: true,
})
}
pub fn without_sending_commands(mut self) -> Self {
self.allow_sending_commands = false;
self
}
pub fn handle_command(&mut self, command: &Command) {
match command {
Command::Resume => self.resume(),
@ -76,18 +82,25 @@ impl Player {
}
}
pub fn update(&mut self, db: &mut Database) {
macro_rules! apply_command {
($cmd:expr) => {
if self.allow_sending_commands {
db.apply_command($cmd);
}
};
}
if db.playing && self.source.is_none() {
if let Some(song) = db.queue.get_current_song() {
// db playing, but no source - initialize a source (via SongOpt::New)
self.current_song_id = SongOpt::New(Some(*song));
} else {
// db.playing, but no song in queue...
db.apply_command(Command::Stop);
apply_command!(Command::Stop);
}
} else if let Some((_source, notif)) = &mut self.source {
if let Ok(()) = notif.try_recv() {
// song has finished playing
db.apply_command(Command::NextSong);
apply_command!(Command::NextSong);
self.current_song_id = SongOpt::New(db.queue.get_current_song().cloned());
}
}
@ -136,7 +149,7 @@ impl Player {
}
Err(e) => {
eprintln!("[player] Can't play, skipping! {e}");
db.apply_command(Command::NextSong);
apply_command!(Command::NextSong);
}
}
} else {
@ -145,7 +158,7 @@ impl Player {
"NoSongData".to_owned(),
format!("Couldn't load song #{}\n({})", song.id, song.title),
));
db.apply_command(Command::NextSong);
apply_command!(Command::NextSong);
}
} else {
self.source = None;