updating for projectM 4.0.0

Author: revmischa

Cargo.lock

@@ -1,5 +1,5 @@
 [package]
-name = "frontend-sdl2-rust"
+name = "projectM-SDL"
 version = "0.1.0"
 edition = "2021"
 
@@ -8,4 +8,4 @@ edition = "2021"
 [dependencies]
 libc = "*"
 sdl2 = "0.35.2"
-projectm-rs = "*"
+projectm-rs = "^1.0.3"

Cargo.toml

@@ -1,6 +1,6 @@
 use sdl2::event::Event;
 use sdl2::keyboard::Keycode;
-use projectm_rs;
+use projectm_rs::core::*;
 
 fn main() -> Result<(), String> {
     // setup sdl
@@ -18,39 +18,14 @@ fn main() -> Result<(), String> {
     let mut canvas = window.into_canvas().build()
         .expect("could not make a canvas");
 
-    // projectm::settings
-    let settings = projectm_rs::projectm_settings {
-        mesh_x: 96,
-        mesh_y: 54,
-        fps: 30,
-        texture_size: 512,
-        window_width: 640,
-        window_height: 360,
-        preset_duration: 15.0,
-        soft_cut_duration: 15.0,
-        hard_cut_duration: 60.0,
-        hard_cut_enabled: false,
-        hard_cut_sensitivity: 0.0,
-        beat_sensitivity: 0.5,
-        aspect_correction: true,
-        easter_egg: 0.5,
-        shuffle_enabled: true,
-        soft_cut_ratings_enabled: true,
-        preset_url: "/presets".as_bytes().as_ptr() as *mut i8,
-        title_font_url: "".as_bytes().as_ptr() as *mut i8,
-        menu_font_url: "".as_bytes().as_ptr() as *mut i8,
-        data_dir: "./".as_bytes().as_ptr() as *mut i8,
-    };
-    // print_settings(settings);
 
     // projectm::init
     let projectm_handle = unsafe {
-        projectm_rs::projectm_create_settings(&settings, 0)
+        projectm::create()
     };
 
     unsafe {
-        projectm_rs::projectm_select_random_preset(projectm_handle, true);
-        projectm_rs::projectm_set_window_size(projectm_handle, 800, 600)
+        projectm::set_window_size(projectm_handle, canvas.output_size().unwrap().0.try_into().unwrap(), canvas.output_size().unwrap().1.try_into().unwrap())
     }
     println!("projectm initialized!");
 
@@ -76,7 +51,7 @@ fn main() -> Result<(), String> {
 
         // projectm::render
         unsafe {
-            projectm_rs::projectm_render_frame(projectm_handle);    
+            projectm::render_frame(projectm_handle);
         }
 
         // present/render
@@ -87,7 +62,7 @@ fn main() -> Result<(), String> {
     Ok(())
 }
 
-fn generate_random_audio_data(projectm_handle: *mut projectm_rs::projectm)
+fn generate_random_audio_data(projectm_handle: projectm_handle)
 {
     let mut pcm_data: [[libc::c_short; 512]; 2] = [[0; 512]; 2];
     let mut i: libc::c_int = 0 as libc::c_int;
@@ -104,6 +79,6 @@ fn generate_random_audio_data(projectm_handle: *mut projectm_rs::projectm)
     };
 
     unsafe {
-        projectm_rs::projectm_pcm_add_int16(projectm_handle, &pcm_data[0][0], 512, 2)
+        projectm::pcm_add_int16(projectm_handle, &pcm_data[0][0], 512, 2)
     }
-}
+}