gst

Author: revmischa

src/app.rs

@@ -14,6 +14,7 @@ pub struct App {
     gl_context: sdl2::video::GLContext,
     window: sdl2::video::Window,
     config: config::Config,
+    audio: audio::Audio,
 }
 
 pub fn default_config() -> config::Config {
@@ -63,6 +64,9 @@ impl App {
         let (width, height) = window.drawable_size(); // highDPI aware
         projectm::set_window_size(pm, width.try_into().unwrap(), height.try_into().unwrap());
 
+        // initialize audio
+        let audio = audio::Audio::new(&sdl_context);
+
         Self {
             pm,
             playlist,
@@ -74,14 +78,12 @@ impl App {
             } else {
                 default_config()
             },
+            audio,
         }
     }
 
     pub fn init(&mut self) {
-        // read config
+        // load config
         self.load_config(&self.config);
-
-        // initialize audio
-        let audio = audio::Audio::new(&self);
     }
 }

src/app/audio.rs

@@ -1,19 +1,16 @@
-use crate::app::App;
 use sdl2::audio::{AudioCallback, AudioDevice, AudioSpecDesired};
 
 pub struct Audio {
-    app: &App,
     audio_subsystem: sdl2::AudioSubsystem,
     audio_device_index: u8,
     // device_list: Vec<sdl2::audio::AudioDevice>,
 }
 
 impl Audio {
-    pub fn new(app: &App) -> Self {
-        let audio_subsystem = app.sdl_context.audio().unwrap();
+    pub fn new(sdl_context: &sdl2::Sdl) -> Self {
+        let audio_subsystem = sdl_context.audio().unwrap();
 
         Self {
-            app,
             audio_subsystem,
             audio_device_index: 0,
         }
@@ -29,12 +26,29 @@ impl Audio {
     //     }
     // }
 
-    pub fn begin_audio_capture(mut self) {
-        let frame_rate = self.app.config.frame_rate.unwrap();
+    pub fn begin_audio_capture(self, frame_rate: u32) {
+        let sample_rate: u32 = 44100;
+
+        // should be enough for 1 frame
+        let buffer_size = (sample_rate / frame_rate) as u16;
+
         let desired_spec = AudioSpecDesired {
-            freq: Some(44100),
+            freq: Some(sample_rate.try_into().unwrap()),
             channels: None,
-            samples: Some(512), // should be 1 frame
+            samples: Some(buffer_size),
         };
+
+        // let audio_device = self
+        //     .audio_subsystem
+        //     .open_capture(None, &desired_spec, |spec| {
+        //         // initialize the audio callback
+        //         AudioCallback {
+        //             spec,
+        //             buffer_size,
+        //             buffer: vec![0; buffer_size as usize],
+        //             position: 0,
+        //         }
+        //     })
+        //     .unwrap();
     }
 }

src/app/config.rs

@@ -9,7 +9,7 @@ impl Default for Config {
     fn default() -> Self {
         // default preset path
         Self {
-            // load from home dir or w/e
+            // TODO: load from home dir or w/e
             preset_path: Some(String::from("/usr/local/share/projectM/presets")),
             frame_rate: Some(60),
         }