unspeaker/tek
1
0
Fork 0
mirror of https://codeberg.org/unspeaker/tek.git synced 2025-12-06 19:56:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

edit command from phrases list

Browse source
This commit is contained in:
🪞👃🪞 2024-11-09 18:59:17 +01:00
parent 88e5aed2cd
commit 051c3d3663
2 changed files with 27 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/tek_sequencer/src/arranger_cmd.rs
View file

@ -1,13 +1,13 @@
use crate::*;
#[derive(Clone, PartialEq)]
#[derive(Clone)]
pub enum ArrangerCommand {
Focus(FocusCommand),
Transport(TransportCommand),
Phrases(PhrasePoolCommand),
Editor(PhraseEditorCommand),
Arrangement(ArrangementCommand),
EditPhrase,
EditPhrase(Option<Arc<RwLock<Phrase>>>),
}
#[derive(Clone, PartialEq)]
pub enum ArrangementCommand {
@ -56,13 +56,11 @@ impl<E: Engine> Command<Arranger<E>> for ArrangerCommand {
} else {
Ok(None)
},
Self::EditPhrase => if let Some(phrase) = state.arrangement.phrase() {
state.editor.phrase = Some(phrase.clone());
Self::EditPhrase(phrase) => {
state.editor.phrase = phrase.clone();
state.focus(ArrangerFocus::PhraseEditor);
state.focus_enter();
Ok(None)
} else {
Ok(None)
}
}?;
state.show_phrase();

39
crates/tek_sequencer/src/arranger_tui_cmd.rs
View file

@ -23,18 +23,6 @@ impl Handle<Tui> for Arranger<Tui> {
}
}
/// Handle events for arrangement.
impl Handle<Tui> for Arrangement<Tui> {
fn handle (&mut self, from: &TuiInput) -> Perhaps<bool> {
Ok(if let Some(command) = ArrangementCommand::input_to_command(self, from) {
let _undo = command.execute(self)?;
Some(true)
} else {
None
})
}
}
impl InputToCommand<Tui, Arranger<Tui>> for ArrangerCommand {
fn input_to_command (state: &Arranger<Tui>, input: &TuiInput) -> Option<Self> {
use FocusCommand::*;
@ -56,14 +44,19 @@ impl InputToCommand<Tui, Arranger<Tui>> for ArrangerCommand {
.map(|t|TransportCommand::input_to_command(&*t.read().unwrap(), input)
.map(Transport))
.flatten(),
ArrangerFocus::PhrasePool =>
PhrasePoolCommand::input_to_command(&*state.phrases.read().unwrap(), input)
.map(Phrases),
ArrangerFocus::PhrasePool => {
let phrases = state.phrases.read().unwrap();
match input.event() {
key!(KeyCode::Char('e')) => Some(EditPhrase(Some(phrases.phrase().clone()))),
_ => PhrasePoolCommand::input_to_command(&*phrases, input)
.map(Phrases)
}
},
ArrangerFocus::PhraseEditor =>
PhraseEditorCommand::input_to_command(&state.editor, input)
.map(Editor),
ArrangerFocus::Arrangement => match input.event() {
key!(KeyCode::Char('e')) => Some(EditPhrase),
key!(KeyCode::Char('e')) => Some(EditPhrase(state.arrangement.phrase())),
_ => ArrangementCommand::input_to_command(&state.arrangement, &input)
.map(Arrangement)
}
@ -71,6 +64,19 @@ impl InputToCommand<Tui, Arranger<Tui>> for ArrangerCommand {
}
}
}
/// Handle events for arrangement.
impl Handle<Tui> for Arrangement<Tui> {
fn handle (&mut self, from: &TuiInput) -> Perhaps<bool> {
Ok(if let Some(command) = ArrangementCommand::input_to_command(self, from) {
let _undo = command.execute(self)?;
Some(true)
} else {
None
})
}
}
impl InputToCommand<Tui, Arrangement<Tui>> for ArrangementCommand {
fn input_to_command (_: &Arrangement<Tui>, input: &TuiInput) -> Option<Self> {
use ArrangementCommand::*;
@ -101,6 +107,7 @@ impl InputToCommand<Tui, Arrangement<Tui>> for ArrangementCommand {
}
}
}
//impl Arranger<Tui> {
///// Helper for event passthru to focused component
//fn handle_focused (&mut self, from: &TuiInput) -> Perhaps<bool> {