gered/ggdt
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

simplify

Browse source
This commit is contained in:
Gered 2022-05-29 17:47:24 -04:00
parent 28c964e37e
commit 17e30fdec4
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/audio_playback/src/main.rs
View file

@ -100,7 +100,7 @@ fn main() -> Result<()> {
} }
if system.keyboard.is_key_pressed(Scancode::Num6) { if system.keyboard.is_key_pressed(Scancode::Num6) {
audio_device.play_generator(Box::new(SineWaveGenerator::new()), false); audio_device.play_generator(SineWaveGenerator::new(), false);
} }
for index in 0..NUM_CHANNELS { for index in 0..NUM_CHANNELS {

6
libretrogd/src/audio/mod.rs
View file

@ -152,9 +152,9 @@ impl AudioChannel {
self.loops = loops; self.loops = loops;
} }
pub fn play_generator(&mut self, generator: Box<dyn AudioGenerator>, loops: bool) { pub fn play_generator(&mut self, generator: impl AudioGenerator + 'static, loops: bool) {
self.data.clear(); self.data.clear();
self.generator = Some(generator); self.generator = Some(Box::new(generator));
self.position = 0; self.position = 0;
self.playing = true; self.playing = true;
self.loops = loops; self.loops = loops;
@ -250,7 +250,7 @@ impl AudioDevice {
} }
} }
pub fn play_generator(&mut self, generator: Box<dyn AudioGenerator>, loops: bool) -> Result<Option<&mut AudioChannel>, AudioDeviceError> { pub fn play_generator(&mut self, generator: impl AudioGenerator + 'static, loops: bool) -> Result<Option<&mut AudioChannel>, AudioDeviceError> {
if let Some(channel) = self.stopped_channels_iter_mut().next() { if let Some(channel) = self.stopped_channels_iter_mut().next() {
channel.play_generator(generator, loops); channel.play_generator(generator, loops);
Ok(Some(channel)) Ok(Some(channel))