Splitting up more

Author: revmischa

src/app.rs

@@ -1,33 +1,25 @@
 use projectm_rs::core::{projectm, projectm_handle};
-use projectm_rs::playlist;
 use sdl2::video::GLProfile;
 
+pub mod config;
 pub mod main_loop;
-
-pub struct Config {
-    pub preset_path: Option<String>,
-}
-
-impl Default for Config {
-    fn default() -> Self {
-        // default preset path
-        Self {
-            // load from home dir or w/e
-            preset_path: Some(String::from("/usr/local/share/projectM/presets")),
-        }
-    }
-}
+pub mod playlist;
+pub mod video;
 
 pub struct App {
     pm: projectm_handle,
-    playlist: playlist::Playlist,
+    playlist: projectm_rs::playlist::Playlist,
     sdl_context: sdl2::Sdl,
     gl_context: sdl2::video::GLContext,
     window: sdl2::video::Window,
 }
 
+pub fn default_config() -> config::Config {
+    config::Config::default()
+}
+
 impl App {
-    pub fn new(config: Option<Config>) -> Self {
+    pub fn new(config: Option<crate::app::config::Config>) -> Self {
         // setup sdl
         let sdl_context = sdl2::init().unwrap();
         let video_subsystem = sdl_context.video().unwrap();
@@ -62,7 +54,7 @@ impl App {
         // initialize projectM
         let pm = projectm::create();
         // and a preset playlist
-        let mut playlist = projectm_rs::playlist::Playlist::create(pm);
+        let playlist = projectm_rs::playlist::Playlist::create(pm);
 
         // get/set window size
         let (width, height) = window.drawable_size(); // highDPI aware
@@ -83,18 +75,4 @@ impl App {
 
         this
     }
-
-    pub fn load_config(&mut self, config: Config) {
-        // load presets if provided
-        if let Some(preset_path) = config.preset_path {
-            self.add_preset_path(&preset_path);
-        }
-    }
-
-    /// Add presets to the playlist recursively skipping duplicates.
-    pub fn add_preset_path(&mut self, preset_path: &str) {
-        self.playlist.add_path(preset_path, true);
-        println!("added preset path: {}", preset_path);
-        println!("playlist size: {}", self.playlist.len());
-    }
 }

src/app/config.rs

@@ -0,0 +1,24 @@
+use crate::app::App;
+
+pub struct Config {
+    pub preset_path: Option<String>,
+}
+
+impl Default for Config {
+    fn default() -> Self {
+        // default preset path
+        Self {
+            // load from home dir or w/e
+            preset_path: Some(String::from("/usr/local/share/projectM/presets")),
+        }
+    }
+}
+
+impl App {
+    pub fn load_config(&mut self, config: Config) {
+        // load presets if provided
+        if let Some(preset_path) = config.preset_path {
+            self.add_preset_path(&preset_path);
+        }
+    }
+}

src/app/main_loop.rs

@@ -15,13 +15,61 @@ impl App {
             // check for event
             for event in event_pump.poll_iter() {
                 match event {
+                    // quit (Esc)
                     Event::Quit { .. }
                     | Event::KeyDown {
                         keycode: Some(Keycode::Escape),
                         ..
                     } => {
                         break 'running;
                     }
+
+                    // Next preset (N, right-arrow)
+                    Event::KeyUp {
+                        keycode: Some(Keycode::N),
+                        ..
+                    } => {
+                        self.playlist_play_next();
+                    }
+                    // XXX: how to collapse these into one case?
+                    Event::KeyUp {
+                        keycode: Some(Keycode::Right),
+                        ..
+                    } => {
+                        self.playlist_play_next();
+                    }
+
+                    // Previous preset (P, left-arrow)
+                    Event::KeyUp {
+                        keycode: Some(Keycode::P),
+                        ..
+                    } => {
+                        self.playlist_play_prev();
+                    }
+                    Event::KeyUp {
+                        keycode: Some(Keycode::Left),
+                        ..
+                    } => {
+                        self.playlist_play_prev();
+                    }
+
+                    // Random preset (R)
+                    Event::KeyUp {
+                        keycode: Some(Keycode::R),
+                        ..
+                    } => {
+                        self.playlist.play_random();
+                    }
+
+                    // Toggle fullscreen (F)
+                    Event::KeyUp {
+                        keycode: Some(Keycode::F),
+                        ..
+                    } => {
+                        self.toggle_fullscreen();
+                    }
+
+                    // default
                     _ => {}
                 }
             }

src/app/playlist.rs

@@ -0,0 +1,20 @@
+use crate::app::App;
+
+impl App {
+    /// Add presets to the playlist recursively skipping duplicates.
+    pub fn add_preset_path(&mut self, preset_path: &str) {
+        self.playlist.add_path(preset_path, true);
+        println!("added preset path: {}", preset_path);
+        println!("playlist size: {}", self.playlist.len());
+    }
+
+    pub fn playlist_play_next(&mut self) {
+        self.playlist.play_next();
+    }
+    pub fn playlist_play_prev(&mut self) {
+        self.playlist.play_prev();
+    }
+    pub fn playlist_play_random(&mut self) {
+        self.playlist.play_random();
+    }
+}

src/app/video.rs

@@ -0,0 +1,13 @@
+use crate::app::App;
+
+impl App {
+    pub fn toggle_fullscreen(&mut self) {
+        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,
+            })
+            .unwrap();
+    }
+}

src/main.rs

@@ -2,7 +2,7 @@ mod app;
 mod dummy_audio;
 
 fn main() -> Result<(), String> {
-    let config = app::Config::default();
+    let config = app::default_config();
     // TODO: parse args here for config
     // config.preset_path = Some("/usr/local/share/projectM/presets".to_string());