phantop/doukutsu-rs
1
0
Fork 0
mirror of https://github.com/doukutsu-rs/doukutsu-rs synced 2024-10-31 19:44:20 +00:00
Code Issues Releases Wiki Activity

save prev bgm song id as well

Browse source
This commit is contained in:
Alula 2020-09-05 04:08:59 +02:00
parent d335c21f50
commit f137d84a46
No known key found for this signature in database
GPG key ID: 3E00485503A1D8BA
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/sound/mod.rs
View file

@ -22,6 +22,7 @@ mod wav;
pub struct SoundManager { pub struct SoundManager {
tx: Sender<PlaybackMessage>, tx: Sender<PlaybackMessage>,
prev_song_id: usize,
current_song_id: usize, current_song_id: usize,
} }
@ -92,6 +93,7 @@ impl SoundManager {
Ok(SoundManager { Ok(SoundManager {
tx: tx.clone(), tx: tx.clone(),
prev_song_id: 0,
current_song_id: 0, current_song_id: 0,
}) })
} }
@ -110,6 +112,7 @@ impl SoundManager {
let org = organya::Song::load_from(filesystem::open(ctx, ["/base/Org/", &song_name.to_lowercase(), ".org"].join(""))?)?; let org = organya::Song::load_from(filesystem::open(ctx, ["/base/Org/", &song_name.to_lowercase(), ".org"].join(""))?)?;
log::info!("Playing BGM: {}", song_name); log::info!("Playing BGM: {}", song_name);
self.prev_song_id = self.current_song_id;
self.current_song_id = song_id; self.current_song_id = song_id;
self.tx.send(PlaybackMessage::SaveState)?; self.tx.send(PlaybackMessage::SaveState)?;
self.tx.send(PlaybackMessage::PlaySong(Box::new(org)))?; self.tx.send(PlaybackMessage::PlaySong(Box::new(org)))?;
@ -119,12 +122,14 @@ impl SoundManager {
pub fn save_state(&mut self) -> GameResult { pub fn save_state(&mut self) -> GameResult {
self.tx.send(PlaybackMessage::SaveState)?; self.tx.send(PlaybackMessage::SaveState)?;
self.prev_song_id = self.current_song_id;
Ok(()) Ok(())
} }
pub fn restore_state(&mut self) -> GameResult { pub fn restore_state(&mut self) -> GameResult {
self.tx.send(PlaybackMessage::RestoreState)?; self.tx.send(PlaybackMessage::RestoreState)?;
self.current_song_id = self.prev_song_id;
Ok(()) Ok(())
} }