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

arranger, transport: despaghettify

Browse source
This commit is contained in:
🪞👃🪞 2024-08-21 20:09:23 +03:00
parent 33bdf65e8d
commit 1104093395
10 changed files with 430 additions and 253 deletions
Download patch file Download diff file Expand all files Collapse all files

101
crates/tek_sequencer/src/arranger_view_v.rs
View file

@ -30,20 +30,25 @@ pub fn draw (
) -> Usually<Rect> {
area.height = 2 + (rows[rows.len() - 1].1 / 96) as u16;
let offset = 3 + scene_name_max_len(state.scenes.as_ref()) as u16;
Layered([
&FillBg(Nord::bg_lo(state.focused, state.entered)),
&column_separators(offset, cols),
&cursor_focus(state, offset, cols, rows),
&Split::down([
&tracks_header(state, cols, offset),
&scene_rows(state, cols, rows, offset),
]),
&row_separators(rows),
]).render(buf, area)
let Arranger { focus_sequencer, focused, entered, selected, .. } = *state;
let tracks = state.tracks.as_ref();
let scenes = state.scenes.as_ref();
Layered::new()
.add(FillBg(Nord::bg_lo(state.focused, state.entered)))
.add(ColumnSeparators(offset, cols))
.add(CursorFocus(focus_sequencer, focused, entered, selected, offset, cols, rows))
.add(Split::down()
.add(TracksHeader(offset, cols, tracks))
.add(SceneRows(offset, cols, rows, tracks, scenes)))
.add(RowSeparators(rows))
.render(buf, area)
}
fn column_separators <'a> (offset: u16, cols: &'a [(usize, usize)]) -> impl Render + 'a {
move |buf: &mut Buffer, area: Rect|{
struct ColumnSeparators<'a>(u16, &'a [(usize, usize)]);
impl<'a> Render for ColumnSeparators<'a> {
fn render (&self, buf: &mut Buffer, area: Rect) -> Usually<Rect> {
let Self(offset, cols) = self;
let style = Some(Style::default().fg(Nord::SEPARATOR));
for (_, x) in cols.iter() {
let x = offset + area.x + *x as u16 - 1;
@ -55,8 +60,11 @@ fn column_separators <'a> (offset: u16, cols: &'a [(usize, usize)]) -> impl Rend
}
}
fn row_separators <'a> (rows: &'a [(usize, usize)]) -> impl Render + 'a {
move |buf: &mut Buffer, area: Rect| {
struct RowSeparators<'a>(&'a [(usize, usize)]);
impl<'a> Render for RowSeparators<'a> {
fn render (&self, buf: &mut Buffer, area: Rect) -> Usually<Rect> {
let Self(rows) = self;
for (_, y) in rows.iter() {
let y = area.y + (*y / 96) as u16 + 1;
if y >= buf.area.height {
@ -72,16 +80,19 @@ fn row_separators <'a> (rows: &'a [(usize, usize)]) -> impl Render + 'a {
}
}
fn cursor_focus <'a> (
state: &'a Arranger, offset: u16, cols: &'a [(usize, usize)], rows: &'a [(usize, usize)],
) -> impl Render + 'a {
move |buf: &mut Buffer, area: Rect| {
let area = match state.selected {
ArrangerFocus::Mix => if state.focused
&& state.entered
&& state.selected == ArrangerFocus::Mix
struct CursorFocus<'a>(
bool, bool, bool, ArrangerFocus, u16, &'a [(usize, usize)], &'a [(usize, usize)]
);
impl<'a> Render for CursorFocus<'a> {
fn render (&self, buf: &mut Buffer, area: Rect) -> Usually<Rect> {
let Self(focus_sequencer, focused, entered, selected, offset, cols, rows) = *self;
let area = match selected {
ArrangerFocus::Mix => if focused
&& entered
&& selected == ArrangerFocus::Mix
{
fill_bg(buf, area, Nord::bg_hi(state.focused, state.entered));
fill_bg(buf, area, Nord::bg_hi(focused, entered));
area
} else {
area
@ -93,7 +104,7 @@ fn cursor_focus <'a> (
width: cols[t].0 as u16,
height: area.height
};
fill_bg(buf, area, Nord::bg_hi(state.focused, state.entered));
fill_bg(buf, area, Nord::bg_hi(focused, entered));
area
},
ArrangerFocus::Scene(s) => {
@ -103,7 +114,7 @@ fn cursor_focus <'a> (
width: area.width,
height: (rows[s].0 / 96) as u16
};
fill_bg(buf, area, Nord::bg_hi(state.focused, state.entered));
fill_bg(buf, area, Nord::bg_hi(focused, entered));
area
},
ArrangerFocus::Clip(t, s) => {
@ -125,29 +136,28 @@ fn cursor_focus <'a> (
width: cols[t].0 as u16,
height: (rows[s].0 / 96) as u16
};
let lo = Nord::bg_hi(state.focused, state.entered);
let hi = Nord::bg_hier(state.focused, state.entered);
let lo = Nord::bg_hi(focused, entered);
let hi = Nord::bg_hier(focused, entered);
fill_bg(buf, track_area, lo);
fill_bg(buf, scene_area, lo);
fill_bg(buf, area, hi);
area
},
};
if !state.focus_sequencer {
if !focus_sequencer {
Corners(Style::default().green().not_dim()).draw(buf, area)?;
}
Ok(area)
}
}
pub fn tracks_header <'a> (
state: &'a Arranger,
track_cols: &'a [(usize, usize)],
offset: u16,
) -> impl Render + 'a {
move |buf: &mut Buffer, area: Rect| {
struct TracksHeader<'a>(u16, &'a[(usize, usize)], &'a [Sequencer]);
impl<'a> Render for TracksHeader<'a> {
fn render (&self, buf: &mut Buffer, area: Rect) -> Usually<Rect> {
let Self(offset, track_cols, tracks) = *self;
let Rect { y, width, .. } = area;
for (track, (_, x)) in state.tracks.iter().zip(track_cols) {
for (track, (_, x)) in tracks.iter().zip(track_cols) {
let x = *x as u16;
if x > width {
break
@ -158,13 +168,11 @@ pub fn tracks_header <'a> (
}
}
pub fn scene_rows <'a> (
state: &'a Arranger,
track_cols: &'a [(usize, usize)],
scene_rows: &'a [(usize, usize)],
offset: u16,
) -> impl Render + 'a {
move |buf: &mut Buffer, area: Rect| {
struct SceneRows<'a>(u16, &'a[(usize, usize)], &'a[(usize, usize)], &'a[Sequencer], &'a[Scene]);
impl<'a> Render for SceneRows<'a> {
fn render (&self, buf: &mut Buffer, area: Rect) -> Usually<Rect> {
let Self(offset, track_cols, scene_rows, tracks, scenes) = *self;
let black = Some(Style::default().fg(Nord::SEPARATOR));
let Rect { mut y, height, .. } = area;
for (_, x) in track_cols.iter() {
@ -175,12 +183,12 @@ pub fn scene_rows <'a> (
}
}
}
for (scene, (pulses, _)) in state.scenes.iter().zip(scene_rows) {
for (scene, (pulses, _)) in scenes.iter().zip(scene_rows) {
if y > height {
break
}
let h = 1.max((pulses / 96) as u16);
scene_row(state, buf, Rect {
scene_row(tracks, buf, Rect {
x: area.x,
y,
width: area.width,
@ -192,8 +200,8 @@ pub fn scene_rows <'a> (
}
}
fn scene_row (
state: &Arranger,
fn scene_row <'a> (
tracks: &'a[Sequencer],
buf: &mut Buffer,
area: Rect,
scene: &Scene,
@ -201,7 +209,6 @@ fn scene_row (
offset: u16
) -> Usually<u16> {
let Rect { y, width, .. } = area;
let tracks = state.tracks.as_ref();
let playing = scene.is_playing(tracks);
(if playing { "▶" } else { " " }).blit(buf, area.x, y, None)?;
scene.name.blit(buf, area.x + 1, y, None)?;