bizzle
Some checks are pending
/ build (push) Waiting to run

This commit is contained in:
i do not exist 2026-08-19 18:21:42 +03:00
parent e50c4a5eef
commit e6984915e4
22 changed files with 1002 additions and 294 deletions

View file

@ -46,10 +46,10 @@ impl Track {
pub fn audio_outs (&self) -> &[AudioOutput] {
self.devices.last().map(|x|x.audio_outs()).unwrap_or_default()
}
pub fn per <'a, T: Draw<Tui> + 'a, U: TracksSizes<'a>> (
pub fn per <'a, T: Draw<'a, Tui> + 'a, U: TracksSizes<'a>> (
tracks: impl Fn() -> U + Send + Sync + 'a,
callback: &'a (impl Fn(usize, &'a Track)->T + Send + Sync + 'a)
) -> impl Draw<Tui> + 'a {
) -> impl Draw<'a, Tui> {
iter_east(move||tracks().map(|(index, track, x1, x2): (usize, &Track, usize, usize)|{
fg_bg(
track.color.lightest.term,
@ -343,7 +343,7 @@ pub trait TracksView: HasTracks + ScenesView + HasMidiIns + HasMidiOuts + HasTra
}
/// Draw name of each track
fn view_track_names (&self, theme: ItemTheme) -> impl Draw<Tui> {
fn view_track_names (&self, theme: ItemTheme) -> impl Draw<'_, Tui> {
let selected = self.selection();
east(
south(
@ -396,7 +396,7 @@ pub trait TracksView: HasTracks + ScenesView + HasMidiIns + HasMidiOuts + HasTra
}
/// Draw outputs per track
fn view_track_outputs <'a> (&'a self, theme: ItemTheme, _h: u16) -> impl Draw<Tui> {
fn view_track_outputs <'a> (&'a self, theme: ItemTheme, _h: u16) -> impl Draw<'_, Tui> {
view_track_row_section(theme,
south(button_2("o", "utput", false).align_w().full_w(),
draw(|to: &mut Tui|{
@ -431,7 +431,7 @@ pub trait TracksView: HasTracks + ScenesView + HasMidiIns + HasMidiOuts + HasTra
}
/// Draw inputs per track
fn view_track_inputs <'a> (&'a self, theme: ItemTheme) -> impl Draw<Tui> {
fn view_track_inputs <'a> (&'a self, theme: ItemTheme) -> impl Draw<'_, Tui> {
let mut height = 0u16;
for track in self.tracks().iter() {
height = height.max(track.sequencer.midi_ins.len() as u16);
@ -459,7 +459,7 @@ pub trait TracksView: HasTracks + ScenesView + HasMidiIns + HasMidiOuts + HasTra
}).align_w()))
}
fn view_track_devices (&self, theme: ItemTheme) -> impl Draw<Tui> {
fn view_track_devices (&self, theme: ItemTheme) -> impl Draw<'_, Tui> {
let height = self.tracks_devices_height();
let btn1 = button_3("d", "evice", self.track().map(|t|t.devices.len()).unwrap_or(0), false);
let btn2 = button_2("D", "+", false);
@ -488,7 +488,7 @@ pub trait TracksView: HasTracks + ScenesView + HasMidiIns + HasMidiOuts + HasTra
h as u16
}
fn view_inputs (&self, _theme: ItemTheme) -> impl Draw<Tui> + '_ {
fn view_inputs (&self, _theme: ItemTheme) -> impl Draw<'_, Tui> + '_ {
let title_1 = button_3("i", "nput ", self.midi_ins().len(), false).align_w().exact_wh(20, 1);
let title_2 = button_2("I", "+", false).exact_wh(4, 1);
east(title_1, west(title_2, draw(move|to: &mut Tui|{
@ -532,7 +532,7 @@ pub trait TracksView: HasTracks + ScenesView + HasMidiIns + HasMidiOuts + HasTra
h as u16
}
fn view_outputs (&self, theme: ItemTheme) -> impl Draw<Tui> {
fn view_outputs (&self, theme: ItemTheme) -> impl Draw<'_, Tui> {
let height = self.outputs_height();
let list = south(
button_3(
@ -630,12 +630,12 @@ impl HasTrackScroll for App {
}
}
fn view_track_row_section (
fn view_track_row_section <'a> (
_theme: ItemTheme,
button: impl Draw<Tui>,
button_add: impl Draw<Tui>,
content: impl Draw<Tui>,
) -> impl Draw<Tui> {
button: impl Draw<'a, Tui>,
button_add: impl Draw<'a, Tui>,
content: impl Draw<'a, Tui>,
) -> impl Draw<'a, Tui> {
west(
button_add.align_nw().exact_w(4).full_h(),
east(