sdl3

Author: revmischa

Cargo.lock

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

Cargo.toml

@@ -1,7 +1,7 @@
 use std::sync::{Arc, Mutex};
 
-use projectm_rs::core::{ProjectMHandle, Projectm};
-use sdl2::video::GLProfile;
+use projectm::core::{ProjectMHandle, Projectm};
+use sdl3::video::GLProfile;
 
 pub mod audio;
 pub mod config;
@@ -15,12 +15,12 @@ pub type ProjectMWrapped = Arc<Mutex<ProjectMHandle>>;
 /// Application state
 pub struct App {
     pm: ProjectMWrapped,
-    playlist: projectm_rs::playlist::Playlist,
-    sdl_context: sdl2::Sdl,
-    window: sdl2::video::Window,
+    playlist: projectm::playlist::Playlist,
+    sdl_context: sdl3::Sdl,
+    window: sdl3::video::Window,
     config: config::Config,
     audio: audio::Audio,
-    _gl_context: sdl2::video::GLContext,
+    _gl_context: sdl3::video::GLContext,
 }
 
 pub fn default_config() -> config::Config {
@@ -30,7 +30,7 @@ pub fn default_config() -> config::Config {
 impl App {
     pub fn new(config: Option<crate::app::config::Config>) -> Self {
         // setup sdl
-        let sdl_context = sdl2::init().unwrap();
+        let sdl_context = sdl3::init().unwrap();
         let video_subsystem = sdl_context.video().unwrap();
 
         // request GL version
@@ -64,7 +64,7 @@ impl App {
         let pm = Projectm::create();
 
         // and a preset playlist
-        let playlist = projectm_rs::playlist::Playlist::create(pm);
+        let playlist = projectm::playlist::Playlist::create(pm);
 
         // get/set window size
         let (width, height) = window.drawable_size(); // highDPI aware

src/app.rs

@@ -1,5 +1,5 @@
-use projectm_rs::core::ProjectMHandle;
-use sdl2::audio::{AudioCallback, AudioDevice, AudioSpecDesired};
+use projectm::core::ProjectMHandle;
+use sdl3::audio::{AudioCallback, AudioDevice, AudioSpecDesired};
 use std::sync::Arc;
 use std::sync::Mutex;
 
@@ -15,7 +15,7 @@ pub struct AudioCaptureDevice {
 }
 
 pub struct Audio {
-    audio_subsystem: sdl2::AudioSubsystem,
+    audio_subsystem: sdl3::AudioSubsystem,
     device_index: AudioDeviceIndex,
     is_capturing: bool,
     frame_rate: Option<FrameRate>,
@@ -25,7 +25,7 @@ pub struct Audio {
 
 /// Wrapper around the audio subsystem to capture audio and pass it to projectM.
 impl Audio {
-    pub fn new(sdl_context: &sdl2::Sdl, projectm: ProjectMWrapped) -> Self {
+    pub fn new(sdl_context: &sdl3::Sdl, projectm: ProjectMWrapped) -> Self {
         let audio_subsystem = sdl_context.audio().unwrap();
 
         Self {
@@ -106,7 +106,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_rs::core::Projectm::pcm_get_max_samples()
+        let max_samples: usize = projectm::core::Projectm::pcm_get_max_samples()
             .try_into()
             .unwrap();
         let samples_per_frame = (sample_rate / frame_rate) as usize;
@@ -183,6 +183,6 @@ impl AudioCallback for AudioCaptureCallback {
     // we need to pass it to projectm
     fn callback(&mut self, out: &mut [SampleFormat]) {
         let pm = *self.pm.lock().unwrap();
-        projectm_rs::core::Projectm::pcm_add_float(pm, out.to_vec(), 2);
+        projectm::core::Projectm::pcm_add_float(pm, out.to_vec(), 2);
     }
 }

src/app/audio.rs

@@ -1,5 +1,5 @@
 use crate::app::App;
-use projectm_rs::core::Projectm;
+use projectm::core::Projectm;
 use std::path::Path;
 
 pub type FrameRate = u32;

src/app/config.rs

@@ -1,6 +1,6 @@
-use projectm_rs::core::Projectm;
-use sdl2::event::Event;
-use sdl2::keyboard::Keycode;
+use projectm::core::Projectm;
+use sdl3::event::Event;
+use sdl3::keyboard::Keycode;
 
 use crate::app::App;
 
@@ -14,7 +14,7 @@ impl App {
 
         // events
         let mut event_pump = self.sdl_context.event_pump().unwrap();
-        let mut timer = self.sdl_context.timer().unwrap();
+        let timer = self.sdl_context.timer().unwrap();
 
         // renderLoop
         'running: loop {
@@ -82,10 +82,10 @@ impl App {
                     Event::KeyUp {
                         keycode: Some(Keycode::I),
                         keymod:
-                            sdl2::keyboard::Mod::LCTRLMOD
-                            | sdl2::keyboard::Mod::RCTRLMOD
-                            | sdl2::keyboard::Mod::LGUIMOD
-                            | sdl2::keyboard::Mod::RGUIMOD,
+                            sdl3::keyboard::Mod::LCTRLMOD
+                            | sdl3::keyboard::Mod::RCTRLMOD
+                            | sdl3::keyboard::Mod::LGUIMOD
+                            | sdl3::keyboard::Mod::RGUIMOD,
                         ..
                     } => {
                         self.audio.open_next_device();

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 {
-                sdl2::video::FullscreenType::True => sdl2::video::FullscreenType::Off,
-                _ => sdl2::video::FullscreenType::True,
+                sdl3::video::FullscreenType::True => sdl3::video::FullscreenType::Off,
+                _ => sdl3::video::FullscreenType::True,
             })
             .unwrap();
     }

src/app/video.rs

@@ -1,4 +1,4 @@
-use projectm_rs::core::{ProjectMHandle, Projectm};
+use projectm::core::{ProjectMHandle, Projectm};
 
 #[allow(dead_code)]
 pub fn generate_random_audio_data(projectm_handle: ProjectMHandle) {