texture path config

Author: revmischa

src/app/config.rs

@@ -8,6 +8,7 @@ pub type FrameRate = u32;
 pub struct Config {
     pub frame_rate: Option<FrameRate>,
     pub preset_path: Option<String>,
+    pub texture_path: Option<String>,
 }
 
 impl Default for Config {
@@ -16,6 +17,7 @@ impl Default for Config {
         Self {
             // TODO: load from home dir or w/e
             preset_path: Some("/usr/local/share/projectM/presets".to_owned()),
+            texture_path: Some("/usr/local/share/projectM/textures".to_owned()),
             frame_rate: Some(60),
         }
     }
@@ -32,6 +34,13 @@ impl App {
         if let Some(frame_rate) = config.frame_rate {
             Projectm::set_fps(self.pm, 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(self.pm, &paths, 1);
+        }
     }
 
     pub fn get_frame_rate(&self) -> FrameRate {

src/main.rs

@@ -2,10 +2,9 @@ mod app;
 mod dummy_audio;
 
 fn main() -> Result<(), String> {
-    let mut config = app::default_config();
+    let config = app::default_config();
     // TODO: parse args here for config
-    // config.preset_path = Some("/usr/local/share/projectM/presets".to_string());
-    config.preset_path = Some("./presets/test".to_string());
+    // config.preset_path = Some("./presets/test".to_string());
 
     let mut app = app::App::new(Some(config));
     app.init();