alex/agb
1
0
Fork 0
mirror of https://github.com/italicsjenga/agb.git synced 2024-12-24 08:41:34 +11:00
Code Issues Packages Projects Releases Wiki Activity

Return an indication as to what the sound ID is

Browse source
This commit is contained in:
Gwilym Kuiper 2021-06-25 21:31:17 +01:00
parent 2409cd5538
commit 754abd58bd
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
agb/src/sound/mixer/sw_mixer.rs
View file

@ -8,6 +8,8 @@ pub struct Mixer {
channels: [Option<SoundChannel>; 16], channels: [Option<SoundChannel>; 16],
} }
pub struct ChannelId(usize);
impl Mixer { impl Mixer {
pub(super) fn new() -> Self { pub(super) fn new() -> Self {
Mixer { Mixer {
@ -29,8 +31,8 @@ impl Mixer {
.write_channels(self.channels.iter_mut().flatten()); .write_channels(self.channels.iter_mut().flatten());
} }
pub fn play_sound(&mut self, new_channel: SoundChannel) { pub fn play_sound(&mut self, new_channel: SoundChannel) -> Option<ChannelId> {
for channel in self.channels.iter_mut() { for (i, channel) in self.channels.iter_mut().enumerate() {
if let Some(some_channel) = channel { if let Some(some_channel) = channel {
if !some_channel.is_done { if !some_channel.is_done {
continue; continue;
@ -38,20 +40,20 @@ impl Mixer {
} }
channel.replace(new_channel); channel.replace(new_channel);
return; return Some(ChannelId(i));
} }
if new_channel.priority == SoundPriority::Low { if new_channel.priority == SoundPriority::Low {
return; // don't bother even playing it return None; // don't bother even playing it
} }
for channel in self.channels.iter_mut() { for (i, channel) in self.channels.iter_mut().enumerate() {
if channel.as_ref().unwrap().priority == SoundPriority::High { if channel.as_ref().unwrap().priority == SoundPriority::High {
continue; continue;
} }
channel.replace(new_channel); channel.replace(new_channel);
return; return Some(ChannelId(i));
} }
panic!("Cannot play more than 16 sounds at once"); panic!("Cannot play more than 16 sounds at once");