misc attempts

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "lull"
 description = "a looping sound player for generating atmospheric soundscapes"
-version = "1.0.4"
+version = "1.0.3"
 authors = ["Max Bradbury <max@tinybird.info>"]
 repository = "https://tinybird.dev/max/lull"
 license = "MIT"
@@ -9,9 +9,11 @@ edition = "2018"
 
 [dependencies]
 dirs = "^3.0.1"
-gdk = "^0.14.3"
-gio = "^0.14.8"
-gtk = "^0.14.3"
+eframe = "^0.11.0"
+egui = "^0.11.0"
+gdk = "^0.13.2"
+gio = "^0"
+gtk = "^0"
 rodio = "^0.11.0"
 serde = "^1.0.125"
 serde_derive = "^1.0.125"

TODO.md

@@ -10,8 +10,5 @@
     * vinyl crackle
     * white noise?
     * fan
-    * cat purr
-    * café
-    * rustling leaves
 * set a window icon
     * create a nice icon?

deploy.sh

@@ -1,8 +1,4 @@
 #!/usr/bin/env bash
 
-rm -rf dist/windows
-mv package dist/windows
-
 butler push dist/linux ruin/lull:linux
-butler push dist/windows ruin/lull:windows
 butler push dist/sounds ruin/lull:sounds

src/config.rs

@@ -1,59 +0,0 @@
-use std::fs::File;
-use std::io::{Write, Read};
-
-use serde_derive::{Serialize, Deserialize};
-
-#[derive(Debug, Eq, PartialEq, Serialize, Deserialize)]
-pub(crate) struct Config {
-    pub(crate) position: (i32, i32),
-    pub(crate) size:     (i32, i32),
-}
-
-pub(crate) fn save_config(config: Config) {
-    let mut config_path = dirs::config_dir()
-        .expect("Couldn't find user config directory");
-
-    config_path.push("ruin");
-    config_path.push("lull");
-
-    if !config_path.exists() {
-        std::fs::create_dir_all(&config_path)
-            .expect("Couldn't create lull config directory");
-    }
-
-    let toml = toml::to_string(&config)
-        .expect("Couldn't convert config to toml");
-
-    config_path.push("lull.toml");
-
-    let mut config_file = File::create(config_path)
-        .expect("Couldn't create config file");
-
-    config_file.write(&toml.into_bytes())
-        .expect("Couldn't write config file");
-}
-
-pub(crate) fn load_config() -> Option<Config> {
-    let mut config_path = dirs::config_dir()
-        .expect("Couldn't find user config directory");
-
-    config_path.push("ruin");
-    config_path.push("lull");
-    config_path.push("lull.toml");
-
-    let file = File::open(config_path);
-
-    if file.is_err() {
-        return None;
-    }
-
-    let mut toml = String::new();
-
-    file.unwrap().read_to_string(&mut toml)
-        .expect("Couldn't read config file");
-
-    let config = toml::from_str(&toml)
-        .expect("Couldn't parse config");
-
-    Some(config)
-}

src/main.rs

@@ -1,9 +1,73 @@
 #![windows_subsystem = "windows"]
 
-mod config;
-mod ui_gtk;
-
+// use gio::prelude::*;
+// use gtk::prelude::*;
+// use gtk::Orientation;
+use rodio::{Sink, Source};
+use serde_derive::{Serialize, Deserialize};
+use std::env::args;
+use std::fs::File;
+use std::io::{BufReader, Write, Read};
 use std::path::PathBuf;
+use std::process::Command;
+
+mod ui_egui;
+
+const SPACING: i32 = 16;
+
+#[derive(Debug, Eq, PartialEq, Serialize, Deserialize)]
+struct Config {
+    position: (i32, i32),
+    size:     (i32, i32),
+}
+
+fn save_config(config: Config) {
+    let mut config_path = dirs::config_dir()
+        .expect("Couldn't find user config directory");
+
+    config_path.push("ruin/lull");
+
+    if !config_path.exists() {
+        std::fs::create_dir_all(&config_path)
+            .expect("Couldn't create lull config directory");
+    }
+
+    let toml = toml::to_string(&config)
+        .expect("Couldn't convert config to toml");
+
+    config_path.push("lull.toml");
+
+    let mut config_file = File::create(config_path)
+        .expect("Couldn't create config file");
+
+    print!("{}", toml);
+
+    config_file.write(&toml.into_bytes())
+        .expect("Couldn't write config file");
+}
+
+fn load_config() -> Option<Config> {
+    let mut config_path = dirs::config_dir()
+        .expect("Couldn't find user config directory");
+
+    config_path.push("ruin/lull/lull.toml");
+
+    let file = File::open(config_path);
+
+    if file.is_err() {
+        return None;
+    }
+
+    let mut toml = String::new();
+
+    file.unwrap().read_to_string(&mut toml)
+        .expect("Couldn't read config file");
+
+    let config = toml::from_str(&toml)
+        .expect("Couldn't parse config");
+
+    Some(config)
+}
 
 #[cfg(target_os = "windows")]
 fn file_manager() -> &'static str {
@@ -15,21 +79,205 @@ fn file_manager() -> &'static str {
     "xdg-open"
 }
 
-fn get_sounds_dir() -> PathBuf {
+// fn error_popup(message: &str) {
+//     let popup = gtk::Window::new(gtk::WindowType::Toplevel);
+//     popup.set_title("error");
+//     popup.set_border_width(SPACING as u32);
+//     popup.set_position(gtk::WindowPosition::Center);
+//     popup.set_default_size(256, 64);
+//     popup.set_type_hint(gdk::WindowTypeHint::Dialog);
+//     popup.set_resizable(false);
+//
+//     let message = gtk::Label::new(Some(message));
+//     popup.add(&message);
+//
+//     popup.show_all();
+// }
+
+fn get_data_dir() -> PathBuf {
     let mut data_dir = dirs::data_dir().expect("Couldn't find user data directory");
 
-    data_dir.push("ruin");
-    data_dir.push("lull");
+    data_dir.push("ruin/lull");
 
     if !data_dir.exists() {
-        std::fs::create_dir_all(&data_dir)
-            .expect("Couldn't create lull sounds directory");
+        std::fs::create_dir_all(&data_dir).expect("Couldn't create lull data directory");
     }
 
     data_dir
 }
 
-//#[cfg(not(target_os = "windows"))]
-fn main() {
-    ui_gtk::instantiate();
+struct Sound {
+    name: String,
+    sink: Sink,
+    volume: f64,
+}
+
+fn get_sounds(device: &rodio::Device) -> Vec<Sound> {
+    let mut sounds = Vec::new();
+
+    let mut paths = std::fs::read_dir(get_data_dir())
+        .expect("Couldn't read lull sounds directory")
+        .map(|res| res.map(|e| e.path()))
+        .collect::<Result<Vec<_>, std::io::Error>>()
+        .expect("Couldn't read files from lull sounds directory");
+
+    paths.sort();
+
+    for path in paths {
+        let name = path.file_stem().unwrap().to_str().unwrap().to_string();
+
+        let file = File::open(&path)
+            .expect("Couldn't open audio file");
+
+        let source = rodio::Decoder::new(
+            BufReader::new(file)
+        );
+
+        let source = source.unwrap().repeat_infinite();
+
+        let sink = rodio::Sink::new(&device);
+        sink.append(source);
+        sink.pause();
+
+        sounds.push(Sound { name, sink, volume: 0.0 });
+    }
+
+    sounds
+}
+
+// fn build_ui(application: &gtk::Application) {
+//     let window = gtk::ApplicationWindow::new(application);
+//
+//     window.set_title("lull");
+//     window.set_border_width(SPACING as u32);
+//     window.set_position(gtk::WindowPosition::Center);
+//     window.set_default_size(256, 128);
+//
+//     if let Some(config) = load_config() {
+//         window.move_(config.position.0, config.position.1);
+//         window.resize(config.size.0, config.size.1);
+//     }
+//
+//     let button_manage_sounds = gtk::Button::with_label("manage sounds");
+//
+//     button_manage_sounds.connect_clicked(|_| {
+//         let mut file_manager = Command::new(file_manager());
+//         file_manager.arg(get_data_dir());
+//         file_manager.output().unwrap();
+//     });
+//
+//     let sounds_manage  = gtk::Box::new(Orientation::Vertical,   SPACING);
+//     let columns        = gtk::Box::new(Orientation::Horizontal, SPACING);
+//     let column_labels  = gtk::Box::new(Orientation::Vertical,   SPACING);
+//     let column_sliders = gtk::Box::new(Orientation::Vertical,   SPACING);
+//
+//     columns.set_homogeneous(false);
+//     column_labels.set_homogeneous(true);
+//     column_sliders.set_homogeneous(true);
+//     column_labels.set_property_expand(false);
+//     column_sliders.set_property_expand(true);
+//     column_sliders.set_property_width_request(128);
+//
+//     window.add(&sounds_manage);
+//     sounds_manage.add(&columns);
+//     sounds_manage.add(&button_manage_sounds);
+//     columns.add(&column_labels);
+//     columns.add(&column_sliders);
+//
+//     let device = rodio::default_output_device().unwrap();
+//
+//     let mut paths = std::fs::read_dir(get_data_dir())
+//         .expect("Couldn't read lull sounds directory")
+//         .map(|res| res.map(|e| e.path()))
+//         .collect::<Result<Vec<_>, std::io::Error>>()
+//         .expect("Couldn't read files from lull sounds directory");
+//
+//     paths.sort();
+//
+//     for path in paths {
+//         let name: &str = path.file_stem().unwrap().to_str().unwrap();
+//
+//         let file = File::open(&path)
+//             .expect("Couldn't open audio file");
+//
+//         let source = rodio::Decoder::new(
+//             BufReader::new(file)
+//         );
+//
+//         if source.is_err() {
+//             error_popup(&format!(
+//                 "Couldn't parse file {}. \n{}.",
+//                 path.to_str().unwrap(),
+//                 source.err().unwrap()
+//             ));
+//             continue;
+//         }
+//
+//         let source = source.unwrap().repeat_infinite();
+//
+//         let sink = Sink::new(&device);
+//         sink.append(source);
+//         sink.pause();
+//
+//         let label = gtk::Label::new(Some(name));
+//         label.set_halign(gtk::Align::End);
+//         column_labels.add(&label);
+//
+//         let adjustment = gtk::Adjustment::new(
+//             0.0,
+//             0.0,
+//             1.0,
+//             0.0,
+//             0.0,
+//             0.0
+//         );
+//
+//         let slider = gtk::Scale::new(
+//             Orientation::Horizontal,
+//             Some(&adjustment)
+//         );
+//
+//         slider.set_draw_value(false);
+//
+//         slider.connect_value_changed(move |scale| {
+//             let volume = scale.get_value();
+//
+//             if volume == 0. {
+//                 sink.pause();
+//             } else {
+//                 sink.play();
+//                 sink.set_volume(volume as f32);
+//             }
+//         });
+//
+//         column_sliders.add(&slider);
+//     }
+//
+//     window.show_all();
+//
+//     window.connect_delete_event(|window, _event| {
+//         save_config(Config {
+//             position: window.get_position(),
+//             size:     window.get_size()
+//         });
+//
+//         Inhibit(false)
+//     });
+// }
+
+// fn main() {
+//     let application = gtk::Application::new(
+//         Some("dev.tinybird.max.lull"),
+//         Default::default()
+//     ).expect("Initialization failed...");
+//
+//     application.connect_activate(|app| {
+//         build_ui(app);
+//     });
+//
+//     application.run(&args().collect::<Vec<_>>());
+// }
+
+fn main() {
+    eframe::run_native(Box::new(ui_egui::State::default()));
 }

src/ui_egui.rs

@@ -0,0 +1,58 @@
+use eframe::{egui, epi};
+use std::process::Command;
+use crate::{Sound, file_manager};
+
+pub struct State {
+    device: rodio::Device,
+    sounds: Vec<Sound>,
+}
+
+impl Default for State {
+    fn default() -> Self {
+        let device = rodio::default_output_device().unwrap();
+        let mut sounds = crate::get_sounds(&device);
+
+        Self { device, sounds }
+    }
+}
+
+impl epi::App for State {
+    fn update(&mut self, ctx: &egui::CtxRef, _frame: &mut epi::Frame<'_>) {
+        let State { device: _device, sounds} = self;
+
+        for sound in sounds.into_iter() {
+            if sound.volume > 0.0 {
+                sound.sink.set_volume(sound.volume as f32);
+                sound.sink.play();
+            } else {
+                sound.sink.pause();
+            }
+        }
+
+        egui::CentralPanel::default().show(ctx, |ui| {
+            for sound in sounds {
+                ui.separator();
+                ui.label(&sound.name);
+
+                ui.add(
+                    egui::Slider::new(
+                        &mut sound.volume,
+                        0.0..=1.0
+                    ).show_value(false)
+                );
+            }
+
+            ui.separator();
+
+            if ui.button("manage sounds").clicked() {
+                let mut file_manager = Command::new(file_manager());
+                file_manager.arg(crate::get_data_dir());
+                file_manager.output().unwrap();
+            }
+        });
+    }
+
+    fn name(&self) -> &str {
+        "lull"
+    }
+}

src/ui_gtk.rs

@@ -1,180 +0,0 @@
-use std::fs::File;
-use std::io::{BufReader};
-use std::process::Command;
-
-use gio::prelude::*;
-use gtk::prelude::*;
-use gtk::Orientation;
-use rodio::{Sink, Source};
-
-const SPACING: i32 = 16;
-
-fn popup(title: &str, message: &str) -> gtk::Window {
-    let popup = gtk::Window::new(gtk::WindowType::Toplevel);
-    popup.set_title(title);
-    popup.set_border_width(SPACING as u32);
-    popup.set_position(gtk::WindowPosition::Center);
-    popup.set_default_size(256, 64);
-    popup.set_type_hint(gdk::WindowTypeHint::Dialog);
-    popup.set_resizable(false);
-
-    let message = gtk::Label::new(Some(message));
-    popup.add(&message);
-
-    popup
-}
-
-fn build_ui(application: &gtk::Application) {
-    let window = gtk::ApplicationWindow::new(application);
-
-    window.set_title("lull");
-    window.set_border_width(SPACING as u32);
-    window.set_position(gtk::WindowPosition::Center);
-    window.set_default_size(256, 128);
-
-    if let Some(config) = crate::config::load_config() {
-        window.move_(config.position.0, config.position.1);
-        window.resize(config.size.0, config.size.1);
-    }
-
-    let button_manage_sounds = gtk::Button::with_label("open sounds folder");
-
-    button_manage_sounds.connect_clicked(|_| {
-        popup(
-            "info",
-            concat!(
-                "after changing the sounds in this folder, ",
-                "you will need to restart lull to see your changes."
-            )
-        );
-
-        let mut file_manager = Command::new(crate::file_manager());
-        file_manager.arg(crate::get_sounds_dir());
-        file_manager.output().unwrap();
-    });
-
-    let sounds_manage  = gtk::Box::new(Orientation::Vertical,   SPACING);
-    let columns        = gtk::Box::new(Orientation::Horizontal, SPACING);
-    let column_labels  = gtk::Box::new(Orientation::Vertical,   SPACING);
-    let column_sliders = gtk::Box::new(Orientation::Vertical,   SPACING);
-
-    columns.set_homogeneous(false);
-    column_labels.set_homogeneous(true);
-    column_sliders.set_homogeneous(true);
-    column_labels.set_expand(false);
-    column_sliders.set_expand(true);
-    column_sliders.set_width_request(128);
-
-    window.add(&sounds_manage);
-    sounds_manage.add(&columns);
-    sounds_manage.add(&button_manage_sounds);
-    columns.add(&column_labels);
-    columns.add(&column_sliders);
-
-    let device = rodio::default_output_device().unwrap();
-
-    let mut paths = std::fs::read_dir(crate::get_sounds_dir())
-        .expect("Couldn't read lull sounds directory")
-        .map(|res| res.map(|e| e.path()))
-        .collect::<Result<Vec<_>, std::io::Error>>()
-        .expect("Couldn't read files from lull sounds directory");
-
-    paths.sort();
-
-    for path in paths {
-        let name      = path.file_stem().unwrap().to_str().unwrap();
-        let extension = path.extension().unwrap().to_str().unwrap();
-
-        // on Windows the data dir and config dir are the same,
-        // so avoid parsing the config file as an audio file
-        if extension == "toml" {
-            continue;
-        }
-
-        let file = File::open(&path)
-            .expect("Couldn't open audio file");
-
-        let source = rodio::Decoder::new(
-            BufReader::new(file)
-        );
-
-        if source.is_err() {
-            popup("error", &format!(
-                "Couldn't parse file {}. \n{}.",
-                path.to_str().unwrap(),
-                source.err().unwrap()
-            )).show_all();
-
-            continue;
-        }
-
-        let source = source.unwrap().repeat_infinite();
-
-        let sink = Sink::new(&device);
-        sink.append(source);
-        sink.pause();
-
-        let label = gtk::Label::new(Some(name));
-        label.set_halign(gtk::Align::End);
-        column_labels.add(&label);
-
-        let adjustment = gtk::Adjustment::new(
-            0.0,
-            0.0,
-            1.0,
-            0.0,
-            0.0,
-            0.0
-        );
-
-        let slider = gtk::Scale::new(
-            Orientation::Horizontal,
-            Some(&adjustment)
-        );
-
-        slider.set_draw_value(false);
-
-        slider.connect_value_changed(move |scale| {
-            let volume = scale.value();
-
-            if volume == 0. {
-                sink.pause();
-            } else {
-                sink.play();
-                sink.set_volume(volume as f32);
-            }
-        });
-
-        column_sliders.add(&slider);
-    }
-
-    window.show_all();
-
-    window.connect_delete_event(|window, _event| {
-        crate::config::save_config(crate::config::Config {
-            position: window.position(),
-            size:     window.size()
-        });
-
-        Inhibit(false)
-    });
-}
-
-pub(crate) fn instantiate() {
-    #[cfg(target_os = "windows")] {
-        // instantiate rodio before gtk and don't do anything with it
-        // this is silly but it's the easiest way to prevent cpal crashing on windows
-        rodio::default_output_device().unwrap();
-    }
-
-    let application = gtk::Application::new(
-        Some("dev.tinybird.max.lull"),
-        Default::default()
-    );
-
-    application.connect_activate(|app| {
-        build_ui(app);
-    });
-
-    application.run();
-}

windows.sh

@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-export PKG_CONFIG_ALLOW_CROSS=1
-export PKG_CONFIG_PATH=/usr/i686-w64-mingw32/lib/pkgconfig
-rm -rf package
-docker start lull-build-3 -ai | less
-
-# gtk icons to keep:
-# Adwaita/16x16/ui/window-*
-# Adwaita/24x24/ui/window-*
-# Adwaita/48x48/ui/window-*
-# Adwaita/64x64/ui/window-*
-# Adwaita/96x96/ui/window-*
-# Adwaita/scalable/ui/window-*
-# Adwaita/cursors
-# (are all of these sizes necessary?)