mirror of
https://codeberg.org/unspeaker/tek.git
synced 2025-12-07 12:16:42 +01:00
transport is rolling
This commit is contained in:
parent
1f928fba9d
commit
4fd208d53f
18 changed files with 540 additions and 498 deletions
301
src/main.rs
301
src/main.rs
|
|
@ -27,9 +27,12 @@ fn main () -> Result<(), Box<dyn Error>> {
|
|||
}
|
||||
|
||||
fn run_one (command: &cli::Command) -> Result<(), Box<dyn Error>> {
|
||||
let mut engine = crate::engine::Engine::new(None)?;
|
||||
|
||||
match command {
|
||||
cli::Command::Transport => main_loop(
|
||||
&mut transport::Transport::new()?,
|
||||
|
||||
cli::Command::Transport => engine.run(
|
||||
&mut transport::Transport::new(engine.jack_client.as_client())?,
|
||||
|state, stdout, mut offset| {
|
||||
let (w, h) = render::render_toolbar_vertical(stdout, offset, &transport::ACTIONS)?;
|
||||
offset.0 = offset.0 + w + 2;
|
||||
|
|
@ -37,7 +40,8 @@ fn run_one (command: &cli::Command) -> Result<(), Box<dyn Error>> {
|
|||
},
|
||||
|_, _|Ok(())
|
||||
),
|
||||
cli::Command::Mixer => main_loop(
|
||||
|
||||
cli::Command::Mixer => engine.run(
|
||||
&mut mixer::Mixer::new()?,
|
||||
|state, stdout, mut offset| {
|
||||
let (w, h) = render::render_toolbar_vertical(stdout, offset, &mixer::ACTIONS)?;
|
||||
|
|
@ -46,7 +50,8 @@ fn run_one (command: &cli::Command) -> Result<(), Box<dyn Error>> {
|
|||
},
|
||||
|_, _|Ok(())
|
||||
),
|
||||
cli::Command::Looper => main_loop(
|
||||
|
||||
cli::Command::Looper => engine.run(
|
||||
&mut looper::Looper::new()?,
|
||||
|state, stdout, mut offset| {
|
||||
let (w, h) = render::render_toolbar_vertical(stdout, offset, &looper::ACTIONS)?;
|
||||
|
|
@ -55,7 +60,8 @@ fn run_one (command: &cli::Command) -> Result<(), Box<dyn Error>> {
|
|||
},
|
||||
|_, _|Ok(())
|
||||
),
|
||||
cli::Command::Sampler => main_loop(
|
||||
|
||||
cli::Command::Sampler => engine.run(
|
||||
&mut sampler::Sampler::new()?,
|
||||
|state, stdout, mut offset| {
|
||||
let (w, h) = render::render_toolbar_vertical(stdout, offset, &sampler::ACTIONS)?;
|
||||
|
|
@ -64,7 +70,8 @@ fn run_one (command: &cli::Command) -> Result<(), Box<dyn Error>> {
|
|||
},
|
||||
|_, _|Ok(())
|
||||
),
|
||||
cli::Command::Sequencer => main_loop(
|
||||
|
||||
cli::Command::Sequencer => engine.run(
|
||||
&mut sequencer::Sequencer::new()?,
|
||||
|state, stdout, mut offset| {
|
||||
let (w, h) = render::render_toolbar_vertical(stdout, offset, &sequencer::ACTIONS)?;
|
||||
|
|
@ -73,177 +80,145 @@ fn run_one (command: &cli::Command) -> Result<(), Box<dyn Error>> {
|
|||
},
|
||||
|_, _|Ok(())
|
||||
),
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
fn run_all () -> Result<(), Box<dyn Error>> {
|
||||
|
||||
let mut engine = crate::engine::Engine::new(None)?;
|
||||
|
||||
struct App {
|
||||
exited: bool,
|
||||
mode: Mode,
|
||||
transport: crate::transport::Transport,
|
||||
mixer: crate::mixer::Mixer,
|
||||
looper: crate::looper::Looper,
|
||||
sampler: crate::sampler::Sampler,
|
||||
sequencer: crate::sequencer::Sequencer,
|
||||
}
|
||||
|
||||
#[derive(PartialEq)]
|
||||
enum Mode {
|
||||
Transport,
|
||||
Mixer,
|
||||
Looper,
|
||||
Sampler,
|
||||
Sequencer
|
||||
}
|
||||
|
||||
impl Exitable for App {
|
||||
fn exit (&mut self) {
|
||||
self.exited = true
|
||||
}
|
||||
fn exited (&self) -> bool {
|
||||
self.exited
|
||||
}
|
||||
}
|
||||
|
||||
let mut actions = vec![];
|
||||
main_loop(
|
||||
&mut App {
|
||||
exited: false,
|
||||
mode: Mode::Sequencer,
|
||||
transport: transport::Transport::new()?,
|
||||
mixer: mixer::Mixer::new()?,
|
||||
looper: looper::Looper::new()?,
|
||||
sampler: sampler::Sampler::new()?,
|
||||
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 + 20;
|
||||
let mut state = App {
|
||||
exited: false,
|
||||
mode: Mode::Sequencer,
|
||||
transport: transport::Transport::new(engine.jack_client.as_client())?,
|
||||
mixer: mixer::Mixer::new()?,
|
||||
looper: looper::Looper::new()?,
|
||||
sampler: sampler::Sampler::new()?,
|
||||
sequencer: sequencer::Sequencer::new()?,
|
||||
};
|
||||
|
||||
transport::render(&mut state.transport, stdout, (offset.0 + 1, 1))?;
|
||||
render::render_box(stdout, Some("Transport"), offset.0, 0, 70, 4,
|
||||
state.mode == Mode::Transport)?;
|
||||
let render = |state: &mut App, stdout: &mut Stdout, mut offset: (u16, u16)| {
|
||||
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),
|
||||
}
|
||||
|
||||
sequencer::render(&mut state.sequencer, stdout, (offset.0 + 1, 3))?;
|
||||
render::render_box(stdout, Some("Sequencer"), offset.0, 5, 70, 6,
|
||||
state.mode == Mode::Sequencer)?;
|
||||
let (w, h) = render::render_toolbar_vertical(stdout, (offset.0, offset.1 + 1), &actions)?;
|
||||
offset.0 = offset.0 + 20;
|
||||
|
||||
sampler::render(&mut state.sampler, stdout, (offset.0 + 1, 10))?;
|
||||
render::render_box(stdout, Some("Sampler"), offset.0, 12, 70, 4,
|
||||
state.mode == Mode::Sampler)?;
|
||||
transport::render(&mut state.transport, stdout, (offset.0 + 1, 1))?;
|
||||
render::render_box(stdout, Some("Transport"), offset.0, 0, 70, 4,
|
||||
state.mode == Mode::Transport)?;
|
||||
|
||||
mixer::render(&mut state.mixer, stdout, (offset.0 + 1, 18))?;
|
||||
render::render_box(stdout, Some("Mixer"), offset.0, 17, 70, 9,
|
||||
state.mode == Mode::Mixer)?;
|
||||
sequencer::render(&mut state.sequencer, stdout, (offset.0 + 1, 3))?;
|
||||
render::render_box(stdout, Some("Sequencer"), offset.0, 5, 70, 6,
|
||||
state.mode == Mode::Sequencer)?;
|
||||
|
||||
looper::render(&mut state.looper, stdout, (offset.0 + 1, 28))?;
|
||||
render::render_box(stdout, Some("Looper"), offset.0, 27, 70, 6,
|
||||
state.mode == Mode::Looper)?;
|
||||
sampler::render(&mut state.sampler, stdout, (offset.0 + 1, 10))?;
|
||||
render::render_box(stdout, Some("Sampler"), offset.0, 12, 70, 4,
|
||||
state.mode == Mode::Sampler)?;
|
||||
|
||||
Ok(())
|
||||
},
|
||||
|state, event| {
|
||||
if let Event::Key(key) = event {
|
||||
match key.code {
|
||||
KeyCode::Char('c') => {
|
||||
if key.modifiers == KeyModifiers::CONTROL {
|
||||
state.exit();
|
||||
}
|
||||
},
|
||||
KeyCode::Char(' ') => {
|
||||
if key.modifiers == KeyModifiers::SHIFT {
|
||||
state.transport.play_from_start_or_stop_and_rewind();
|
||||
} else {
|
||||
state.transport.play_or_pause();
|
||||
}
|
||||
},
|
||||
KeyCode::Tab => match state.mode {
|
||||
Mode::Transport => state.mode = Mode::Sequencer,
|
||||
Mode::Sequencer => state.mode = Mode::Sampler,
|
||||
Mode::Sampler => state.mode = Mode::Mixer,
|
||||
Mode::Mixer => state.mode = Mode::Looper,
|
||||
Mode::Looper => state.mode = Mode::Transport,
|
||||
_ => {}
|
||||
},
|
||||
KeyCode::BackTab => match state.mode {
|
||||
Mode::Transport => state.mode = Mode::Looper,
|
||||
Mode::Sequencer => state.mode = Mode::Transport,
|
||||
Mode::Sampler => state.mode = Mode::Sequencer,
|
||||
Mode::Mixer => state.mode = Mode::Sampler,
|
||||
Mode::Looper => state.mode = Mode::Mixer,
|
||||
_ => {}
|
||||
},
|
||||
_ => match state.mode {
|
||||
Mode::Transport => transport::handle(
|
||||
&mut state.transport, event
|
||||
)?,
|
||||
Mode::Mixer => mixer::handle(
|
||||
&mut state.mixer, event
|
||||
)?,
|
||||
Mode::Looper => looper::handle(
|
||||
&mut state.looper, event
|
||||
)?,
|
||||
Mode::Sampler => sampler::handle(
|
||||
&mut state.sampler, event
|
||||
)?,
|
||||
Mode::Sequencer => sequencer::handle(
|
||||
&mut state.sequencer, event
|
||||
)?,
|
||||
mixer::render(&mut state.mixer, stdout, (offset.0 + 1, 18))?;
|
||||
render::render_box(stdout, Some("Mixer"), offset.0, 17, 70, 9,
|
||||
state.mode == Mode::Mixer)?;
|
||||
|
||||
looper::render(&mut state.looper, stdout, (offset.0 + 1, 28))?;
|
||||
render::render_box(stdout, Some("Looper"), offset.0, 27, 70, 6,
|
||||
state.mode == Mode::Looper)?;
|
||||
|
||||
Ok(())
|
||||
};
|
||||
|
||||
let handle = |state: &mut App, event: &Event| {
|
||||
//println!("{event:?}");
|
||||
if let Event::Input(crossterm::event::Event::Key(key)) = event {
|
||||
match key.code {
|
||||
KeyCode::Char('c') => {
|
||||
if key.modifiers == KeyModifiers::CONTROL {
|
||||
state.exit();
|
||||
}
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
struct App {
|
||||
exited: bool,
|
||||
mode: Mode,
|
||||
transport: crate::transport::Transport,
|
||||
mixer: crate::mixer::Mixer,
|
||||
looper: crate::looper::Looper,
|
||||
sampler: crate::sampler::Sampler,
|
||||
sequencer: crate::sequencer::Sequencer,
|
||||
}
|
||||
|
||||
#[derive(PartialEq)]
|
||||
enum Mode {
|
||||
Transport,
|
||||
Mixer,
|
||||
Looper,
|
||||
Sampler,
|
||||
Sequencer
|
||||
}
|
||||
|
||||
impl Exitable for App {
|
||||
fn exit (&mut self) {
|
||||
self.exited = true
|
||||
}
|
||||
fn exited (&self) -> bool {
|
||||
self.exited
|
||||
}
|
||||
}
|
||||
|
||||
pub fn main_loop <T: Exitable> (
|
||||
state: &mut T,
|
||||
mut render: impl FnMut(&mut T, &mut Stdout, (u16, u16)) -> Result<(), Box<dyn Error>>,
|
||||
mut handle: impl FnMut(&mut T, &Event) -> Result<(), Box<dyn Error>>,
|
||||
) -> Result<(), Box<dyn Error>> {
|
||||
let mut stdout = stdout();
|
||||
let sleep = std::time::Duration::from_millis(16);
|
||||
let poll = std::time::Duration::from_millis(100);
|
||||
crossterm::terminal::enable_raw_mode()?;
|
||||
let (tx, input) = std::sync::mpsc::channel::<crossterm::event::Event>();
|
||||
let exited = Arc::new(AtomicBool::new(false));
|
||||
let exit_input_thread = exited.clone();
|
||||
spawn(move || {
|
||||
loop {
|
||||
// Exit if flag is set
|
||||
if exit_input_thread.fetch_and(true, Ordering::Relaxed) {
|
||||
break
|
||||
}
|
||||
// Listen for events and send them to the main thread
|
||||
if crossterm::event::poll(poll).is_ok() {
|
||||
if tx.send(crossterm::event::read().unwrap()).is_err() {
|
||||
break
|
||||
},
|
||||
KeyCode::Char(' ') => {
|
||||
if key.modifiers == KeyModifiers::SHIFT {
|
||||
state.transport.play_from_start_or_stop_and_rewind();
|
||||
} else {
|
||||
state.transport.play_or_pause();
|
||||
}
|
||||
},
|
||||
KeyCode::Tab => match state.mode {
|
||||
Mode::Transport => state.mode = Mode::Sequencer,
|
||||
Mode::Sequencer => state.mode = Mode::Sampler,
|
||||
Mode::Sampler => state.mode = Mode::Mixer,
|
||||
Mode::Mixer => state.mode = Mode::Looper,
|
||||
Mode::Looper => state.mode = Mode::Transport,
|
||||
_ => {}
|
||||
},
|
||||
KeyCode::BackTab => match state.mode {
|
||||
Mode::Transport => state.mode = Mode::Looper,
|
||||
Mode::Sequencer => state.mode = Mode::Transport,
|
||||
Mode::Sampler => state.mode = Mode::Sequencer,
|
||||
Mode::Mixer => state.mode = Mode::Sampler,
|
||||
Mode::Looper => state.mode = Mode::Mixer,
|
||||
_ => {}
|
||||
},
|
||||
_ => match state.mode {
|
||||
Mode::Transport => transport::handle(
|
||||
&mut state.transport, &event
|
||||
)?,
|
||||
Mode::Mixer => mixer::handle(
|
||||
&mut state.mixer, &event
|
||||
)?,
|
||||
Mode::Looper => looper::handle(
|
||||
&mut state.looper, &event
|
||||
)?,
|
||||
Mode::Sampler => sampler::handle(
|
||||
&mut state.sampler, &event
|
||||
)?,
|
||||
Mode::Sequencer => sequencer::handle(
|
||||
&mut state.sequencer, &event
|
||||
)?,
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
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()?)?;
|
||||
if state.exited() {
|
||||
crossterm::terminal::disable_raw_mode()?;
|
||||
stdout.queue(Clear(ClearType::All))?.queue(Show)?.flush()?;
|
||||
break
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
Ok(())
|
||||
};
|
||||
|
||||
engine.run(&mut state, render, handle)
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue