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

Allow for volume control

Browse source
This commit is contained in:
Gwilym Kuiper 2021-06-25 21:57:24 +01:00
parent c81d73f8d5
commit 3c0d881a45
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
agb/src/sound/mixer/mod.rs
View file

@ -30,6 +30,7 @@ pub struct SoundChannel {
should_loop: bool, should_loop: bool,
playback_speed: Num<usize, 8>, playback_speed: Num<usize, 8>,
volume: Num<i16, 4>, // between 0 and 1
panning: Num<i16, 4>, // between -1 and 1 panning: Num<i16, 4>, // between -1 and 1
is_done: bool, is_done: bool,
@ -47,6 +48,7 @@ impl SoundChannel {
panning: 0.into(), panning: 0.into(),
is_done: false, is_done: false,
priority: SoundPriority::Low, priority: SoundPriority::Low,
volume: 1.into(),
} }
} }
@ -59,6 +61,7 @@ impl SoundChannel {
panning: 0.into(), panning: 0.into(),
is_done: false, is_done: false,
priority: SoundPriority::High, priority: SoundPriority::High,
volume: 1.into(),
} }
} }
@ -79,4 +82,12 @@ impl SoundChannel {
self.panning = panning; self.panning = panning;
self self
} }
pub fn volume<'a>(&'a mut self, volume: Num<i16, 4>) -> &'a mut Self {
assert!(volume <= Num::new(1), "volume must be <= 1");
assert!(volume >= Num::new(0), "volume must be >= 0");
self.volume = volume;
self
}
} }

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

@ -117,8 +117,8 @@ impl MixerBuffer {
continue; continue;
} }
let right_amount = (channel.panning + 1) / 2; let right_amount = ((channel.panning + 1) / 2) * channel.volume;
let left_amount = -right_amount + 1; let left_amount = (-right_amount + 1) * channel.volume;
if channel.pos + channel.playback_speed * SOUND_BUFFER_SIZE >= channel.data.len().into() if channel.pos + channel.playback_speed * SOUND_BUFFER_SIZE >= channel.data.len().into()
{ {