mirror of
https://codeberg.org/unspeaker/tek.git
synced 2025-12-07 12:16:42 +01:00
switch toolbar actions; bold borders and titles
This commit is contained in:
parent
7dd5f7f488
commit
31f8ec5362
8 changed files with 103 additions and 116 deletions
44
src/main.rs
44
src/main.rs
|
|
@ -78,9 +78,6 @@ fn run_one (command: &cli::Command) -> Result<(), Box<dyn Error>> {
|
|||
|
||||
fn run_all () -> Result<(), Box<dyn Error>> {
|
||||
let mut actions = vec![];
|
||||
actions.extend_from_slice(&transport::ACTIONS);
|
||||
actions.extend_from_slice(&mixer::ACTIONS);
|
||||
actions.extend_from_slice(&looper::ACTIONS);
|
||||
main_loop(
|
||||
&mut App {
|
||||
exited: false,
|
||||
|
|
@ -92,23 +89,38 @@ fn run_all () -> Result<(), Box<dyn Error>> {
|
|||
sequencer: sequencer::Sequencer::new()?,
|
||||
},
|
||||
|state, stdout, mut offset| {
|
||||
actions.clear();
|
||||
actions.extend_from_slice(&transport::ACTIONS);
|
||||
match state.mode {
|
||||
Mode::Transport => {},
|
||||
Mode::Mixer => actions.extend_from_slice(&mixer::ACTIONS),
|
||||
Mode::Looper => actions.extend_from_slice(&looper::ACTIONS),
|
||||
Mode::Sampler => actions.extend_from_slice(&sampler::ACTIONS),
|
||||
Mode::Sequencer => actions.extend_from_slice(&sequencer::ACTIONS),
|
||||
}
|
||||
|
||||
let (w, h) = render::render_toolbar_vertical(stdout, (offset.0, offset.1 + 1), &actions)?;
|
||||
offset.0 = offset.0 + w + 1;
|
||||
|
||||
transport::render(&mut state.transport, stdout, (offset.0 + 1, 1))?;
|
||||
render::render_box(stdout, offset.0, 0, 64, 4,
|
||||
render::render_box(stdout, Some("Transport"), offset.0, 0, 70, 4,
|
||||
state.mode == Mode::Transport)?;
|
||||
|
||||
mixer::render(&mut state.mixer, stdout, (offset.0 + 1, 6))?;
|
||||
render::render_box(stdout, offset.0, 5, 64, 9,
|
||||
render::render_box(stdout, Some("Mixer"), offset.0, 5, 70, 9,
|
||||
state.mode == Mode::Mixer)?;
|
||||
|
||||
looper::render(&mut state.looper, stdout, (offset.0 + 1, 16))?;
|
||||
render::render_box(stdout, offset.0, 15, 64, 6,
|
||||
render::render_box(stdout, Some("Looper"), offset.0, 15, 70, 6,
|
||||
state.mode == Mode::Looper)?;
|
||||
|
||||
//sampler::render(sampler, stdout, (1, 46))?;
|
||||
//sequencer::render(sequencer, stdout, (1, 66))?;
|
||||
sampler::render(&mut state.sampler, stdout, (offset.0 + 1, 20))?;
|
||||
render::render_box(stdout, Some("Sampler"), offset.0, 22, 70, 4,
|
||||
state.mode == Mode::Sampler)?;
|
||||
|
||||
sequencer::render(&mut state.sequencer, stdout, (offset.0 + 1, 25))?;
|
||||
render::render_box(stdout, Some("Sequencer"), offset.0, 27, 70, 6,
|
||||
state.mode == Mode::Sequencer)?;
|
||||
Ok(())
|
||||
},
|
||||
|state, event| {
|
||||
|
|
@ -122,11 +134,15 @@ fn run_all () -> Result<(), Box<dyn Error>> {
|
|||
KeyCode::Tab => match state.mode {
|
||||
Mode::Transport => state.mode = Mode::Mixer,
|
||||
Mode::Mixer => state.mode = Mode::Looper,
|
||||
Mode::Looper => state.mode = Mode::Transport,
|
||||
Mode::Looper => state.mode = Mode::Sampler,
|
||||
Mode::Sampler => state.mode = Mode::Sequencer,
|
||||
Mode::Sequencer => state.mode = Mode::Transport,
|
||||
_ => {}
|
||||
},
|
||||
KeyCode::BackTab => match state.mode {
|
||||
Mode::Transport => state.mode = Mode::Looper,
|
||||
Mode::Transport => state.mode = Mode::Sequencer,
|
||||
Mode::Sequencer => state.mode = Mode::Sampler,
|
||||
Mode::Sampler => state.mode = Mode::Looper,
|
||||
Mode::Looper => state.mode = Mode::Mixer,
|
||||
Mode::Mixer => state.mode = Mode::Transport,
|
||||
_ => {}
|
||||
|
|
@ -141,7 +157,12 @@ fn run_all () -> Result<(), Box<dyn Error>> {
|
|||
Mode::Looper => looper::handle(
|
||||
&mut state.looper, event
|
||||
)?,
|
||||
_ => {},
|
||||
Mode::Sampler => sampler::handle(
|
||||
&mut state.sampler, event
|
||||
)?,
|
||||
Mode::Sequencer => sequencer::handle(
|
||||
&mut state.sequencer, event
|
||||
)?,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -205,6 +226,7 @@ pub fn main_loop <T: Exitable> (
|
|||
});
|
||||
stdout.queue(Clear(ClearType::All))?.queue(Hide)?.flush()?;
|
||||
loop {
|
||||
stdout.queue(Clear(ClearType::All))?;
|
||||
render(state, &mut stdout, (0, 0))?;
|
||||
stdout.flush()?;
|
||||
handle(state, &input.recv()?)?;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue