Projectm rs 2.0.1 alpha (#7)

* sdl3

* sdl3

* WIP

* bindgen

* WIP

* update sdl3

* Update to use pm-rs 2.0.0-alpha

* WIP

* use Rc<T> to safely pass around references to pm

Author: revmischa

.gitignore

@@ -1,2 +1,3 @@
 .vscode/
 target/
+.nvim-dap.lua

Cargo.lock

@@ -8,13 +8,14 @@ rust-version = "1.68.2"
 
 [dependencies]
 libc = "*"
-projectm = "1.0.5"
-# projectm = { path = "../projectm-rs" }
-#projectm = { git = "https://github.com/projectM-visualizer/projectm" }
+# projectm = "1.0.5"
+ projectm = { path = "../projectm-rs", version = "2.0.1-alpha", features = [] }
+#projectm = { git = "https://github.com/projectM-visualizer/projectm" nd}
 # sdl3 = { git = "https://github.com/revmischa/sdl3-rs.git", features = ["use-bindgen"] }
-sdl3 = "0.5.0"
-# sdl3 = { path = "../../sdl3-rs" }
-
+# sdl3 = "0.5.0"
+sdl3 = { path = "../../sdl3-rs", version = "0.6.0", features = ["use-bindgen"] }
+rand = "0.8.5"
+include_dir = "0.7.3"
 # gl = "0.14.0"
 
 [features]

Cargo.toml

@@ -1,16 +1,15 @@
-use std::sync::{Arc, Mutex};
-
-use projectm::core::{ProjectMHandle, Projectm};
-use sdl3::video::GLProfile;
+use projectm::core::ProjectM;
+use sdl3::video::{GLProfile, WindowPos};
+use std::convert::TryInto;
+use std::rc::Rc;
 
 pub mod audio;
 pub mod config;
 pub mod main_loop;
 pub mod playlist;
 pub mod video;
 
-/// Thread-safe wrapper around the projectM instance.
-pub type ProjectMWrapped = Arc<Mutex<ProjectMHandle>>;
+pub type ProjectMWrapped = Rc<ProjectM>;
 
 /// Application state
 pub struct App {
@@ -49,23 +48,11 @@ impl App {
         assert_eq!(gl_attr.context_version(), (3, 3));
 
         // create window
-        // get screen dimensions
-        let display_index = 0;
-        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)
+            .window("ProjectM", 0, 0)
             .opengl()
             .maximized()
-            .position_centered()
+            .fullscreen()
             // .allow_highdpi()
             .build()
             .expect("could not initialize video subsystem");
@@ -75,23 +62,20 @@ impl App {
         window.gl_make_current(&gl_context).unwrap();
 
         // initialize projectM
-        let pm = Projectm::create();
+        let pm = Rc::new(ProjectM::create());
 
         // and a preset playlist
-        let playlist = projectm::playlist::Playlist::create(pm);
+        let playlist = projectm::playlist::Playlist::create(&pm);
 
         // get/set window size
-        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
-        let pm = Arc::new(Mutex::new(pm));
+        let (width, height) = window.size_in_pixels();
+        pm.set_window_size(width.try_into().unwrap(), height.try_into().unwrap());
 
         // initialize audio
-        let audio = audio::Audio::new(&sdl_context, pm.clone());
+        let audio = audio::Audio::new(&sdl_context, Rc::clone(&pm));
 
         Self {
-            pm: pm.clone(),
+            pm,
             playlist,
             sdl_context,
             window,

src/app.rs

@@ -1,11 +1,11 @@
-use projectm::core::ProjectMHandle;
+use projectm::core::ProjectM;
 use sdl3::audio::{AudioCallback, AudioDevice, AudioSpecDesired};
-use std::sync::Arc;
-use std::sync::Mutex;
 
 use super::config::FrameRate;
 use super::ProjectMWrapped;
 
+use std::rc::Rc;
+
 type AudioDeviceIndex = u32;
 type SampleFormat = f32; // format of audio samples
 
@@ -110,9 +110,7 @@ impl Audio {
         // how many samples to capture at a time
         // should be enough for 1 frame or less
         // should not be larger than max_samples / channels
-        let max_samples: usize = projectm::core::Projectm::pcm_get_max_samples()
-            .try_into()
-            .unwrap();
+        let max_samples: usize = ProjectM::pcm_get_max_samples().try_into().unwrap();
         let samples_per_frame = (sample_rate / frame_rate) as usize;
         let buffer_size = std::cmp::min(max_samples / 2, samples_per_frame);
         println!("Buffer size: {}", buffer_size);
@@ -135,7 +133,7 @@ impl Audio {
 
                 // return callback fn
                 AudioCaptureCallback {
-                    pm: self.projectm.clone(),
+                    pm: Rc::clone(&self.projectm),
                 }
             }) {
             Ok(device) => device,
@@ -176,7 +174,7 @@ impl Audio {
 struct AudioCaptureCallback {
     // we need to keep a reference to the projectm instance to
     // add the audio data to it
-    pm: Arc<Mutex<ProjectMHandle>>,
+    pm: ProjectMWrapped,
 }
 unsafe impl Send for AudioCaptureCallback {}
 unsafe impl Sync for AudioCaptureCallback {}
@@ -187,7 +185,6 @@ impl AudioCallback for AudioCaptureCallback {
     // we are receiving some chunk of audio data
     // we need to pass it to projectm
     fn callback(&mut self, out: &mut [SampleFormat]) {
-        let pm = *self.pm.lock().unwrap();
-        projectm::core::Projectm::pcm_add_float(pm, out.to_vec(), 2);
+        self.pm.pcm_add_float(out.to_vec(), 2);
     }
 }

src/app/audio.rs

@@ -1,5 +1,4 @@
 use crate::app::App;
-use projectm::core::Projectm;
 use std::path::Path;
 
 pub type FrameRate = u32;
@@ -57,7 +56,7 @@ impl Default for Config {
 
 impl App {
     pub fn load_config(&self, config: &Config) {
-        let pm = *self.pm.lock().unwrap();
+        let pm = &self.pm;
 
         // load presets if provided
         if let Some(preset_path) = &config.preset_path {
@@ -66,32 +65,31 @@ impl App {
 
         // set frame rate if provided
         if let Some(frame_rate) = config.frame_rate {
-            Projectm::set_fps(pm, frame_rate)
+            pm.set_fps(frame_rate);
         }
 
         // load textures if provided
         if let Some(texture_path) = &config.texture_path {
             let mut paths: Vec<String> = Vec::new();
             paths.push(texture_path.into());
-            Projectm::set_texture_search_paths(pm, &paths, 1);
+            pm.set_texture_search_paths(&paths, 1);
         }
 
         // set beat sensitivity if provided
         if let Some(beat_sensitivity) = config.beat_sensitivity {
-            Projectm::set_beat_sensitivity(pm, beat_sensitivity);
+            pm.set_beat_sensitivity(beat_sensitivity);
         }
 
         // set preset duration if provided
         if let Some(preset_duration) = config.preset_duration {
-            Projectm::set_preset_duration(pm, preset_duration);
+            pm.set_preset_duration(preset_duration);
         }
 
         // set preset shuffle mode
         // self.playlist.set_shuffle(true);
     }
 
     pub fn get_frame_rate(&self) -> FrameRate {
-        let pm = *self.pm.lock().unwrap();
-        Projectm::get_fps(pm)
+        self.pm.get_fps()
     }
 }