misc attempts

.gitignore

@@ -6,3 +6,7 @@
 /sounds/*.wav
 /sounds.zip
 /lull.zip
+/dist/
+/package/
+/*.kra
+/*.png

Cargo.toml

@@ -1,14 +1,20 @@
 [package]
 name = "lull"
-description = "a looping sound player for generating aural atmospheres"
+description = "a looping sound player for generating atmospheric soundscapes"
-version = "1.0.0"
+version = "1.0.3"
 authors = ["Max Bradbury <max@tinybird.info>"]
+repository = "https://tinybird.dev/max/lull"
 license = "MIT"
 edition = "2018"
-crate_type = "bin"
 
 [dependencies]
 dirs = "^3.0.1"
-iced = "^0.1.1"
+eframe = "^0.11.0"
+egui = "^0.11.0"
+gdk = "^0.13.2"
+gio = "^0"
+gtk = "^0"
 rodio = "^0.11.0"
-env_logger = "^0.8.1"
+serde = "^1.0.125"
+serde_derive = "^1.0.125"
+toml = "^0.5.8"

README.md

@@ -8,20 +8,3 @@ add your own favourite noises and blend them to create your ideal ambience.
 created by [Max Bradbury](mailto:max@tinybird.info).
 
 released under the MIT license.
-
-## to do
-
-* save volume preferences to disk
-* cross-compile to Windows?
-* watch data dir for new sounds?
-* disown file manager subcommand
-* get some good nature sounds
-    * rain on tin roof
-    * wind
-    * tape hiss
-    * vinyl crackle
-    * white noise?
-    * fan
-    * birdsong
-* set a window icon
-    * create a nice icon?

SOUNDS.md

@@ -17,3 +17,7 @@ you can skip/remove any unwanted sounds, and add your own.
 *campfire* by [sagetyrtle](https://freesound.org/people/sagetyrtle/)
 
 *rain on glass* by [Benboncan](https://freesound.org/people/Benboncan/)
+
+*birdsong* by [reinsamba](https://freesound.org/people/reinsamba/)
+
+*fireplace* by [aunrea](https://freesound.org/people/aunrea/)

TODO.md

@@ -0,0 +1,14 @@
+# to do
+
+* save volume preferences to disk
+* cross-compile to Windows?
+* watch data dir for new sounds?
+* disown file manager subcommand
+* get some good nature sounds
+    * wind
+    * tape hiss
+    * vinyl crackle
+    * white noise?
+    * fan
+* set a window icon
+    * create a nice icon?

build.sh

@@ -1,9 +1,16 @@
 #!/usr/bin/env bash
 
-cargo build --release
+mkdir dist
-cp target/release/lull .
-strip lull
-zip -r lull.zip README.md lull
-rm lull
 
-zip -r sounds.zip SOUNDS.md sounds/*.mp3
+cargo build --release
+
+mkdir dist/linux
+
+cp target/release/lull dist/linux
+cp README.md dist/linux
+cp LICENSE dist/linux
+strip dist/linux/lull
+
+mkdir dist/sounds
+
+cp sounds/*.mp3 SOUNDS.md dist/sounds

deploy.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
-butler push lull.zip ruin/lull:linux
+butler push dist/linux ruin/lull:linux
-butler push sounds.zip ruin/lull:sounds
+butler push dist/sounds ruin/lull:sounds

src/main.rs

@@ -1,62 +1,99 @@
 #![windows_subsystem = "windows"]
 
-use iced::{Settings, Application, Element, executor, Length, Container, Column, Scrollable, Slider};
+// 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;
+use std::io::{BufReader, Write, Read};
 use std::path::PathBuf;
 use std::process::Command;
 
+mod ui_egui;
+
 const SPACING: i32 = 16;
 
-struct Sound {
+#[derive(Debug, Eq, PartialEq, Serialize, Deserialize)]
-    name: String,
+struct Config {
-    path: String, // bytes instead?
+    position: (i32, i32),
-    sink: Sink,
+    size:     (i32, i32),
-    volume: f32,
 }
 
-/// todo: maybe add a play/pause state or global volume? saved presets?
+fn save_config(config: Config) {
-struct State {
+    let mut config_path = dirs::config_dir()
-    sounds: Vec<Sound>
+        .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");
 }
 
-enum Lull {
+fn load_config() -> Option<Config> {
-    Loading,
+    let mut config_path = dirs::config_dir()
-    Loaded(State),
+        .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)
 }
 
-impl Application for Lull {
+#[cfg(target_os = "windows")]
-    type Executor = executor::Default;
+fn file_manager() -> &'static str {
-    type Message = Message;
+    "explorer"
-    type Flags = ();
-
-    fn new(_flags: Self::Flags) -> (Self, Command) {
-        (
-            Lull {sounds: Vec::new()},
-            Command::none(),
-        )
-    }
-
-    fn title(&self) -> String {
-        String::from("lull")
-    }
-
-    fn update(&mut self, message: Self::Message) -> Command {
-        match self {
-            self::Loading => {},
-            self::Loaded => {},
-        }
-
-        Command::none()
-    }
-
-    fn view(&mut self) -> Element<'_, Self::Message> {
-        unimplemented!()
-    }
 }
 
+#[cfg(not(target_os = "windows"))]
+fn file_manager() -> &'static str {
+    "xdg-open"
+}
+
+// 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");
 
@@ -69,34 +106,44 @@ fn get_data_dir() -> PathBuf {
     data_dir
 }
 
-pub fn main() -> iced::Result {
+struct Sound {
-    env_logger::init();
+    name: String,
-
+    sink: Sink,
-    Lull::run(Settings::default())
+    volume: f64,
 }
 
-// fn error_popup(message: &str) {
+fn get_sounds(device: &rodio::Device) -> Vec<Sound> {
-//     let popup = gtk::Window::new(gtk::WindowType::Toplevel);
+    let mut sounds = Vec::new();
-//     popup.set_title("error");
+
-//     popup.set_border_width(SPACING as u32);
+    let mut paths = std::fs::read_dir(get_data_dir())
-//     popup.set_position(gtk::WindowPosition::Center);
+        .expect("Couldn't read lull sounds directory")
-//     popup.set_default_size(256, 64);
+        .map(|res| res.map(|e| e.path()))
-//
+        .collect::<Result<Vec<_>, std::io::Error>>()
-//     let vertical = gtk::Box::new(Orientation::Vertical, SPACING);
+        .expect("Couldn't read files from lull sounds directory");
-//     popup.add(&vertical);
+
-//
+    paths.sort();
-//     let message = gtk::Label::new(Some(message));
+
-//     vertical.add(&message);
+    for path in paths {
-//
+        let name = path.file_stem().unwrap().to_str().unwrap().to_string();
-//     let button_ok = gtk::Button::with_label("OK");
+
-//     vertical.add(&button_ok);
+        let file = File::open(&path)
-//
+            .expect("Couldn't open audio file");
-//     popup.show_all();
+
-//
+        let source = rodio::Decoder::new(
-//     button_ok.connect_clicked(move |_| unsafe {
+            BufReader::new(file)
-//         popup.destroy();
+        );
-//     });
+
-// }
+        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);
@@ -104,20 +151,50 @@ pub fn main() -> iced::Result {
 //     window.set_title("lull");
 //     window.set_border_width(SPACING as u32);
 //     window.set_position(gtk::WindowPosition::Center);
-//     window.set_default_size(256, 256);
+//     window.set_default_size(256, 128);
 //
-//     let vertical = gtk::Box::new(Orientation::Vertical, SPACING);
+//     if let Some(config) = load_config() {
-//     vertical.set_homogeneous(true);
+//         window.move_(config.position.0, config.position.1);
+//         window.resize(config.size.0, config.size.1);
+//     }
 //
-//     window.add(&vertical);
+//     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 paths = std::fs::read_dir(get_data_dir())
+//     let mut paths = std::fs::read_dir(get_data_dir())
-//         .expect("Couldn't read from lull data directory");
+//         .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 path = path.unwrap().path();
 //         let name: &str = path.file_stem().unwrap().to_str().unwrap();
 //
 //         let file = File::open(&path)
@@ -142,11 +219,9 @@ pub fn main() -> iced::Result {
 //         sink.append(source);
 //         sink.pause();
 //
-//         let row = gtk::Box::new(Orientation::Horizontal, SPACING);
-//         row.set_homogeneous(true);
-//
 //         let label = gtk::Label::new(Some(name));
-//         row.add(&label);
+//         label.set_halign(gtk::Align::End);
+//         column_labels.add(&label);
 //
 //         let adjustment = gtk::Adjustment::new(
 //             0.0,
@@ -175,24 +250,34 @@ pub fn main() -> iced::Result {
 //             }
 //         });
 //
-//         row.add(&slider);
+//         column_sliders.add(&slider);
-//
-//         vertical.add(&row);
 //     }
 //
-//     let row_add = gtk::Box::new(Orientation::Horizontal, SPACING);
+//     window.show_all();
-//     row_add.set_homogeneous(true);
 //
-//     let button_manage_sounds = gtk::Button::with_label("manage sounds");
+//     window.connect_delete_event(|window, _event| {
+//         save_config(Config {
+//             position: window.get_position(),
+//             size:     window.get_size()
+//         });
 //
-//     button_manage_sounds.connect_clicked(|_| {
+//         Inhibit(false)
-//         let mut file_manager = Command::new("xdg-open");
+//     });
-//         file_manager.arg(get_data_dir());
+// }
-//         file_manager.output().unwrap();
+
+// fn main() {
+//     let application = gtk::Application::new(
+//         Some("dev.tinybird.max.lull"),
+//         Default::default()
+//     ).expect("Initialization failed...");
+//
+//     application.connect_activate(|app| {
+//         build_ui(app);
 //     });
 //
-//     row_add.add(&button_manage_sounds);
+//     application.run(&args().collect::<Vec<_>>());
-//     vertical.add(&row_add);
-//
-//     window.show_all();
 // }
+
+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"
+    }
+}