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

reorder panes, start in sequencer

Browse source
This commit is contained in:
🪞👃🪞 2024-05-29 14:18:05 +03:00
parent b6c093b355
commit 265dc13248
2 changed files with 48 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

52
src/main.rs
View file

@ -81,7 +81,7 @@ fn run_all () -> Result<(), Box<dyn Error>> {
main_loop( main_loop(
&mut App { &mut App {
exited: false, exited: false,
mode: Mode::Transport, mode: Mode::Sequencer,
transport: transport::Transport::new()?, transport: transport::Transport::new()?,
mixer: mixer::Mixer::new()?, mixer: mixer::Mixer::new()?,
looper: looper::Looper::new()?, looper: looper::Looper::new()?,
@ -100,27 +100,28 @@ fn run_all () -> Result<(), Box<dyn Error>> {
} }
let (w, h) = render::render_toolbar_vertical(stdout, (offset.0, offset.1 + 1), &actions)?; let (w, h) = render::render_toolbar_vertical(stdout, (offset.0, offset.1 + 1), &actions)?;
offset.0 = offset.0 + w + 1; offset.0 = offset.0 + 20;
transport::render(&mut state.transport, stdout, (offset.0 + 1, 1))?; transport::render(&mut state.transport, stdout, (offset.0 + 1, 1))?;
render::render_box(stdout, Some("Transport"), offset.0, 0, 70, 4, render::render_box(stdout, Some("Transport"), offset.0, 0, 70, 4,
state.mode == Mode::Transport)?; state.mode == Mode::Transport)?;
mixer::render(&mut state.mixer, stdout, (offset.0 + 1, 6))?; sequencer::render(&mut state.sequencer, stdout, (offset.0 + 1, 3))?;
render::render_box(stdout, Some("Mixer"), offset.0, 5, 70, 9, render::render_box(stdout, Some("Sequencer"), offset.0, 5, 70, 6,
state.mode == Mode::Mixer)?; state.mode == Mode::Sequencer)?;
looper::render(&mut state.looper, stdout, (offset.0 + 1, 16))?; sampler::render(&mut state.sampler, stdout, (offset.0 + 1, 10))?;
render::render_box(stdout, Some("Looper"), offset.0, 15, 70, 6, render::render_box(stdout, Some("Sampler"), offset.0, 12, 70, 4,
state.mode == Mode::Looper)?;
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)?; state.mode == Mode::Sampler)?;
sequencer::render(&mut state.sequencer, stdout, (offset.0 + 1, 25))?; mixer::render(&mut state.mixer, stdout, (offset.0 + 1, 18))?;
render::render_box(stdout, Some("Sequencer"), offset.0, 27, 70, 6, render::render_box(stdout, Some("Mixer"), offset.0, 17, 70, 9,
state.mode == Mode::Sequencer)?; 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(()) Ok(())
}, },
|state, event| { |state, event| {
@ -131,20 +132,27 @@ fn run_all () -> Result<(), Box<dyn Error>> {
state.exit(); 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 { KeyCode::Tab => match state.mode {
Mode::Transport => state.mode = Mode::Mixer, 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::Mixer => state.mode = Mode::Looper,
Mode::Looper => state.mode = Mode::Sampler, Mode::Looper => state.mode = Mode::Transport,
Mode::Sampler => state.mode = Mode::Sequencer,
Mode::Sequencer => state.mode = Mode::Transport,
_ => {} _ => {}
}, },
KeyCode::BackTab => match state.mode { KeyCode::BackTab => match state.mode {
Mode::Transport => state.mode = Mode::Sequencer, Mode::Transport => state.mode = Mode::Looper,
Mode::Sequencer => state.mode = Mode::Sampler, Mode::Sequencer => state.mode = Mode::Transport,
Mode::Sampler => state.mode = Mode::Looper, Mode::Sampler => state.mode = Mode::Sequencer,
Mode::Mixer => state.mode = Mode::Sampler,
Mode::Looper => state.mode = Mode::Mixer, Mode::Looper => state.mode = Mode::Mixer,
Mode::Mixer => state.mode = Mode::Transport,
_ => {} _ => {}
}, },
_ => match state.mode { _ => match state.mode {

24
src/transport.rs
View file

@ -6,19 +6,31 @@ pub use self::jack::*;
pub use self::render::*; pub use self::render::*;
use crate::prelude::*; use crate::prelude::*;
pub const ACTIONS: [(&'static str, &'static str);2] = [ pub const ACTIONS: [(&'static str, &'static str);3] = [
("(Shift-)Tab, Arrows ", "Navigate"), ("(Shift-)Tab", "Switch pane"),
//("Home", "⏹ Stop and rewind"), ("Arrows", "Navigate"),
("(Shift-)Space", "⏮ Play/pause"), ("(Shift-)Space", "⯈ Play/pause"),
]; ];
pub struct Transport { pub struct Transport {
exited: bool exited: bool,
sample_rate: u64,
position: u64,
bpm: f64,
} }
impl Transport { impl Transport {
pub fn new () -> Result<Self, Box<dyn Error>> { pub fn new () -> Result<Self, Box<dyn Error>> {
Ok(Self { exited: false }) Ok(Self {
exited: false,
sample_rate: 48000,
position: 0,
bpm: 120.0
})
}
pub fn play_from_start_or_stop_and_rewind (&mut self) {
}
pub fn play_or_pause (&mut self) {
} }
} }