WIP

Author: revmischa

.cargo/config.toml

@@ -0,0 +1,3 @@
+[env]
+# use pipewire for audio
+SDL_AUDIODRIVER = "pipewire"

.gitignore

@@ -1,4 +1,2 @@
-.*
-!.gitignore
-
-target/
+.vscode/
+target/

Cargo.lock

@@ -8,11 +8,13 @@ rust-version = "1.68.2"
 
 [dependencies]
 libc = "*"
-sdl3 = { git = "https://github.com/revmischa/sdl3-rs.git" }
-projectm = "1.0.5"
-# projectm = { path = "../projectm-rs" }
+# sdl3 = { git = "https://github.com/revmischa/sdl3-rs.git" }
+sdl3 = { path = "../../sdl3-rs" }
+# projectm = "1.0.5"
+projectm = { path = "../projectm-rs" }
 #projectm = { git = "https://github.com/projectM-visualizer/projectm" }
 # gl = "0.14.0"
 
 [features]
+static-link = ["sdl3/static-link"]
 dummy_audio = []

Cargo.toml

@@ -31,6 +31,12 @@ impl App {
     pub fn new(config: Option<crate::app::config::Config>) -> Self {
         // setup sdl
         let sdl_context = sdl3::init().unwrap();
+        // print SDL version
+        let version = sdl3::version::version();
+        println!(
+            "SDL version: {}.{}.{}",
+            version.major, version.minor, version.patch
+        );
         let video_subsystem = sdl_context.video().unwrap();
 
         // request GL version
@@ -45,14 +51,22 @@ impl App {
         // create window
         // get screen dimensions
         let display_index = 0;
-        let display_mode = video_subsystem.desktop_display_mode(display_index).unwrap();
-        let window_width = display_mode.w as u32;
-        let window_height = display_mode.h as u32;
+        let driver = video_subsystem.current_video_driver();
+        println!("Using video driver: {}", driver);
+        let display_id = video_subsystem.get_primary_display_id();
+        let display_mode = video_subsystem.current_display_mode(display_id).unwrap();
+        let window_width = 100; // display_mode.w as u32;
+        let window_height = 100; // display_mode.h as u32;
+        println!(
+            "Display {} is {}x{}",
+            display_index, window_width, window_height
+        );
         let window = video_subsystem
             .window("ProjectM", window_width, window_height)
             .opengl()
+            .maximized()
             .position_centered()
-            .allow_highdpi()
+            // .allow_highdpi()
             .build()
             .expect("could not initialize video subsystem");
 
@@ -67,7 +81,7 @@ impl App {
         let playlist = projectm::playlist::Playlist::create(pm);
 
         // get/set window size
-        let (width, height) = window.drawable_size(); // highDPI aware
+        let (width, height) = window.size(); // TODO: need high DPI support here https://github.com/libsdl-org/SDL/issues/7134
         Projectm::set_window_size(pm, width.try_into().unwrap(), height.try_into().unwrap());
 
         // create a mutex to protect the projectM instance

src/app.rs

@@ -27,6 +27,10 @@ pub struct Audio {
 impl Audio {
     pub fn new(sdl_context: &sdl3::Sdl, projectm: ProjectMWrapped) -> Self {
         let audio_subsystem = sdl_context.audio().unwrap();
+        println!(
+            "Using audio driver: {}",
+            audio_subsystem.current_audio_driver()
+        );
 
         Self {
             is_capturing: false,
@@ -44,7 +48,7 @@ impl Audio {
         self.frame_rate = frame_rate.into();
 
         #[cfg(not(feature = "dummy_audio"))]
-        self.begin_audio_capture();
+        self.begin_audio_capture(0);
     }
 
     pub fn list_devices(&self) {
@@ -60,12 +64,12 @@ impl Audio {
     pub fn capture_device(&mut self, device_index: AudioDeviceIndex) {
         self.stop_audio_capture();
         self.device_index = device_index;
-        self.begin_audio_capture();
+        self.begin_audio_capture(device_index);
     }
 
-    pub fn get_current_device_name(&self) -> String {
+    pub fn get_device_name(&self, device_index: AudioDeviceIndex) -> String {
         self.audio_subsystem
-            .audio_capture_device_name(self.device_index)
+            .audio_capture_device_name(device_index)
             .expect("could not get audio device")
     }
 
@@ -99,7 +103,7 @@ impl Audio {
             .collect::<Vec<_>>()
     }
 
-    pub fn begin_audio_capture(&mut self) {
+    pub fn begin_audio_capture(&mut self, device_index: AudioDeviceIndex) {
         let sample_rate: u32 = 44100;
         let frame_rate = self.frame_rate.unwrap();
 
@@ -120,7 +124,7 @@ impl Audio {
         };
 
         // open audio device for capture
-        let device_name = self.get_current_device_name();
+        let device_name = self.get_device_name(device_index);
         let audio_device = match self
             .audio_subsystem // sdl
             .open_capture(device_name.as_str(), &desired_spec, |_spec| {
@@ -150,7 +154,7 @@ impl Audio {
     }
 
     pub fn stop_audio_capture(&mut self) {
-        let current_device_name = self.get_current_device_name();
+        let current_device_name = self.get_device_name(self.device_index);
         println!("Stopping audio capture for device {}", current_device_name);
 
         println!(
@@ -165,6 +169,7 @@ impl Audio {
         device.pause();
 
         self.is_capturing = false;
+        drop(device);
     }
 }
 

src/app/audio.rs

@@ -32,7 +32,7 @@ impl Default for Config {
         // use /usr/local/share/projectM if it exists, otherwise use local paths
         let resource_dir = "/usr/local/share/projectM";
         let dir_exists = Path::new(&resource_dir).exists();
-        let preset_path = if dir_exists {
+        let preset_path = if dir_exists && false {
             String::from(resource_dir) + "/presets"
         } else {
             // just test presets

src/app/config.rs

@@ -111,10 +111,12 @@ impl App {
 
             if frame_rate > 0 {
                 // calculate frame time
-                let frame_time = timer.ticks() - start_time;
-                if frame_time < 1000 / frame_rate {
+                let frame_time: u32 = (timer.ticks() - start_time).try_into().unwrap();
+                // what do we need to hit target frame rate?
+                let delay_needed: u32 = 1000 / frame_rate - frame_time;
+                if delay_needed > 0 {
                     // sleep the remaining frame time
-                    timer.delay(1000 / frame_rate - frame_time);
+                    timer.delay(delay_needed);
                 }
             }
         }

src/app/main_loop.rs

@@ -5,8 +5,8 @@ impl App {
         let is_fullscreen = self.window.fullscreen_state();
         self.window
             .set_fullscreen(match is_fullscreen {
-                sdl3::video::FullscreenType::True => sdl3::video::FullscreenType::Off,
-                _ => sdl3::video::FullscreenType::True,
+                sdl3::video::FullscreenType::True => false,
+                _ => true,
             })
             .unwrap();
     }