From c5b2e216cf3de0154f18f0f80c8b34315360719e Mon Sep 17 00:00:00 2001 From: gered Date: Sun, 29 May 2022 13:22:03 -0400 Subject: [PATCH] formatting --- libretrogd/src/audio/mod.rs | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/libretrogd/src/audio/mod.rs b/libretrogd/src/audio/mod.rs index df8c58a..16ee496 100644 --- a/libretrogd/src/audio/mod.rs +++ b/libretrogd/src/audio/mod.rs @@ -15,7 +15,13 @@ pub const AUDIO_FREQUENCY_11KHZ: u32 = 11025; pub const SILENCE: u8 = sdl2::audio::AudioFormatNum::SILENCE; -pub const TARGET_AUDIO_SPEC: AudioSpec = AudioSpec { frequency: AUDIO_FREQUENCY_22KHZ, channels: 1, format: AudioFormat::U8 }; +pub const TARGET_AUDIO_SPEC: AudioSpec = AudioSpec { + frequency: AUDIO_FREQUENCY_22KHZ, + channels: 1, + format: AudioFormat::U8, +}; + +////////////////////////////////////////////////////////////////////////////////////////////////// #[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)] pub struct AudioSpec { @@ -29,7 +35,7 @@ impl AudioSpec { AudioSpec { frequency, channels, - format + format, } } @@ -49,6 +55,8 @@ impl AudioSpec { } } +////////////////////////////////////////////////////////////////////////////////////////////////// + #[derive(Debug, Clone)] pub struct AudioChannel { pub playing: bool, @@ -145,10 +153,12 @@ impl AudioChannel { } } +////////////////////////////////////////////////////////////////////////////////////////////////// + #[derive(Debug, Error)] pub enum AudioDeviceError { #[error("That buffer's AudioSpec does not match the device's AudioSpec")] - AudioSpecMismatch + AudioSpecMismatch, } pub struct AudioDevice { @@ -197,7 +207,11 @@ impl AudioDevice { } } - pub fn play_buffer(&mut self, buffer: &AudioBuffer, loops: bool) -> Result, AudioDeviceError> { + pub fn play_buffer( + &mut self, + buffer: &AudioBuffer, + loops: bool, + ) -> Result, AudioDeviceError> { if buffer.spec != self.spec { Err(AudioDeviceError::AudioSpecMismatch) } else { @@ -267,6 +281,8 @@ impl IndexMut for AudioDevice { } } +////////////////////////////////////////////////////////////////////////////////////////////////// + #[derive(Error, Debug)] pub enum AudioBufferError { #[error("Error during format conversion: {0}")]