Make it build.

Author: afeinberg

Cargo.lock

@@ -9,7 +9,7 @@ edition = "2021"
 libc = "*"
 sdl2 = "0.35.2"
 # projectm-rs = "^1.0.4"
-projectm-rs = { path = "../projectm-rs" }
+projectm-rs = { git = "https://github.com/projectM-visualizer/projectm-rs" }
 clippy = "0.0.302"
 # gl = "0.14.0"
 

Cargo.toml

@@ -89,6 +89,14 @@ cargo run
 cargo build
 ```
 
+### If using SDL installed via Homebrew
+
+```
+RUSTFLAGS="-L$(brew --prefix sdl2)/lib" cargo build
+RUSTFLAGS="-L$(brew --prefix sdl2)/lib" cargo run
+```
+
+
 <p align="right">(<a href="#readme-top">back to top</a>)</p>
 
 

README.md

@@ -1,4 +1,4 @@
-use projectm_rs::core::{projectm, projectm_handle};
+use projectm_rs::core::{Projectm, ProjectMHandle};
 use sdl2::video::GLProfile;
 
 pub mod audio;
@@ -9,7 +9,7 @@ pub mod video;
 
 /// Application state
 pub struct App {
-    pm: projectm_handle,
+    pm: ProjectMHandle,
     playlist: projectm_rs::playlist::Playlist,
     sdl_context: sdl2::Sdl,
     window: sdl2::video::Window,
@@ -56,14 +56,14 @@ impl App {
         window.gl_make_current(&gl_context).unwrap();
 
         // initialize projectM
-        let pm = projectm::create();
+        let pm = Projectm::create();
 
         // and a preset playlist
         let playlist = projectm_rs::playlist::Playlist::create(pm);
 
         // get/set window size
         let (width, height) = window.drawable_size(); // highDPI aware
-        projectm::set_window_size(pm, width.try_into().unwrap(), height.try_into().unwrap());
+        Projectm::set_window_size(pm, width.try_into().unwrap(), height.try_into().unwrap());
 
         // initialize audio
         let audio = audio::Audio::new(&sdl_context, pm);

src/app.rs

@@ -1,4 +1,4 @@
-use projectm_rs::core::projectm_handle;
+use projectm_rs::core::ProjectMHandle;
 use sdl2::audio::{AudioCallback, AudioDevice, AudioSpecDesired};
 
 use super::config::FrameRate;
@@ -17,11 +17,11 @@ pub struct Audio {
     is_capturing: bool,
     frame_rate: Option<FrameRate>,
     capturing_device: Option<AudioDevice<AudioCaptureCallback>>,
-    projectm: projectm_handle,
+    projectm: ProjectMHandle,
 }
 
 impl Audio {
-    pub fn new(sdl_context: &sdl2::Sdl, projectm: projectm_handle) -> Self {
+    pub fn new(sdl_context: &sdl2::Sdl, projectm: ProjectMHandle) -> Self {
         let audio_subsystem = sdl_context.audio().unwrap();
 
         Self {
@@ -156,7 +156,7 @@ impl Audio {
 }
 
 struct AudioCaptureCallback {
-    pm: projectm_handle,
+    pm: ProjectMHandle,
     // spec: sdl2::audio::AudioSpec,
     // buffer_size: SampleFormat,
     // buffer: Vec<u8>,
@@ -172,6 +172,6 @@ impl AudioCallback for AudioCaptureCallback {
     // we need to pass it to projectm
     fn callback(&mut self, out: &mut [SampleFormat]) {
         let pm = self.pm;
-        projectm_rs::core::projectm::pcm_add_float(pm, out.to_vec(), 2);
+        projectm_rs::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_rs::core::Projectm;
 
 pub type FrameRate = u32;
 
@@ -28,11 +28,11 @@ impl App {
 
         // set frame rate if provided
         if let Some(frame_rate) = config.frame_rate {
-            projectm::set_fps(self.pm, frame_rate.try_into().unwrap())
+            Projectm::set_fps(self.pm, frame_rate.try_into().unwrap())
         }
     }
 
     pub fn get_frame_rate(&self) -> FrameRate {
-        projectm::get_fps(self.pm)
+        Projectm::get_fps(self.pm)
     }
 }

src/app/config.rs

@@ -1,4 +1,4 @@
-use projectm_rs::core::projectm;
+use projectm_rs::core::Projectm;
 use sdl2::event::Event;
 use sdl2::keyboard::Keycode;
 
@@ -97,7 +97,7 @@ impl App {
             dummy_audio::generate_random_audio_data(self.pm);
 
             // render a frame
-            projectm::render_frame(self.pm);
+            Projectm::render_frame(self.pm);
 
             // swap buffers
             self.window.gl_swap_window();

src/app/main_loop.rs

@@ -1,6 +1,6 @@
-use projectm_rs::core::{projectm, projectm_handle};
+use projectm_rs::core::{Projectm, ProjectMHandle};
 
-pub fn generate_random_audio_data(projectm_handle: projectm_handle) {
+pub fn generate_random_audio_data(projectm_handle: ProjectMHandle) {
     let mut pcm_data: [[libc::c_short; 512]; 2] = [[0; 512]; 2];
     let mut i: libc::c_int = 0 as libc::c_int;
     while i < 512 as libc::c_int {
@@ -13,5 +13,5 @@ pub fn generate_random_audio_data(projectm_handle: projectm_handle) {
         i += 1
     }
 
-    projectm::pcm_add_int16(projectm_handle, &pcm_data[0][0], 512, 2)
+    Projectm::pcm_add_int16(projectm_handle, vec![pcm_data[0][0]], 2)
 }