mirror of
https://codeberg.org/unspeaker/tek.git
synced 2025-12-06 11:46:41 +01:00
fix some errors and warnings
This commit is contained in:
parent
64d520e75c
commit
438a2d86a6
3 changed files with 97 additions and 53 deletions
|
|
@ -160,45 +160,19 @@ impl Tek {
|
|||
}
|
||||
|
||||
pub fn view_outputs (&self) -> impl Content<TuiOut> + use<'_> {
|
||||
let editing = self.is_editing();
|
||||
let w = self.w_tracks_area();
|
||||
let s = self.w_sidebar() as u16;
|
||||
let fg = Tui::g(224);
|
||||
let nexts = self.per_track_top(|t, track|Either(
|
||||
track.player.next_clip.is_some(),
|
||||
Thunk::new(||Tui::bg(Reset, format!("{:?}",
|
||||
track.player.next_clip.as_ref()
|
||||
.map(|(moment, clip)|clip.as_ref()
|
||||
.map(|clip|clip.read().unwrap().name.clone()))
|
||||
.flatten().as_ref()))),
|
||||
Thunk::new(||Tui::bg(Reset, " ------ "))));
|
||||
let nexts = row_top(w, 2, s, Align::ne("Next:"), nexts, ());
|
||||
let froms = self.per_track_top(
|
||||
|_, _|Tui::bg(Reset, Align::c(Bsp::s(" ------ ", OctaveVertical::default(),)))
|
||||
);
|
||||
let froms = row_top(w, 2, s, Align::ne("From:"), froms, ());
|
||||
let ports = row_top(w, 1, s,
|
||||
button_3("o", "midi outs", format!("{}", self.midi_outs.len()), editing),
|
||||
self.per_track_top(move|t, track|{
|
||||
let mute = false;
|
||||
let solo = false;
|
||||
let mute = if mute { White } else { track.color.darkest.rgb };
|
||||
let solo = if solo { White } else { track.color.darkest.rgb };
|
||||
let bg = if self.selected().track() == Some(t) {
|
||||
track.color.light.rgb
|
||||
} else {
|
||||
track.color.base.rgb
|
||||
};
|
||||
let bg2 = if t > 0 { self.tracks()[t].color.base.rgb } else { Reset };
|
||||
wrap(bg, fg, Tui::bold(true, Fill::x(Bsp::e(
|
||||
Tui::fg_bg(mute, bg, "Play "),
|
||||
Tui::fg_bg(solo, bg, "Solo ")))))}),
|
||||
button_2("O", "add midi out", editing));
|
||||
let routes = row_top(w, self.h_outputs() - 1, s,
|
||||
io_ports(fg, Tui::g(32), ||self.outputs_sizes()),
|
||||
self.per_track_top(move|t, track|io_conns(
|
||||
track.color.dark.rgb, track.color.darker.rgb, ||self.outputs_sizes())), ());
|
||||
Align::n(Bsp::s(Bsp::s(nexts, froms), Bsp::s(ports, routes)))
|
||||
let fg = Tui::g(224);
|
||||
let bg = Tui::g(32);
|
||||
let len = self.midi_outs.len();
|
||||
let ed = self.is_editing();
|
||||
let ws = self.w_tracks_area();
|
||||
let s = self.w_sidebar() as u16;
|
||||
let ts = move||self.tracks_sizes_scrolled();
|
||||
let sel = self.selected().track();
|
||||
let ho = self.h_outputs() - 1;
|
||||
let os = ||self.outputs_sizes();
|
||||
let pts = io_ports(fg, bg, os);
|
||||
let tr = self.tracks.as_ref();
|
||||
view_outputs(ws, s, ho, len, ed, sel, tr, ts, os, pts)
|
||||
}
|
||||
|
||||
pub fn view_inputs (&self) -> impl Content<TuiOut> + use<'_> {
|
||||
|
|
@ -209,7 +183,7 @@ impl Tek {
|
|||
let wt = self.w_tracks_area();
|
||||
let ts = move||self.tracks_sizes_scrolled();
|
||||
let is = ||self.inputs_sizes();
|
||||
let ins = self.midi_ins.len();
|
||||
let len = self.midi_ins.len();
|
||||
let sel = self.selected().track();
|
||||
let tr = self.tracks().as_ref();
|
||||
let ed = self.is_editing();
|
||||
|
|
@ -218,7 +192,7 @@ impl Tek {
|
|||
let to_conns = move|_, &Track { color, .. }|io_conns(color.dark.rgb, color.darker.rgb, is);
|
||||
view_inputs(w, ws, wt, ts,
|
||||
row_top(w, hi, ws, pts, per_track_top(wt, ts, to_conns), ()),
|
||||
input_ports(w, ws, ins, wt, ts, sel, tr, ed))
|
||||
input_ports(w, ws, len, wt, ts, sel, tr, ed))
|
||||
}
|
||||
|
||||
/// Render something centered for each track.
|
||||
|
|
@ -267,12 +241,12 @@ fn view_scene_name (
|
|||
}
|
||||
|
||||
fn view_inputs <'a, T, U, V, W> (
|
||||
w: u16,
|
||||
s: u16,
|
||||
w_tracks_area: u16,
|
||||
tracks_sizes: U,
|
||||
routes: V,
|
||||
ports: W,
|
||||
ws: u16,
|
||||
s: u16,
|
||||
wt: u16,
|
||||
ts: U,
|
||||
routes: V,
|
||||
ports: W,
|
||||
) -> impl Content<TuiOut> + use<'a, T, U, V, W> where
|
||||
T: TracksSizes<'a>,
|
||||
U: Fn()->T + Send + Sync + 'a,
|
||||
|
|
@ -281,8 +255,76 @@ fn view_inputs <'a, T, U, V, W> (
|
|||
{
|
||||
let headers = Bsp::s(Align::e("Input:"), Align::e("Into:"));
|
||||
let sep = |_, _|Tui::bg(Reset, Align::c(Bsp::s(OctaveVertical::default(), " ------ ")));
|
||||
let separators = per_track_top(w_tracks_area, tracks_sizes, sep);
|
||||
Bsp::s(Bsp::s(routes, ports), row_top(w, 2, s, headers, separators, ()))
|
||||
let separators = per_track_top(wt, ts, sep);
|
||||
Bsp::s(Bsp::s(routes, ports), row_top(ws, 2, s, headers, separators, ()))
|
||||
}
|
||||
|
||||
fn view_outputs <'a, T, U, V, W, X> (
|
||||
ws: u16,
|
||||
s: u16,
|
||||
ho: u16,
|
||||
len: usize,
|
||||
ed: bool,
|
||||
sel: Option<usize>,
|
||||
tr: &'a [Track],
|
||||
ts: U,
|
||||
os: W,
|
||||
pts: X,
|
||||
) -> impl Content<TuiOut> + use<'a, T, U, V, W, X> where
|
||||
T: TracksSizes<'a>,
|
||||
U: Fn()->T + Send + Sync + 'a,
|
||||
V: PortsSizes<'a>,
|
||||
W: Fn()->V + Send + Sync + 'a,
|
||||
X: Content<TuiOut> + 'a
|
||||
{
|
||||
let fg = Tui::g(224);
|
||||
let conns = row_top(ws, ho, s, pts, per_track_top(
|
||||
ws, ts, |t, track|io_conns(track.color.dark.rgb, track.color.darker.rgb, os)
|
||||
), ());
|
||||
let nexts = row_top(ws, 2, s, Align::ne("Next:"), per_track_top(ws, ts, |t, track|Either(
|
||||
track.player.next_clip.is_some(),
|
||||
Thunk::new(||Tui::bg(Reset, format!("{:?}",
|
||||
track.player.next_clip.as_ref()
|
||||
.map(|(moment, clip)|clip.as_ref()
|
||||
.map(|clip|clip.read().unwrap().name.clone()))
|
||||
.flatten().as_ref()))),
|
||||
Thunk::new(||Tui::bg(Reset, " ------ "))
|
||||
)), ());
|
||||
let bar = row_top(
|
||||
ws,
|
||||
2,
|
||||
s,
|
||||
Align::ne("From:"),
|
||||
per_track_top(
|
||||
ws,
|
||||
ts,
|
||||
|_, _|Tui::bg(Reset, Align::c(Bsp::s(" ------ ", OctaveVertical::default(),)))
|
||||
),
|
||||
()
|
||||
);
|
||||
let baz = row_top(
|
||||
ws,
|
||||
1,
|
||||
s,
|
||||
button_3("o", "midi outs", format!("{}", len), ed),
|
||||
per_track_top(
|
||||
ws,
|
||||
ts,
|
||||
move|t, track|{
|
||||
let mute = false;
|
||||
let solo = false;
|
||||
let mute = if mute { White } else { track.color.darkest.rgb };
|
||||
let solo = if solo { White } else { track.color.darkest.rgb };
|
||||
let bg1 = if sel == Some(t) { track.color.light.rgb } else { track.color.base.rgb };
|
||||
let bg2 = if t > 0 { tr[t].color.base.rgb } else { Reset };
|
||||
wrap(bg1, fg, Tui::bold(true, Fill::x(Bsp::e(
|
||||
Tui::fg_bg(mute, bg1, "Play "),
|
||||
Tui::fg_bg(solo, bg1, "Solo ")))))
|
||||
}
|
||||
),
|
||||
button_2("O", "add midi out", ed)
|
||||
);
|
||||
Align::n(Bsp::s(Bsp::s(nexts, bar), Bsp::s(baz, conns)))
|
||||
}
|
||||
|
||||
fn input_ports <'a, T: TracksSizes<'a>, U: Fn()->T + Send + Sync + 'a> (
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue