From 9e8727c02bcce5f9ba568cf3ed82f4d2dd64b3df Mon Sep 17 00:00:00 2001
From: gered <gered@blarg.ca>
Date: Sun, 29 May 2022 14:27:04 -0400
Subject: [PATCH] replace TARGET_AUDIO_SPEC with separate constants for freq
 and channels

---
 libretrogd/src/audio/mod.rs  | 11 ++++-------
 libretrogd/src/system/mod.rs |  4 ++--
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/libretrogd/src/audio/mod.rs b/libretrogd/src/audio/mod.rs
index b2ff56b..c73dcff 100644
--- a/libretrogd/src/audio/mod.rs
+++ b/libretrogd/src/audio/mod.rs
@@ -1,6 +1,6 @@
 use std::ops::{Index, IndexMut};
 
-use sdl2::audio::{AudioCallback, AudioFormat, AudioSpecDesired};
+use sdl2::audio::{AudioCallback, AudioFormat, AudioFormatNum, AudioSpecDesired};
 use sdl2::AudioSubsystem;
 use thiserror::Error;
 
@@ -14,13 +14,10 @@ pub const AUDIO_FREQUENCY_44KHZ: u32 = 44100;
 pub const AUDIO_FREQUENCY_22KHZ: u32 = 22050;
 pub const AUDIO_FREQUENCY_11KHZ: u32 = 11025;
 
-pub const SILENCE: u8 = sdl2::audio::AudioFormatNum::SILENCE;
+pub const SILENCE: u8 = AudioFormatNum::SILENCE;
 
-pub const TARGET_AUDIO_SPEC: AudioSpec = AudioSpec {
-    frequency: AUDIO_FREQUENCY_22KHZ,
-    channels: 1,
-    format: AudioFormat::U8,
-};
+pub const TARGET_AUDIO_FREQUENCY: u32 = AUDIO_FREQUENCY_22KHZ;
+pub const TARGET_AUDIO_CHANNELS: u8 = 1;
 
 //////////////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/libretrogd/src/system/mod.rs b/libretrogd/src/system/mod.rs
index 674e90e..cc04367 100644
--- a/libretrogd/src/system/mod.rs
+++ b/libretrogd/src/system/mod.rs
@@ -246,8 +246,8 @@ impl SystemBuilder {
         };
 
         let audio_spec = AudioSpecDesired {
-            freq: Some(TARGET_AUDIO_SPEC.frequency() as i32),
-            channels: Some(TARGET_AUDIO_SPEC.channels()),
+            freq: Some(TARGET_AUDIO_FREQUENCY as i32),
+            channels: Some(TARGET_AUDIO_CHANNELS),
             samples: None,
         };
         let mut audio = Audio::new(audio_spec, &sdl_audio_subsystem)?;