alex/agb
1
0
Fork 0
mirror of https://github.com/italicsjenga/agb.git synced 2024-12-23 16:21:33 +11:00
Code Issues Packages Projects Releases Wiki Activity

Add lifetimes to the mixer

Browse source
This commit is contained in:
Gwilym Kuiper 2023-02-23 20:44:20 +00:00
parent 5ac408d414
commit 2bab48b422
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -114,7 +114,7 @@ impl MixerController {
} }
/// Get a [`Mixer`] in order to start producing sounds. /// Get a [`Mixer`] in order to start producing sounds.
pub fn mixer(&mut self, frequency: Frequency) -> Mixer { pub fn mixer(&mut self, frequency: Frequency) -> Mixer<'_> {
Mixer::new(frequency) Mixer::new(frequency)
} }
} }

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

@ -1,4 +1,5 @@
use core::cell::RefCell; use core::cell::RefCell;
use core::marker::PhantomData;
use core::pin::Pin; use core::pin::Pin;
use alloc::boxed::Box; use alloc::boxed::Box;
@ -78,7 +79,7 @@ extern "C" {
/// } /// }
/// # } /// # }
/// ``` /// ```
pub struct Mixer { pub struct Mixer<'gba> {
interrupt_timer: Timer, interrupt_timer: Timer,
// SAFETY: Has to go before buffer because it holds a reference to it // SAFETY: Has to go before buffer because it holds a reference to it
_interrupt_handler: InterruptHandler<'static>, _interrupt_handler: InterruptHandler<'static>,
@ -91,6 +92,8 @@ pub struct Mixer {
working_buffer: Box<[Num<i16, 4>], InternalAllocator>, working_buffer: Box<[Num<i16, 4>], InternalAllocator>,
fifo_timer: Timer, fifo_timer: Timer,
phantom: PhantomData<&'gba ()>,
} }
/// A pointer to a currently playing channel. /// A pointer to a currently playing channel.
@ -116,7 +119,7 @@ pub struct Mixer {
/// ``` /// ```
pub struct ChannelId(usize, i32); pub struct ChannelId(usize, i32);
impl Mixer { impl Mixer<'_> {
pub(super) fn new(frequency: Frequency) -> Self { pub(super) fn new(frequency: Frequency) -> Self {
let buffer = Box::pin_in(MixerBuffer::new(frequency), InternalAllocator); let buffer = Box::pin_in(MixerBuffer::new(frequency), InternalAllocator);
@ -158,6 +161,8 @@ impl Mixer {
working_buffer: working_buffer.into_boxed_slice(), working_buffer: working_buffer.into_boxed_slice(),
fifo_timer, fifo_timer,
phantom: PhantomData,
} }
} }