This commit is contained in:
🪞👃🪞 2025-05-14 17:59:06 +03:00
parent d7bbc2a412
commit e3a3962130
15 changed files with 74 additions and 81 deletions

View file

@ -35,8 +35,8 @@ has!(Vec<JackMidiIn>: |self: App|self.project.midi_ins);
has!(Vec<JackMidiOut>: |self: App|self.project.midi_outs);
has!(Vec<Scene>: |self: App|self.project.scenes);
has!(Vec<Track>: |self: App|self.project.tracks);
has!(Measure<TuiOut>: |self: App|self.size);
has_size!(<TuiOut>|self: App|&self.size);
has_clips!(|self: App|self.project.pool.clips);
has_editor!(|self: App|{
editor = self.editor;
@ -152,8 +152,8 @@ impl App {
/// Various possible dialog overlays
#[derive(Clone, Debug)]
pub enum Dialog {
Help,
Menu,
Help(usize),
Menu(usize),
Device(usize),
Message(Message),
Save(Browser),
@ -216,29 +216,32 @@ impl App {
fn focus_pool_length (&self) -> bool {
matches!(self.project.pool.mode, Some(PoolMode::Length(..)))
}
fn dialog_device (&self) -> Dialog {
Dialog::Device(0) // TODO
fn dialog_none (&self) -> Option<Dialog> {
None
}
fn dialog_device_prev (&self) -> Dialog {
Dialog::Device(0) // TODO
fn dialog_device (&self) -> Option<Dialog> {
Some(Dialog::Device(0)) // TODO
}
fn dialog_device_next (&self) -> Dialog {
Dialog::Device(0) // TODO
fn dialog_device_prev (&self) -> Option<Dialog> {
Some(Dialog::Device(0)) // TODO
}
fn dialog_help (&self) -> Dialog {
Dialog::Help
fn dialog_device_next (&self) -> Option<Dialog> {
Some(Dialog::Device(0)) // TODO
}
fn dialog_menu (&self) -> Dialog {
Dialog::Menu
fn dialog_help (&self) -> Option<Dialog> {
Some(Dialog::Help(0))
}
fn dialog_save (&self) -> Dialog {
Dialog::Save(Default::default())
fn dialog_menu (&self) -> Option<Dialog> {
Some(Dialog::Menu(0))
}
fn dialog_load (&self) -> Dialog {
Dialog::Load(Default::default())
fn dialog_save (&self) -> Option<Dialog> {
Some(Dialog::Save(Default::default()))
}
fn dialog_options (&self) -> Dialog {
Dialog::Options
fn dialog_load (&self) -> Option<Dialog> {
Some(Dialog::Load(Default::default()))
}
fn dialog_options (&self) -> Option<Dialog> {
Some(Dialog::Options)
}
fn editor_pitch (&self) -> Option<u7> {
Some((self.editor().as_ref().map(|e|e.get_note_pos()).unwrap() as u8).into())