From fb374f6a1fb3ff3bfadc6fc9aa5cc5116d9db33d Mon Sep 17 00:00:00 2001 From: Max Bradbury Date: Tue, 6 Oct 2020 21:18:19 +0100 Subject: [PATCH] wip --- Cargo.toml | 3 +- src/main.rs | 289 +++++++++++++++++++++++++++++----------------------- 2 files changed, 164 insertions(+), 128 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 00d7a1a..11e0dd8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,6 +9,5 @@ crate_type = "bin" [dependencies] dirs = "^3.0.1" -gio = "^0" -gtk = "^0" +iced = "^0.1.1" rodio = "^0.11.0" diff --git a/src/main.rs b/src/main.rs index 86c18ff..39bafdf 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,8 +1,6 @@ #![windows_subsystem = "windows"] -use gio::prelude::*; -use gtk::prelude::*; -use gtk::Orientation; +use iced::{Settings, Application, Element, executor, Length, Container, Column, Scrollable, Slider}; use rodio::{Sink, Source}; use std::env::args; use std::fs::File; @@ -12,27 +10,50 @@ use std::process::Command; const SPACING: i32 = 16; -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); +struct Sound { + name: String, + path: String, // bytes instead? + sink: Sink, +} - let vertical = gtk::Box::new(Orientation::Vertical, SPACING); - popup.add(&vertical); +/// todo: maybe add a play/pause state or global volume? saved presets? +struct State { + sounds: Vec +} - let message = gtk::Label::new(Some(message)); - vertical.add(&message); +enum Lull { + Loading, + Loaded(State), +} - let button_ok = gtk::Button::with_label("OK"); - vertical.add(&button_ok); +impl Application for Lull { + type Executor = executor::Default; + type Message = Message; + type Flags = (); - popup.show_all(); + fn new(flags: Self::Flags) -> (Self, Command) { + ( + Lull {sounds: Vec::new()}, + Command::none(), + ) + } - button_ok.connect_clicked(move |_| unsafe { - popup.destroy(); - }); + 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!() + } } fn get_data_dir() -> PathBuf { @@ -47,114 +68,130 @@ fn get_data_dir() -> PathBuf { data_dir } -fn build_ui(application: >k::Application) { - let window = gtk::ApplicationWindow::new(application); +pub fn main() -> iced::Result { + env_logger::init(); - window.set_title("lull"); - window.set_border_width(SPACING as u32); - window.set_position(gtk::WindowPosition::Center); - window.set_default_size(256, 256); - - let vertical = gtk::Box::new(Orientation::Vertical, SPACING); - vertical.set_homogeneous(true); - - window.add(&vertical); - - let device = rodio::default_output_device().unwrap(); - - let paths = std::fs::read_dir(get_data_dir()) - .expect("Couldn't read from lull data directory"); - - for path in paths { - let path = path.unwrap().path(); - 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 row = gtk::Box::new(Orientation::Horizontal, SPACING); - row.set_homogeneous(true); - - let label = gtk::Label::new(Some(name)); - row.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); - } - }); - - 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(); + Lull::run(Settings::default()) } -fn main() { - let application = gtk::Application::new( - Some("dev.tinybird.max.lull"), - Default::default() - ).expect("Initialization failed..."); +// 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); +// +// let vertical = gtk::Box::new(Orientation::Vertical, SPACING); +// popup.add(&vertical); +// +// let message = gtk::Label::new(Some(message)); +// vertical.add(&message); +// +// let button_ok = gtk::Button::with_label("OK"); +// vertical.add(&button_ok); +// +// popup.show_all(); +// +// button_ok.connect_clicked(move |_| unsafe { +// popup.destroy(); +// }); +// } - application.connect_activate(|app| { - build_ui(app); - }); - - application.run(&args().collect::>()); -} +// fn build_ui(application: >k::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, 256); +// +// let vertical = gtk::Box::new(Orientation::Vertical, SPACING); +// vertical.set_homogeneous(true); +// +// window.add(&vertical); +// +// let device = rodio::default_output_device().unwrap(); +// +// let paths = std::fs::read_dir(get_data_dir()) +// .expect("Couldn't read from lull data directory"); +// +// for path in paths { +// let path = path.unwrap().path(); +// 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 row = gtk::Box::new(Orientation::Horizontal, SPACING); +// row.set_homogeneous(true); +// +// let label = gtk::Label::new(Some(name)); +// row.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); +// } +// }); +// +// 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(); +// }