max
/
lull
1
0
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

wip

This commit is contained in:
Max Bradbury 2020-10-06 21:18:19 +01:00
parent 183f1064ec
commit fb374f6a1f
2 changed files with 164 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Cargo.toml
View File

@ -9,6 +9,5 @@ crate_type = "bin"
[dependencies] [dependencies]
dirs = "^3.0.1" dirs = "^3.0.1"
gio = "^0" iced = "^0.1.1"
gtk = "^0"
rodio = "^0.11.0" rodio = "^0.11.0"

289
src/main.rs
View File

@ -1,8 +1,6 @@
#![windows_subsystem = "windows"] #![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 rodio::{Sink, Source};
use std::env::args; use std::env::args;
use std::fs::File; use std::fs::File;
@ -12,27 +10,50 @@ use std::process::Command;
const SPACING: i32 = 16; const SPACING: i32 = 16;
fn error_popup(message: &str) { struct Sound {
let popup = gtk::Window::new(gtk::WindowType::Toplevel); name: String,
popup.set_title("error"); path: String, // bytes instead?
popup.set_border_width(SPACING as u32); sink: Sink,
popup.set_position(gtk::WindowPosition::Center); }
popup.set_default_size(256, 64);
let vertical = gtk::Box::new(Orientation::Vertical, SPACING); /// todo: maybe add a play/pause state or global volume? saved presets?
popup.add(&vertical); struct State {
sounds: Vec<Sound>
}
let message = gtk::Label::new(Some(message)); enum Lull {
vertical.add(&message); Loading,
Loaded(State),
}
let button_ok = gtk::Button::with_label("OK"); impl Application for Lull {
vertical.add(&button_ok); 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 { fn title(&self) -> String {
popup.destroy(); 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 { fn get_data_dir() -> PathBuf {
@ -47,114 +68,130 @@ fn get_data_dir() -> PathBuf {
data_dir data_dir
} }
fn build_ui(application: &gtk::Application) { pub fn main() -> iced::Result {
let window = gtk::ApplicationWindow::new(application); env_logger::init();
window.set_title("lull"); Lull::run(Settings::default())
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(); // 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();
// });
// }
let sink = Sink::new(&device); // fn build_ui(application: &gtk::Application) {
sink.append(source); // let window = gtk::ApplicationWindow::new(application);
sink.pause(); //
// window.set_title("lull");
let row = gtk::Box::new(Orientation::Horizontal, SPACING); // window.set_border_width(SPACING as u32);
row.set_homogeneous(true); // window.set_position(gtk::WindowPosition::Center);
// window.set_default_size(256, 256);
let label = gtk::Label::new(Some(name)); //
row.add(&label); // let vertical = gtk::Box::new(Orientation::Vertical, SPACING);
// vertical.set_homogeneous(true);
let adjustment = gtk::Adjustment::new( //
0.0, // window.add(&vertical);
0.0, //
1.0, // let device = rodio::default_output_device().unwrap();
0.0, //
0.0, // let paths = std::fs::read_dir(get_data_dir())
0.0 // .expect("Couldn't read from lull data directory");
); //
// for path in paths {
let slider = gtk::Scale::new( // let path = path.unwrap().path();
Orientation::Horizontal, // let name: &str = path.file_stem().unwrap().to_str().unwrap();
Some(&adjustment) //
); // let file = File::open(&path)
// .expect("Couldn't open audio file");
slider.set_draw_value(false); //
// let source = rodio::Decoder::new(
slider.connect_value_changed(move |scale| { // BufReader::new(file)
let volume = scale.get_value(); // );
//
if volume == 0. { // if source.is_err() {
sink.pause(); // error_popup(&format!(
} else { // "Couldn't parse file {}. \n{}.",
sink.play(); // path.to_str().unwrap(),
sink.set_volume(volume as f32); // source.err().unwrap()
} // ));
}); // continue;
// }
row.add(&slider); //
// let source = source.unwrap().repeat_infinite();
vertical.add(&row); //
} // let sink = Sink::new(&device);
// sink.append(source);
let row_add = gtk::Box::new(Orientation::Horizontal, SPACING); // sink.pause();
row_add.set_homogeneous(true); //
// let row = gtk::Box::new(Orientation::Horizontal, SPACING);
let button_manage_sounds = gtk::Button::with_label("manage sounds"); // row.set_homogeneous(true);
//
button_manage_sounds.connect_clicked(|_| { // let label = gtk::Label::new(Some(name));
let mut file_manager = Command::new("xdg-open"); // row.add(&label);
file_manager.arg(get_data_dir()); //
file_manager.output().unwrap(); // let adjustment = gtk::Adjustment::new(
}); // 0.0,
// 0.0,
row_add.add(&button_manage_sounds); // 1.0,
vertical.add(&row_add); // 0.0,
// 0.0,
window.show_all(); // 0.0
} // );
//
fn main() { // let slider = gtk::Scale::new(
let application = gtk::Application::new( // Orientation::Horizontal,
Some("dev.tinybird.max.lull"), // Some(&adjustment)
Default::default() // );
).expect("Initialization failed..."); //
// slider.set_draw_value(false);
application.connect_activate(|app| { //
build_ui(app); // slider.connect_value_changed(move |scale| {
}); // let volume = scale.get_value();
//
application.run(&args().collect::<Vec<_>>()); // 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();
// }