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

cleanup ports; horizontal scenes

Browse source
This commit is contained in:
🪞👃🪞 2024-07-03 17:31:20 +03:00
parent b4fdddc0aa
commit c3c6c13f57
5 changed files with 174 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

97
src/main.rs
View file

@ -78,6 +78,9 @@ pub fn main () -> Usually<()> {
})),
]))?,
];
state.track_cursor = 1;
state.scene_cursor = 1;
state.midi_in = Some(jack.as_client().register_port("midi-in", MidiIn)?);
state.jack = Some(jack);
Ok(())
}))
@ -85,17 +88,21 @@ pub fn main () -> Usually<()> {
#[derive(Default)]
pub struct App {
pub xdg: Option<Arc<XdgApp>>,
pub jack: Option<DynamicAsyncClient>,
pub scene: usize,
pub scenes: Vec<Scene>,
pub xdg: Option<Arc<XdgApp>>,
pub jack: Option<DynamicAsyncClient>,
pub grid_mode: bool,
pub chain_mode: bool,
pub seq_mode: bool,
pub scenes: Vec<Scene>,
pub scene_cursor: usize,
pub tracks: Vec<Track>,
pub track_cursor: usize,
pub tracks: Vec<Track>,
pub frame: usize,
pub timebase: Arc<Timebase>,
pub modal: Option<Box<dyn Component>>,
pub section: usize,
pub entered: bool,
pub frame: usize,
pub timebase: Arc<Timebase>,
pub modal: Option<Box<dyn Component>>,
pub section: usize,
pub entered: bool,
pub midi_in: Option<Port<MidiIn>>,
}
process!(App);
@ -116,10 +123,11 @@ render!(App |self, buf, area| {
buf,
area: Rect { x, y, width, height: height / 3 },
name: "",
mode: self.grid_mode,
focused: self.section == 0,
scenes: &self.scenes,
tracks: &self.tracks,
cursor: &(self.track_cursor, self.scene + 1)
cursor: &(self.track_cursor, self.scene_cursor),
}.draw()?.height;
if self.track_cursor > 0 {
@ -138,10 +146,6 @@ render!(App |self, buf, area| {
}
if let Some(ref modal) = self.modal {
for cell in buf.content.iter_mut() {
cell.fg = ratatui::style::Color::Gray;
cell.modifier = ratatui::style::Modifier::DIM;
}
modal.render(buf, area)?;
}
@ -155,29 +159,41 @@ handle!(App |self, e| {
return Ok(true)
};
}
handle_keymap(self, e, keymap!(App {
[F(1), NONE, "toggle_help", "toggle help", toggle_help],
[Tab, NONE, "focus_next", "focus next area", focus_next],
[Tab, SHIFT, "focus_prev", "focus previous area", focus_prev],
[Up, NONE, "cursor_up", "move cursor up", cursor_up],
[Down, NONE, "cursor_down", "move cursor down", cursor_down],
[Left, NONE, "cursor_left", "move cursor left", cursor_left],
[Right, NONE, "cursor_right", "move cursor right", cursor_right],
[Char('.'), NONE, "increment", "increment value at cursor", increment],
[Char(','), NONE, "decrement", "decrement value at cursor", decrement],
[Delete, CONTROL, "delete", "delete track", delete],
[Char('d'), CONTROL, "duplicate", "duplicate scene or track", duplicate],
[Enter, NONE, "activate", "activate item at cursor", activate],
[Char(' '), NONE, "play_toggle", "play or pause", play_toggle],
[Char('r'), NONE, "record_toggle", "toggle recording", record_toggle],
[Char('d'), NONE, "overdub_toggle", "toggle overdub", overdub_toggle],
[Char('m'), NONE, "monitor_toggle", "toggle input monitoring", monitor_toggle],
[Char('r'), CONTROL, "rename", "rename current element", rename],
[Char('t'), CONTROL, "add_track", "add a new track", add_track],
//[Char(' '), SHIFT, "play_start", "play from start", play_start],
}))
handle_keymap(self, e, KEYMAP)
});
const KEYMAP: &'static [KeyBinding<App>] = keymap!(App {
[F(1), NONE, "toggle_help", "toggle help", toggle_help],
[Tab, NONE, "focus_next", "focus next area", focus_next],
[Tab, SHIFT, "focus_prev", "focus previous area", focus_prev],
[Up, NONE, "cursor_up", "move cursor up", cursor_up],
[Down, NONE, "cursor_down", "move cursor down", cursor_down],
[Left, NONE, "cursor_left", "move cursor left", cursor_left],
[Right, NONE, "cursor_right", "move cursor right", cursor_right],
[Char('.'), NONE, "increment", "increment value at cursor", increment],
[Char(','), NONE, "decrement", "decrement value at cursor", decrement],
[Delete, CONTROL, "delete", "delete track", delete],
[Char('d'), CONTROL, "duplicate", "duplicate scene or track", duplicate],
[Enter, NONE, "activate", "activate item at cursor", activate],
[Char(' '), NONE, "play_toggle", "play or pause", play_toggle],
[Char('r'), NONE, "record_toggle", "toggle recording", record_toggle],
[Char('d'), NONE, "overdub_toggle", "toggle overdub", overdub_toggle],
[Char('m'), NONE, "monitor_toggle", "toggle input monitoring", monitor_toggle],
[Char('r'), CONTROL, "rename", "rename current element", rename],
[Char('t'), CONTROL, "add_track", "add a new track", add_track],
[Char('a'), CONTROL, "add_scene", "add a new scene", add_scene],
[Char('`'), NONE, "switch_mode", "switch the display mode", switch_mode],
//[Char(' '), SHIFT, "play_start", "play from start", play_start],
});
fn switch_mode (app: &mut App) -> Usually<bool> {
match app.section {
0 => {app.grid_mode = !app.grid_mode; Ok(true)},
1 => {app.chain_mode = !app.chain_mode; Ok(true)},
2 => {app.seq_mode = !app.seq_mode; Ok(true)},
_ => Ok(false)
}
}
fn focus_next (app: &mut App) -> Usually<bool> {
if app.section >= 2 {
app.section = 0;
@ -247,6 +263,12 @@ fn delete (app: &mut App) -> Usually<bool> {
fn duplicate (_: &mut App) -> Usually<bool> { Ok(true) }
fn activate (_: &mut App) -> Usually<bool> { Ok(true) }
fn rename (_: &mut App) -> Usually<bool> { Ok(true) }
fn add_scene (app: &mut App) -> Usually<bool> {
let name = format!("Scene {}", app.scenes.len() + 1);
app.scenes.push(Scene::new(&name, vec![]));
app.scene_cursor = app.scenes.len() - 1;
Ok(true)
}
fn add_track (app: &mut App) -> Usually<bool> {
let name = format!("Track {}", app.tracks.len() + 1);
app.tracks.push(Track::new(&name, app.jack.as_ref().unwrap().as_client(), &app.timebase, None, None)?);
@ -255,8 +277,9 @@ fn add_track (app: &mut App) -> Usually<bool> {
}
fn delete_track (app: &mut App) -> Usually<bool> {
if app.tracks.len() > 0 {
app.tracks.remove(app.track_cursor);
let track = app.tracks.remove(app.track_cursor);
app.track_cursor = app.track_cursor.saturating_sub(1);
app.jack.as_ref().unwrap().as_client().unregister_port(track.midi_out)?;
return Ok(true)
}
Ok(false)