wip

.gitignore

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

Cargo.toml

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

README.md

@@ -8,3 +8,20 @@ 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,7 +17,3 @@ 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

@@ -1,14 +0,0 @@
-# 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,16 +1,9 @@
 #!/usr/bin/env bash
 
-mkdir dist
-
 cargo build --release
+cp target/release/lull .
+strip lull
+zip -r lull.zip README.md lull
+rm lull
 
-mkdir dist/linux
+zip -r sounds.zip SOUNDS.md sounds/*.mp3
-
-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 dist/linux ruin/lull:linux
+butler push lull.zip ruin/lull:linux
-butler push dist/sounds ruin/lull:sounds
+butler push sounds.zip ruin/lull:sounds

src/main.rs

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

@@ -1,58 +0,0 @@
-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"
-    }
-}