mirror of
https://codeberg.org/unspeaker/tek.git
synced 2025-12-07 12:16:42 +01:00
add groovebox app its own copy of sequencer innards
This commit is contained in:
parent
51971e4c25
commit
9f739fe040
7 changed files with 240 additions and 150 deletions
|
|
@ -1,20 +1,31 @@
|
|||
use crate::*;
|
||||
use super::*;
|
||||
use KeyCode::{Char, Delete, Tab, Up, Down, Left, Right};
|
||||
use ClockCommand::{Play, Pause};
|
||||
use GrooveboxCommand::*;
|
||||
use PhraseCommand::*;
|
||||
use PhrasePoolCommand::*;
|
||||
|
||||
pub struct GrooveboxTui {
|
||||
_jack: Arc<RwLock<JackClient>>,
|
||||
pub clock: ClockModel,
|
||||
pub phrases: PoolModel,
|
||||
pub player: MidiPlayer,
|
||||
pub editor: MidiEditorModel,
|
||||
pub size: Measure<Tui>,
|
||||
pub sequencer: SequencerTui,
|
||||
pub status: bool,
|
||||
pub note_buf: Vec<u8>,
|
||||
pub midi_buf: Vec<Vec<Vec<u8>>>,
|
||||
pub perf: PerfModel,
|
||||
pub sampler: SamplerTui,
|
||||
pub split: u16,
|
||||
pub focus: GrooveboxFocus
|
||||
}
|
||||
|
||||
from_jack!(|jack|GrooveboxTui {
|
||||
let mut sequencer = SequencerTui::try_from(jack)?;
|
||||
sequencer.status = false;
|
||||
sequencer.transport = false;
|
||||
sequencer.selectors = false;
|
||||
let clock = ClockModel::from(jack);
|
||||
let phrase = Arc::new(RwLock::new(MidiClip::new(
|
||||
"New", true, 4 * clock.timebase.ppq.get() as usize,
|
||||
None, Some(ItemColor::random().into())
|
||||
)));
|
||||
let midi_in_1 = jack.read().unwrap().register_port("in1", MidiIn::default())?;
|
||||
let midi_out = jack.read().unwrap().register_port("out", MidiOut::default())?;
|
||||
let midi_in_2 = jack.read().unwrap().register_port("in2", MidiIn::default())?;
|
||||
|
|
@ -23,25 +34,25 @@ from_jack!(|jack|GrooveboxTui {
|
|||
let audio_out_1 = jack.read().unwrap().register_port("out1", AudioOut::default())?;
|
||||
let audio_out_2 = jack.read().unwrap().register_port("out2", AudioOut::default())?;
|
||||
Self {
|
||||
sequencer,
|
||||
sampler: SamplerTui::try_from(jack)?,
|
||||
split: 16,
|
||||
focus: GrooveboxFocus::Sequencer,
|
||||
size: Measure::new(),
|
||||
_jack: jack.clone(),
|
||||
phrases: PoolModel::from(&phrase),
|
||||
editor: MidiEditorModel::from(&phrase),
|
||||
player: MidiPlayer::from((&clock, &phrase)),
|
||||
sampler: SamplerTui::try_from(jack)?,
|
||||
size: Measure::new(),
|
||||
midi_buf: vec![vec![];65536],
|
||||
note_buf: vec![],
|
||||
perf: PerfModel::default(),
|
||||
status: true,
|
||||
clock,
|
||||
}
|
||||
});
|
||||
|
||||
pub enum GrooveboxFocus {
|
||||
Sequencer,
|
||||
Sampler
|
||||
}
|
||||
|
||||
audio!(|self:GrooveboxTui,_client,_process|Control::Continue);
|
||||
has_clock!(|self:GrooveboxTui|&self.sequencer.clock);
|
||||
has_clock!(|self:GrooveboxTui|&self.clock);
|
||||
render!(<Tui>|self:GrooveboxTui|{
|
||||
let w = self.size.w();
|
||||
let phrase_w = if w > 60 { 20 } else if w > 40 { 15 } else { 10 };
|
||||
let pool_w = if self.sequencer.phrases.visible { phrase_w } else { 0 };
|
||||
let pool_w = if self.phrases.visible { phrase_w } else { 0 };
|
||||
let sampler_w = 24;
|
||||
Fill::wh(lay!([
|
||||
&self.size,
|
||||
|
|
@ -49,21 +60,21 @@ render!(<Tui>|self:GrooveboxTui|{
|
|||
Tui::shrink_y(2, col!([
|
||||
Fixed::h(2, row!([
|
||||
Fixed::wh(5, 2, PlayPause(self.clock().is_rolling())),
|
||||
Fixed::h(2, TransportView::from((self, self.sequencer.player.play_phrase().as_ref().map(|(_,p)|
|
||||
Fixed::h(2, TransportView::from((self, self.player.play_phrase().as_ref().map(|(_,p)|
|
||||
p.as_ref().map(|p|p.read().unwrap().color)
|
||||
).flatten().clone(), true))),
|
||||
])),
|
||||
Tui::push_x(sampler_w, Fixed::h(1, row!([
|
||||
PhraseSelector::play_phrase(&self.sequencer.player),
|
||||
PhraseSelector::next_phrase(&self.sequencer.player),
|
||||
PhraseSelector::play_phrase(&self.player),
|
||||
PhraseSelector::next_phrase(&self.player),
|
||||
]))),
|
||||
row!([
|
||||
Tui::pull_y(1, Tui::shrink_y(0, Fill::h(Fixed::w(sampler_w, &self.sampler)))),
|
||||
Tui::split_n(false, 1,
|
||||
MidiEditStatus(&self.sequencer.editor),
|
||||
MidiEditStatus(&self.editor),
|
||||
Tui::split_w(false, pool_w,
|
||||
Tui::pull_y(1, Fill::h(Align::e(PoolView(&self.sequencer.phrases)))),
|
||||
Fill::wh(&self.sequencer.editor)
|
||||
Tui::pull_y(1, Fill::h(Align::e(PoolView(&self.phrases)))),
|
||||
Fill::wh(&self.editor)
|
||||
)
|
||||
),
|
||||
]),
|
||||
|
|
@ -72,23 +83,99 @@ render!(<Tui>|self:GrooveboxTui|{
|
|||
});
|
||||
|
||||
pub enum GrooveboxCommand {
|
||||
Sequencer(SequencerCommand),
|
||||
History(isize),
|
||||
Clock(ClockCommand),
|
||||
Pool(PoolCommand),
|
||||
Editor(PhraseCommand),
|
||||
Enqueue(Option<Arc<RwLock<MidiClip>>>),
|
||||
Sampler(SamplerCommand),
|
||||
}
|
||||
|
||||
handle!(<Tui>|self: GrooveboxTui, input|GrooveboxCommand::execute_with_state(self, input));
|
||||
|
||||
input_to_command!(GrooveboxCommand: <Tui>|state: GrooveboxTui,input|match input.event() {
|
||||
key_pat!(Up) | key_pat!(Down) | key_pat!(Left) | key_pat!(Right) |
|
||||
key_pat!(Shift-Char('L')) =>
|
||||
SamplerCommand::input_to_command(&state.sampler, input).map(Self::Sampler)?,
|
||||
_ =>
|
||||
SequencerCommand::input_to_command(&state.sequencer, input).map(Self::Sequencer)?,
|
||||
input_to_command!(GrooveboxCommand: <Tui>|state: GrooveboxTui, input|match input.event() {
|
||||
// TODO: k: toggle on-screen keyboard
|
||||
key_pat!(Ctrl-Char('k')) => {
|
||||
todo!("keyboard")
|
||||
},
|
||||
|
||||
// Transport: Play/pause
|
||||
key_pat!(Char(' ')) => Clock(
|
||||
if state.clock().is_stopped() { Play(None) } else { Pause(None) }
|
||||
),
|
||||
|
||||
// Transport: Play from start or rewind to start
|
||||
key_pat!(Shift-Char(' ')) => Clock(
|
||||
if state.clock().is_stopped() { Play(Some(0)) } else { Pause(Some(0)) }
|
||||
),
|
||||
|
||||
// Tab: Toggle visibility of phrase pool column
|
||||
key_pat!(Tab) => Pool(PoolCommand::Show(!state.phrases.visible)),
|
||||
// q: Enqueue currently edited phrase
|
||||
key_pat!(Char('q')) => Enqueue(Some(state.phrases.phrase().clone())),
|
||||
// 0: Enqueue phrase 0 (stop all)
|
||||
key_pat!(Char('0')) => Enqueue(Some(state.phrases.phrases()[0].clone())),
|
||||
|
||||
// e: Toggle between editing currently playing or other phrase
|
||||
key_pat!(Char('e')) => if let Some((_, Some(playing))) = state.player.play_phrase() {
|
||||
let editing = state.editor.phrase().as_ref().map(|p|p.read().unwrap().clone());
|
||||
let selected = state.phrases.phrase().clone();
|
||||
Editor(Show(Some(if Some(selected.read().unwrap().clone()) != editing {
|
||||
selected
|
||||
} else {
|
||||
playing.clone()
|
||||
})))
|
||||
} else {
|
||||
return None
|
||||
},
|
||||
|
||||
// For the rest, use the default keybindings of the components.
|
||||
// The ones defined above supersede them.
|
||||
_ => if let Some(command) = PhraseCommand::input_to_command(&state.editor, input) {
|
||||
Editor(command)
|
||||
} else if let Some(command) = PoolCommand::input_to_command(&state.phrases, input) {
|
||||
Pool(command)
|
||||
} else {
|
||||
return None
|
||||
}
|
||||
});
|
||||
|
||||
command!(|self:GrooveboxCommand,state:GrooveboxTui|match self {
|
||||
GrooveboxCommand::Sequencer(command) =>
|
||||
command.execute(&mut state.sequencer)?.map(GrooveboxCommand::Sequencer),
|
||||
GrooveboxCommand::Sampler(command) =>
|
||||
command.execute(&mut state.sampler)?.map(GrooveboxCommand::Sampler),
|
||||
Self::Pool(cmd) => {
|
||||
let mut default = |cmd: PoolCommand|cmd
|
||||
.execute(&mut state.phrases)
|
||||
.map(|x|x.map(Pool));
|
||||
match cmd {
|
||||
// autoselect: automatically load selected phrase in editor
|
||||
PoolCommand::Select(_) => {
|
||||
let undo = default(cmd)?;
|
||||
state.editor.set_phrase(Some(state.phrases.phrase()));
|
||||
undo
|
||||
},
|
||||
// update color in all places simultaneously
|
||||
PoolCommand::Phrase(SetColor(index, _)) => {
|
||||
let undo = default(cmd)?;
|
||||
state.editor.set_phrase(Some(state.phrases.phrase()));
|
||||
undo
|
||||
},
|
||||
_ => default(cmd)?
|
||||
}
|
||||
},
|
||||
Self::Editor(cmd) => {
|
||||
let default = ||cmd.execute(&mut state.editor).map(|x|x.map(Editor));
|
||||
match cmd {
|
||||
_ => default()?
|
||||
}
|
||||
},
|
||||
Self::Clock(cmd) => cmd.execute(state)?.map(Clock),
|
||||
Self::Enqueue(phrase) => {
|
||||
state.player.enqueue_next(phrase.as_ref());
|
||||
None
|
||||
},
|
||||
Self::History(delta) => {
|
||||
todo!("undo/redo")
|
||||
},
|
||||
Self::Sampler(command) => {
|
||||
todo!("sampler")
|
||||
}
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue