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

switch around ownership of pool and editort

Browse source
This commit is contained in:
🪞👃🪞 2025-05-17 13:23:31 +03:00
parent 3f1a2fee80
commit c7e7c9f68c
8 changed files with 157 additions and 150 deletions
Download patch file Download diff file Expand all files Collapse all files

35
crates/device/src/arranger/arranger_model.rs
View file

@ -10,6 +10,8 @@ pub struct Arrangement {
pub jack: Jack,
/// Source of time
pub clock: Clock,
/// Allows one MIDI clip to be edited
pub editor: Option<MidiEditor>,
/// List of global midi inputs
pub midi_ins: Vec<JackMidiIn>,
/// List of global midi outputs
@ -35,18 +37,17 @@ pub struct Arrangement {
pub arranger: Arc<RwLock<Buffer>>,
/// Display size
pub size: Measure<TuiOut>,
/// Contains all clips in arrangement
pub pool: Pool,
}
has!(Jack: |self: Arrangement|self.jack);
has!(Clock: |self: Arrangement|self.clock);
has!(Selection: |self: Arrangement|self.selection);
has!(Vec<JackMidiIn>: |self: Arrangement|self.midi_ins);
has!(Vec<JackMidiOut>: |self: Arrangement|self.midi_outs);
has!(Vec<Scene>: |self: Arrangement|self.scenes);
has!(Vec<Track>: |self: Arrangement|self.tracks);
has!(Measure<TuiOut>: |self: Arrangement|self.size);
has!(Jack: |self: Arrangement|self.jack);
has!(Clock: |self: Arrangement|self.clock);
has!(Selection: |self: Arrangement|self.selection);
has!(Vec<JackMidiIn>: |self: Arrangement|self.midi_ins);
has!(Vec<JackMidiOut>: |self: Arrangement|self.midi_outs);
has!(Vec<Scene>: |self: Arrangement|self.scenes);
has!(Vec<Track>: |self: Arrangement|self.tracks);
has!(Measure<TuiOut>: |self: Arrangement|self.size);
has!(Option<MidiEditor>: |self: Arrangement|self.editor);
maybe_has!(Track: |self: Arrangement|
{ Has::<Selection>::get(self).track().map(|index|Has::<Vec<Track>>::get(self).get(index)).flatten() };
{ Has::<Selection>::get(self).track().map(|index|Has::<Vec<Track>>::get_mut(self).get_mut(index)).flatten() });
@ -215,19 +216,13 @@ impl ScenesView for Arrangement {
fn arrangement (&self) -> &Arrangement {
self
}
fn scenes_height (&self) -> u16 {
fn h_scenes (&self) -> u16 {
(self.height() as u16).saturating_sub(20)
}
fn width_side (&self) -> u16 {
fn w_side (&self) -> u16 {
(self.width() as u16 * 2 / 10).max(20)
}
fn width_mid (&self) -> u16 {
(self.width() as u16).saturating_sub(2 * self.width_side()).max(40)
}
fn scene_selected (&self) -> Option<usize> {
self.selection().scene()
}
fn track_selected (&self) -> Option<usize> {
self.selection().track()
fn w_mid (&self) -> u16 {
(self.width() as u16).saturating_sub(2 * self.w_side()).max(40)
}
}

105
crates/device/src/arranger/arranger_view.rs
View file

@ -9,7 +9,7 @@ impl Content<TuiOut> for Arrangement {
let bg = |x|Tui::bg(Reset, x);
//let track_scroll = |x|Bsp::s(&self.track_scroll, x);
//let scene_scroll = |x|Bsp::e(&self.scene_scroll, x);
self.size.of(outs(tracks(devices(ins(bg(self.view_scenes_clips(&None)))))))
self.size.of(outs(tracks(devices(ins(bg(self.view_scenes_clips()))))))
}
}
@ -34,7 +34,7 @@ impl Arrangement {
let mon = track.sequencer.monitoring;
let rec = if rec { White } else { track.color.darkest.rgb };
let mon = if mon { White } else { track.color.darkest.rgb };
let bg = if self.track_selected() == Some(t) {
let bg = if self.arrangement().selection().track() == Some(t) {
track.color.light.rgb
} else {
track.color.base.rgb
@ -48,18 +48,18 @@ impl Arrangement {
}
fn view_input_routes (&self) -> impl Content<TuiOut> + '_ {
Tryptich::top(self.h_inputs())
.left(self.width_side(),
.left(self.w_side(),
io_ports(Tui::g(224), Tui::g(32), ||self.midi_ins_with_sizes()))
.middle(self.width_mid(),
.middle(self.w_mid(),
per_track_top(||self.tracks_with_sizes_scrolled(),
move|_, &Track { color, .. }|io_conns(
color.dark.rgb, color.darker.rgb, ||self.midi_ins_with_sizes())))
}
fn view_input_intos (&self) -> impl Content<TuiOut> + '_ {
Tryptich::top(2)
.left(self.width_side(),
.left(self.w_side(),
Bsp::s(Align::e("Input:"), Align::e("Into clip:")))
.middle(self.width_mid(),
.middle(self.w_mid(),
per_track_top(||self.tracks_with_sizes_scrolled(),
|_, _|Tui::bg(Reset, Align::c(Bsp::s(OctaveVertical::default(), " ------ ")))))
}
@ -72,9 +72,9 @@ impl Arrangement {
}
fn view_output_ports (&self) -> impl Content<TuiOut> + '_ {
Tryptich::top(1)
.left(self.width_side(), self.view_output_count())
.right(self.width_side(), self.view_output_add())
.middle(self.width_mid(), self.view_output_map())
.left(self.w_side(), self.view_output_count())
.right(self.w_side(), self.view_output_add())
.middle(self.w_mid(), self.view_output_map())
}
fn view_output_count (&self) -> impl Content<TuiOut> {
button_3(
@ -93,7 +93,7 @@ impl Arrangement {
let solo = false;
let mute = if mute { White } else { t.color.darkest.rgb };
let solo = if solo { White } else { t.color.darkest.rgb };
let bg_1 = if self.track_selected() == Some(i) {
let bg_1 = if self.arrangement().selection().track() == Some(i) {
t.color.light.rgb
} else {
t.color.base.rgb
@ -106,9 +106,9 @@ impl Arrangement {
}
fn view_output_conns (&self) -> impl Content<TuiOut> + '_ {
Tryptich::top(self.h_outputs())
.left(self.width_side(), io_ports(
.left(self.w_side(), io_ports(
Tui::g(224), Tui::g(32), ||self.midi_outs_with_sizes()))
.middle(self.width_mid(), per_track_top(||self.tracks_with_sizes_scrolled(),
.middle(self.w_mid(), per_track_top(||self.tracks_with_sizes_scrolled(),
|_, t|io_conns(
t.color.dark.rgb,
t.color.darker.rgb,
@ -116,14 +116,14 @@ impl Arrangement {
)))
}
fn view_output_nexts (&self) -> impl Content<TuiOut> + '_ {
Tryptich::top(2).left(self.width_side(), Align::ne("From clip:"))
.middle(self.width_mid(), per_track_top(||self.tracks_with_sizes_scrolled(),
Tryptich::top(2).left(self.w_side(), Align::ne("From clip:"))
.middle(self.w_mid(), per_track_top(||self.tracks_with_sizes_scrolled(),
|_, _|Tui::bg(Reset, Align::c(Bsp::s(" ------ ", OctaveVertical::default())))))
}
fn view_output_froms (&self) -> impl Content<TuiOut> + '_ {
let label = Align::ne("Next clip:");
Tryptich::top(2).left(self.width_side(), label)
.middle(self.width_mid(), per_track_top(
Tryptich::top(2).left(self.w_side(), label)
.middle(self.w_mid(), per_track_top(
||self.tracks_with_sizes_scrolled(), |t, track|{
let queued = track.sequencer.next_clip.is_some();
let queued_blank = Thunk::new(||Tui::bg(Reset, " ------ "));
@ -143,15 +143,15 @@ impl Arrangement {
}
/// Render track headers
fn view_tracks_0 (&self) -> impl Content<TuiOut> + '_ {
let width_side = self.width_side();
let width_mid = self.width_mid();
let w_side = self.w_side();
let w_mid = self.w_mid();
let is_editing = false; // FIXME
let track_selected = self.track_selected();
let track_selected = self.arrangement().selection().track();
Tryptich::center(3)
.left(width_side,
.left(w_side,
button_3("t", "track", format!("{}", self.tracks().len()), is_editing))
.right(width_side, button_2("T", "add track", is_editing))
.middle(width_mid, per_track(||self.tracks_with_sizes_scrolled(),
.right(w_side, button_2("T", "add track", is_editing))
.middle(w_mid, per_track(||self.tracks_with_sizes_scrolled(),
move|index, track|wrap(
if track_selected == Some(index) {
track.color.light
@ -164,14 +164,14 @@ impl Arrangement {
}
/// Render device switches.
fn view_devices_0 (&self) -> impl Content<TuiOut> + '_ {
let width_side = self.width_side();
let width_mid = self.width_mid();
let w_side = self.w_side();
let w_mid = self.w_mid();
let is_editing = false; // FIXME
let track_selected = self.track_selected();
let track_selected = self.arrangement().selection().track();
Tryptich::top(1)
.left(width_side, button_3("d", "devices", format!("{}", 0), is_editing))
.right(width_side, button_2("D", "add device", is_editing))
.middle(width_mid, per_track_top(||self.tracks_with_sizes_scrolled(),
.left(w_side, button_3("d", "devices", format!("{}", 0), is_editing))
.right(w_side, button_2("D", "add device", is_editing))
.middle(w_mid, per_track_top(||self.tracks_with_sizes_scrolled(),
move|index, track|{
let bg = if track_selected == Some(index) {
track.color.light
@ -185,12 +185,13 @@ impl Arrangement {
}
impl<T> TracksView for T
where T: HasSize<TuiOut> + HasTrackScroll + HasSelection + HasMidiIns {}
where T: HasSize<TuiOut> + HasTrackScroll + HasSelection + HasMidiIns + HasEditor {}
impl ClipsView for Arrangement {}
pub trait TracksView: HasSize<TuiOut> + HasTrackScroll + HasSelection + HasMidiIns {
fn is_editing (&self) -> bool { false }
pub trait TracksView:
HasSize<TuiOut> + HasTrackScroll + HasSelection + HasMidiIns + HasEditor
{
fn tracks_width_available (&self) -> u16 {
(self.width() as u16).saturating_sub(40)
}
@ -230,19 +231,23 @@ pub trait TracksView: HasSize<TuiOut> + HasTrackScroll + HasSelection + HasMidiI
for track in self.tracks().iter() {
max_outputs = max_outputs.max(track.sequencer.midi_outs.len() as u16);
}
let content = Align::w(Fixed::y(max_outputs + 1,
let content = Align::w(Fixed::y(1 + max_outputs*2,
Tui::bg(theme.darker.rgb, Align::w(Fill::x(
Stack::east(move|add: &mut dyn FnMut(&dyn Render<TuiOut>)|{
for (index, track, x1, x2) in self
.tracks_with_sizes(&self.selection(), None)
.skip(self.track_scroll())
{
(add)(&Fixed::x(track.width as u16, Align::nw(Bsp::s(
Tui::bg(track.color.base.rgb, Fill::x(Align::w(format!("[mut] [sol]")))),
Map::south(1, ||track.sequencer.midi_outs.iter(),
add(&Fixed::x(track.width as u16, Align::nw(Bsp::s(
Tui::bg(if self.selection().track() == Some(index) {
track.color.light.rgb
} else {
track.color.base.rgb
}, Fill::x(Align::w(format!("[mut] [sol]")))),
Map::south(2, ||track.sequencer.midi_outs.iter(),
|port, index|Tui::fg(Rgb(255, 255, 255),
Tui::bg(track.color.dark.rgb, Fill::x(Align::w(
format!("{index}: {}", port.name()))))))))));
Fixed::y(2, Tui::bg(track.color.dark.rgb, Fill::x(Align::w(
format!("o{index}: {}", port.name())))))))))));
}
}))))));
Bsp::w(
@ -270,7 +275,7 @@ pub trait TracksView: HasSize<TuiOut> + HasTrackScroll + HasSelection + HasMidiI
Fill::x(Align::w(format!("[rec] [mon]")))),
Map::south(1, ||track.sequencer.midi_ins.iter(),
|port, index|Tui::fg_bg(Rgb(255, 255, 255), track.color.dark.rgb,
Fill::x(Align::w(format!("{index}: {}", port.name())))))))));
Fill::x(Align::w(format!("i{index}: {}", port.name())))))))));
}
}))));
@ -300,28 +305,26 @@ pub trait TracksView: HasSize<TuiOut> + HasTrackScroll + HasSelection + HasMidiI
{
add(&Fixed::xy(track.width as u16, h + 1,
Tui::bg(track.color.dark.rgb, Align::nw(Map::south(1, move||0..h,
|_, index|format!("{index}: {}", "--------"))))));
|_, index|format!("d{index}: {}", "--------"))))));
}
}))))))
}
fn view_track_header <'a, T: Content<TuiOut>> (
&'a self, theme: ItemTheme, content: T
) -> impl Content<TuiOut> {
Fixed::x(20, Tui::bg(theme.darker.rgb, Fill::x(Align::e(content))))
Fixed::x(12, Tui::bg(theme.darker.rgb, Fill::x(Align::e(content))))
}
}
pub trait ScenesView: HasSelection + HasSceneScroll + Send + Sync {
/// Default scene height.
const H_SCENE: usize = 2;
const H_SCENE: usize = 2;
/// Default editor height.
const H_EDITOR: usize = 15;
fn arrangement (&self) -> &Arrangement;
fn scene_selected (&self) -> Option<usize>;
fn track_selected (&self) -> Option<usize>;
fn scenes_height (&self) -> u16;
fn width_side (&self) -> u16;
fn width_mid (&self) -> u16;
fn arrangement (&self) -> &Arrangement;
fn h_scenes (&self) -> u16;
fn w_side (&self) -> u16;
fn w_mid (&self) -> u16;
fn view_scenes_names (&self) -> impl Content<TuiOut> {
Stack::south(move|add: &mut dyn FnMut(&dyn Render<TuiOut>)|{
for (index, scene) in self.scenes().iter().enumerate().skip(self.scene_scroll()) {
@ -338,7 +341,7 @@ pub trait ScenesView: HasSelection + HasSceneScroll + Send + Sync {
format!(" {index:2} "),
Tui::fg(Rgb(255, 255, 255),
Tui::bold(true, format!("{}", scene.name)))))))
//let height = (1 + y2 - y1) as u16;
//let height = (1 + y2 - y1 as u16;
//let name = Some(scene.name.clone());
//let content = Fill::x(Align::w(Tui::bold(true, Bsp::e(" ⯈ ", name))));
//let selected = self.scene_selected() == Some(s);
@ -387,11 +390,11 @@ pub trait ScenesView: HasSelection + HasSceneScroll + Send + Sync {
false, // FIXME self.is_editing(),
Self::H_SCENE, Self::H_EDITOR,
selection.track(), selection.scene(),
).map_while(|(s, scene, y1, y2)|(y2<=self.scenes_height() as usize)
).map_while(|(s, scene, y1, y2)|(y2<=self.h_scenes() as usize)
.then_some((s, scene, y1, y2)))
}
/// Height required to display all scenes.
fn scenes_height_total (&self, is_editing: bool) -> u16 {
fn h_scenes_total (&self, is_editing: bool) -> u16 {
self.scenes_with_sizes(
is_editing,
Self::H_SCENE,
@ -405,7 +408,7 @@ pub trait ScenesView: HasSelection + HasSceneScroll + Send + Sync {
}
pub trait ClipsView: TracksView + ScenesView + Send + Sync {
fn view_scenes_clips <'a> (&'a self, editor: &'a Option<MidiEditor>)
fn view_scenes_clips <'a> (&'a self)
-> impl Content<TuiOut> + 'a
{
Fill::xy(Stack::<TuiOut, _>::east(move|column: &mut dyn FnMut(&dyn Render<TuiOut>)|{

24
crates/device/src/editor/editor_model.rs
View file

@ -103,12 +103,24 @@ impl MidiViewer for MidiEditor {
fn set_clip (&mut self, p: Option<&Arc<RwLock<MidiClip>>>) { self.mode.set_clip(p) }
}
pub trait HasEditor {
fn editor (&self) -> Option<&MidiEditor>;
fn editor_mut (&mut self) -> Option<&mut MidiEditor>;
fn is_editing (&self) -> bool { self.editor().is_some() }
fn editor_w (&self) -> usize { 0 }
fn editor_h (&self) -> usize { 0 }
impl<T: Has<Option<MidiEditor>>> HasEditor for T {}
pub trait HasEditor: Has<Option<MidiEditor>> {
fn editor (&self) -> Option<&MidiEditor> {
self.get().as_ref()
}
fn editor_mut (&mut self) -> Option<&mut MidiEditor> {
self.get_mut().as_mut()
}
fn is_editing (&self) -> bool {
self.editor().is_some()
}
fn editor_w (&self) -> usize {
self.editor().map(|e|e.size.w()).unwrap_or(0)
}
fn editor_h (&self) -> usize {
self.editor().map(|e|e.size.h()).unwrap_or(0)
}
}
#[macro_export] macro_rules! has_editor {