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

per-port routing; enter/exit fullscreen editor

Browse source
This commit is contained in:
🪞👃🪞 2025-05-17 20:08:29 +03:00
parent f938ade839
commit 3e748fefa7
7 changed files with 79 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

27
crates/device/src/arranger/arranger_api.rs
View file

@ -13,6 +13,33 @@ impl Arrangement {
#[tengri_proc::command(Arrangement)]
impl ArrangementCommand {
fn home (arranger: &mut Arrangement) -> Perhaps<Self> {
arranger.editor = None;
Ok(None)
}
fn edit (arranger: &mut Arrangement) -> Perhaps<Self> {
let selection = arranger.selection().clone();
arranger.editor = if arranger.editor.is_some() {
None
} else {
match selection {
Selection::TrackClip { track, scene } => {
let clip = &mut arranger.scenes_mut()[scene].clips[track];
if clip.is_none() {
//app.clip_auto_create();
*clip = Some(Arc::new(RwLock::new(MidiClip::new(
"", false, 384, None, Some(ItemTheme::random())
))));
}
clip.as_ref().map(|c|c.into())
}
_ => {
None
}
}
};
Ok(None)
}
/// Set the selection
fn select (arranger: &mut Arrangement, s: Selection) -> Perhaps<Self> {
*arranger.selection_mut() = s;

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

@ -20,18 +20,20 @@ impl Arrangement {
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() {
add(&Fixed::xy(self.track_width(index, track), h,
Align::nw(Bsp::s(
Tui::bg(track.color.base.rgb,
Fill::x(Align::w(row!(
add(&Fixed::x(self.track_width(index, track),
Stack::south(move|add: &mut dyn FnMut(&dyn Render<TuiOut>)|{
let index = 0;
add(&Fixed::y(1, track.sequencer.midi_ins.get(0).map(|port|
Tui::fg_bg(Rgb(255, 255, 255), track.color.base.rgb,
Fill::x(Align::w(format!("·i{index:02} {}", port.name())))))));
for (index, port) in self.midi_ins().iter().enumerate() {
add(&Fixed::y(1, Align::w(row!(
Either(track.sequencer.monitoring, Tui::fg(Green, "●mon "), "·mon "),
Either(track.sequencer.recording, Tui::fg(Red, "●rec "), "·rec "),
Either(track.sequencer.overdub, Tui::fg(Yellow, "●dub "), "·dub "),
)))),
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!("·i{index:02} {}", port.name())))))))));
}})))))
Either(track.sequencer.recording, Tui::fg(Red, "●rec "), "·rec "),
Either(track.sequencer.overdub, Tui::fg(Yellow, "●dub "), "·dub "),
))));
}
})))}})))))
}
pub fn view_outputs <'a> (&'a self, theme: ItemTheme) -> impl Content<TuiOut> + 'a {
let mut h = 1u16;
@ -53,10 +55,18 @@ impl Arrangement {
Stack::east(move|add: &mut dyn FnMut(&dyn Render<TuiOut>)|{
for (index, track, x1, x2) in self.tracks_with_sizes() {
add(&Fixed::x(self.track_width(index, track),
Align::nw(Fill::y(Map::south(1, ||track.sequencer.midi_outs.iter(),
|port, index|Tui::fg(Rgb(255, 255, 255),
Fixed::y(1, Tui::bg(track.color.dark.rgb, Fill::x(Align::w(
format!("·o{index:02} {}", port.name())))))))))));
Stack::south(move|add: &mut dyn FnMut(&dyn Render<TuiOut>)|{
let index = 0;
add(&Fixed::y(1, track.sequencer.midi_outs.get(0).map(|port|
Tui::fg_bg(Rgb(255, 255, 255), track.color.base.rgb,
Fill::x(Align::w(format!("·o{index:02} {}", port.name())))))));
for (index, port) in self.midi_outs().iter().enumerate() {
add(&Fixed::y(1, Align::w(Bsp::e(
Either(true, Tui::fg(Green, "●play "), "·play "),
Either(false, Tui::fg(Yellow, "●solo "), "·solo "),
))));
}
})));
}
})))))
}
@ -110,7 +120,7 @@ pub trait TracksView:
let active_track = self.selection().track();
let mut x = 0;
self.tracks().iter().enumerate().map_while(move |(index, track)|{
let width = active_track.and_then(|_|editor_width).unwrap_or(track.width.max(8));
let width = track.width.max(8);
if x + width < self.clips_size().w() {
let data = (index, track, x, x + width);
x += width + Self::TRACK_SPACING;
@ -143,7 +153,11 @@ pub trait TracksView:
fn view_track_names (&self, theme: ItemTheme) -> impl Content<TuiOut> {
self.view_track_row_section(
theme,
button_2("t", "rack ", false),
button_3("t", "rack ", if let Some(track) = self.selection().track() {
format!("{track}/{}", self.tracks().len())
} else {
format!("{}", self.tracks().len())
}, false),
button_2("T", "+", false),
Tui::bg(theme.darker.rgb, Fixed::y(2, Fill::x(
Stack::east(move|add: &mut dyn FnMut(&dyn Render<TuiOut>)|{
@ -156,11 +170,7 @@ pub trait TracksView:
}, Bsp::s(Fill::x(Align::nw(Bsp::e(
format!("·t{index:02} "),
Tui::fg(Rgb(255, 255, 255), Tui::bold(true, &track.name))
))), Tui::bg(if self.selection().track() == Some(index) {
track.color.light.rgb
} else {
track.color.base.rgb
}, Fill::x(Align::w(format!("·mute ·solo"))))))));
))), ""))) );
}
})))))
}
@ -179,9 +189,9 @@ pub trait TracksView:
for (index, track, x1, x2) in self.tracks_with_sizes() {
add(&Fixed::x(self.track_width(index, track),
Align::nw(Fill::y(Map::south(1, ||track.sequencer.midi_outs.iter(),
|port, index|Tui::fg(Rgb(255, 255, 255),
Fixed::y(1, Tui::bg(track.color.dark.rgb, Fill::x(Align::w(
format!("·o{index:02} {}", port.name())))))))))));
|port, index|Tui::fg(Rgb(255, 255, 255),
Fixed::y(1, Tui::bg(track.color.dark.rgb, Fill::x(Align::w(
format!("·o{index:02} {}", port.name())))))))))));
}
})))))
}
@ -239,7 +249,7 @@ pub trait ScenesView:
fn scenes_with_sizes (&self) -> impl ScenesSizes<'_> {
let editing = self.editor().is_some();
let height = Self::H_SCENE;
let larger = self.editor().map(|e|e.height()).unwrap_or(Self::H_SCENE);
let larger = 8;//FIXME//self.editor().map(|e|e.height()).unwrap_or(Self::H_SCENE);
let selected_track = self.selection().track();
let selected_scene = self.selection().scene();
let mut y = 0;