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

wip: view builtins remain a problem

Browse source
This commit is contained in:
🪞👃🪞 2025-05-21 02:51:11 +03:00
parent 0192d85a19
commit e81955890c
4 changed files with 182 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

3
crates/app/src/model.rs
View file

@ -158,6 +158,9 @@ impl App {
#[tengri_proc::expose] #[tengri_proc::expose]
impl App { impl App {
fn _todo_bool_stub (&self) -> bool {
todo!()
}
fn _todo_isize_stub (&self) -> isize { fn _todo_isize_stub (&self) -> isize {
todo!() todo!()
} }

295
crates/app/src/view.rs
View file

@ -33,18 +33,23 @@ impl App {
#[tengri_proc::view(TuiOut)] #[tengri_proc::view(TuiOut)]
impl App { impl App {
pub fn view_nil (&self) -> impl Content<TuiOut> + use<'_> { pub fn view_nil (app: &Self) -> impl Content<TuiOut> {
"nil" "nil"
} }
pub fn view_history (&self) -> impl Content<TuiOut> { pub fn view_history (app: &Self) -> impl Content<TuiOut> {
Fixed::y(1, Fill::x(Align::w(FieldH(self.color, Fixed::y(1, Fill::x(Align::w(FieldH(app.color,
format!("History ({})", self.history.len()), format!("History ({})", app.history.len()),
self.history.last().map(|last|Fill::x(Align::w(format!("{:?}", last.0)))))))) app.history.last().map(|last|Fill::x(Align::w(format!("{:?}", last.0))))))))
} }
pub fn view_status_h2 (&self) -> impl Content<TuiOut> + use<'_> { pub fn view_status_h2 (app: &Self) -> impl Content<TuiOut> {
self.update_clock(); app.update_clock();
let theme = self.color; let theme = app.color;
let playing = self.clock().is_rolling(); let clock = app.clock();
let playing = clock.is_rolling();
let cache = clock.view_cache.clone();
//let selection = app.selection().describe(app.tracks(), app.scenes());
let hist_len = app.history.len();
let hist_last = app.history.last();
Fixed::y(2, Stack::east(move|add: &mut dyn FnMut(&dyn Render<TuiOut>)|{ Fixed::y(2, Stack::east(move|add: &mut dyn FnMut(&dyn Render<TuiOut>)|{
add(&Fixed::x(5, Tui::bg(if playing { Rgb(0, 128, 0) } else { Rgb(128, 64, 0) }, add(&Fixed::x(5, Tui::bg(if playing { Rgb(0, 128, 0) } else { Rgb(128, 64, 0) },
Either::new(false, // TODO Either::new(false, // TODO
@ -60,7 +65,7 @@ impl App {
))); )));
add(&" "); add(&" ");
{ {
let cache = self.project.clock.view_cache.read().unwrap(); let cache = cache.read().unwrap();
add(&Fixed::x(15, Align::w(Bsp::s( add(&Fixed::x(15, Align::w(Bsp::s(
FieldH(theme, "Beat", cache.beat.view.clone()), FieldH(theme, "Beat", cache.beat.view.clone()),
FieldH(theme, "Time", cache.time.view.clone()), FieldH(theme, "Time", cache.time.view.clone()),
@ -73,145 +78,143 @@ impl App {
Fill::x(Align::w(FieldH(theme, "Buf", cache.buf.view.clone()))), Fill::x(Align::w(FieldH(theme, "Buf", cache.buf.view.clone()))),
Fill::x(Align::w(FieldH(theme, "Lat", cache.lat.view.clone()))), Fill::x(Align::w(FieldH(theme, "Lat", cache.lat.view.clone()))),
)))); ))));
add(&Bsp::s( //add(&Bsp::s(
Fill::x(Align::w(FieldH(theme, "Selected", Align::w(self.selection().describe( ////Fill::x(Align::w(FieldH(theme, "Selected", Align::w(selection)))),
self.tracks(), //Fill::x(Align::w(FieldH(theme, format!("History ({})", hist_len),
self.scenes() //hist_last.map(|last|Fill::x(Align::w(format!("{:?}", last.0))))))),
))))), //""
Fill::x(Align::w(FieldH(theme, format!("History ({})", self.history.len()), //));
self.history.last().map(|last|Fill::x(Align::w(format!("{:?}", last.0))))))) ////if let Some(last) = app.history.last() {
)); ////add(&FieldV(theme, format!("History ({})", app.history.len()),
//if let Some(last) = self.history.last() { ////Fill::x(Align::w(format!("{:?}", last.0)))));
//add(&FieldV(theme, format!("History ({})", self.history.len()), ////}
//Fill::x(Align::w(format!("{:?}", last.0)))));
//}
} }
})) }))
} }
pub fn view_status_v (&self) -> impl Content<TuiOut> + use<'_> { //pub fn view_status_v (&self) -> impl Content<TuiOut> + use<'_> {
self.update_clock(); //self.update_clock();
let cache = self.project.clock.view_cache.read().unwrap(); //let cache = self.project.clock.view_cache.read().unwrap();
let theme = self.color; //let theme = self.color;
let playing = self.clock().is_rolling(); //let playing = self.clock().is_rolling();
Tui::bg(theme.darker.rgb, Fixed::xy(20, 5, Outer(true, Style::default().fg(Tui::g(96))).enclose( //Tui::bg(theme.darker.rgb, Fixed::xy(20, 5, Outer(true, Style::default().fg(Tui::g(96))).enclose(
col!( //col!(
Fill::x(Align::w(Bsp::e( //Fill::x(Align::w(Bsp::e(
Align::w(Tui::bg(if playing { Rgb(0, 128, 0) } else { Rgb(128, 64, 0) }, //Align::w(Tui::bg(if playing { Rgb(0, 128, 0) } else { Rgb(128, 64, 0) },
Either::new(false, // TODO //Either::new(false, // TODO
Thunk::new(move||Fixed::x(9, Either::new(playing, //Thunk::new(move||Fixed::x(9, Either::new(playing,
Tui::fg(Rgb(0, 255, 0), " PLAYING "), //Tui::fg(Rgb(0, 255, 0), " PLAYING "),
Tui::fg(Rgb(255, 128, 0), " STOPPED "))) //Tui::fg(Rgb(255, 128, 0), " STOPPED ")))
), //),
Thunk::new(move||Fixed::x(5, Either::new(playing, //Thunk::new(move||Fixed::x(5, Either::new(playing,
Tui::fg(Rgb(0, 255, 0), Bsp::s(" 🭍🭑🬽 ", " 🭞🭜🭘 ",)), //Tui::fg(Rgb(0, 255, 0), Bsp::s(" 🭍🭑🬽 ", " 🭞🭜🭘 ",)),
Tui::fg(Rgb(255, 128, 0), Bsp::s(" ▗▄▖ ", " ▝▀▘ ",)))) //Tui::fg(Rgb(255, 128, 0), Bsp::s(" ▗▄▖ ", " ▝▀▘ ",))))
) //)
) //)
)), //)),
Bsp::s( //Bsp::s(
FieldH(theme, "Beat", cache.beat.view.clone()), //FieldH(theme, "Beat", cache.beat.view.clone()),
FieldH(theme, "Time", cache.time.view.clone()), //FieldH(theme, "Time", cache.time.view.clone()),
), //),
))), //))),
Fill::x(Align::w(FieldH(theme, "BPM", cache.bpm.view.clone()))), //Fill::x(Align::w(FieldH(theme, "BPM", cache.bpm.view.clone()))),
Fill::x(Align::w(FieldH(theme, "SR ", cache.sr.view.clone()))), //Fill::x(Align::w(FieldH(theme, "SR ", cache.sr.view.clone()))),
Fill::x(Align::w(FieldH(theme, "Buf", Bsp::e(cache.buf.view.clone(), Bsp::e(" = ", cache.lat.view.clone()))))), //Fill::x(Align::w(FieldH(theme, "Buf", Bsp::e(cache.buf.view.clone(), Bsp::e(" = ", cache.lat.view.clone()))))),
)))) //))))
} //}
pub fn view_status (&self) -> impl Content<TuiOut> + use<'_> { //pub fn view_status (&self) -> impl Content<TuiOut> + use<'_> {
self.update_clock(); //self.update_clock();
let cache = self.project.clock.view_cache.read().unwrap(); //let cache = self.project.clock.view_cache.read().unwrap();
view_status(Some(self.project.selection.describe(self.tracks(), self.scenes())), //view_status(Some(self.project.selection.describe(self.tracks(), self.scenes())),
cache.sr.view.clone(), cache.buf.view.clone(), cache.lat.view.clone()) //cache.sr.view.clone(), cache.buf.view.clone(), cache.lat.view.clone())
} //}
pub fn view_transport (&self) -> impl Content<TuiOut> + use<'_> { //pub fn view_transport (&self) -> impl Content<TuiOut> + use<'_> {
self.update_clock(); //self.update_clock();
let cache = self.project.clock.view_cache.read().unwrap(); //let cache = self.project.clock.view_cache.read().unwrap();
view_transport(self.project.clock.is_rolling(), //view_transport(self.project.clock.is_rolling(),
cache.bpm.view.clone(), cache.beat.view.clone(), cache.time.view.clone()) //cache.bpm.view.clone(), cache.beat.view.clone(), cache.time.view.clone())
} //}
pub fn view_editor (&self) -> impl Content<TuiOut> + use<'_> { //pub fn view_editor (&self) -> impl Content<TuiOut> + use<'_> {
let bg = self.editor() //let bg = self.editor()
.and_then(|editor|editor.clip().clone()) //.and_then(|editor|editor.clip().clone())
.map(|clip|clip.read().unwrap().color.darker) //.map(|clip|clip.read().unwrap().color.darker)
.unwrap_or(self.color.darker); //.unwrap_or(self.color.darker);
Fill::xy(Tui::bg(bg.rgb, self.editor())) //Fill::xy(Tui::bg(bg.rgb, self.editor()))
} //}
pub fn view_editor_status (&self) -> impl Content<TuiOut> + use<'_> { //pub fn view_editor_status (&self) -> impl Content<TuiOut> + use<'_> {
self.editor().map(|e|Fixed::x(20, Outer(true, Style::default().fg(Tui::g(96))).enclose( //self.editor().map(|e|Fixed::x(20, Outer(true, Style::default().fg(Tui::g(96))).enclose(
Fill::y(Align::n(Bsp::s(e.clip_status(), e.edit_status())))))) //Fill::y(Align::n(Bsp::s(e.clip_status(), e.edit_status()))))))
} //}
pub fn view_midi_ins_status (&self) -> impl Content<TuiOut> + use<'_> { //pub fn view_midi_ins_status (&self) -> impl Content<TuiOut> + use<'_> {
self.project.view_midi_ins_status(self.color) //self.project.view_midi_ins_status(self.color)
} //}
pub fn view_midi_outs_status (&self) -> impl Content<TuiOut> + use<'_> { //pub fn view_midi_outs_status (&self) -> impl Content<TuiOut> + use<'_> {
self.project.view_midi_outs_status(self.color) //self.project.view_midi_outs_status(self.color)
} //}
pub fn view_audio_ins_status (&self) -> impl Content<TuiOut> + use<'_> { //pub fn view_audio_ins_status (&self) -> impl Content<TuiOut> + use<'_> {
self.project.view_audio_ins_status(self.color) //self.project.view_audio_ins_status(self.color)
} //}
pub fn view_audio_outs_status (&self) -> impl Content<TuiOut> + use<'_> { //pub fn view_audio_outs_status (&self) -> impl Content<TuiOut> + use<'_> {
self.project.view_audio_outs_status(self.color) //self.project.view_audio_outs_status(self.color)
} //}
pub fn view_scenes (&self) -> impl Content<TuiOut> + use<'_> { //pub fn view_scenes (&self) -> impl Content<TuiOut> + use<'_> {
Bsp::e( //Bsp::e(
Fixed::x(20, Align::nw(self.project.view_scenes_names())), //Fixed::x(20, Align::nw(self.project.view_scenes_names())),
self.project.view_scenes_clips(), //self.project.view_scenes_clips(),
) //)
} //}
pub fn view_scenes_names (&self) -> impl Content<TuiOut> + use<'_> { //pub fn view_scenes_names (&self) -> impl Content<TuiOut> + use<'_> {
self.project.view_scenes_names() //self.project.view_scenes_names()
} //}
pub fn view_scenes_clips (&self) -> impl Content<TuiOut> + use<'_> { //pub fn view_scenes_clips (&self) -> impl Content<TuiOut> + use<'_> {
self.project.view_scenes_clips() //self.project.view_scenes_clips()
} //}
pub fn view_tracks_inputs <'a> (&'a self) -> impl Content<TuiOut> + use<'a> { //pub fn view_tracks_inputs <'a> (&'a self) -> impl Content<TuiOut> + use<'a> {
Fixed::y(1 + self.project.midi_ins.len() as u16, //Fixed::y(1 + self.project.midi_ins.len() as u16,
self.project.view_inputs(self.color)) //self.project.view_inputs(self.color))
} //}
pub fn view_tracks_outputs <'a> (&'a self) -> impl Content<TuiOut> + use<'a> { //pub fn view_tracks_outputs <'a> (&'a self) -> impl Content<TuiOut> + use<'a> {
self.project.view_outputs(self.color) //self.project.view_outputs(self.color)
} //}
pub fn view_tracks_devices <'a> (&'a self) -> impl Content<TuiOut> + use<'a> { //pub fn view_tracks_devices <'a> (&'a self) -> impl Content<TuiOut> + use<'a> {
Fixed::y(4, self.project.view_track_devices(self.color)) //Fixed::y(4, self.project.view_track_devices(self.color))
} //}
pub fn view_tracks_names <'a> (&'a self) -> impl Content<TuiOut> + use<'a> { //pub fn view_tracks_names <'a> (&'a self) -> impl Content<TuiOut> + use<'a> {
Fixed::y(2, self.project.view_track_names(self.color)) //Fixed::y(2, self.project.view_track_names(self.color))
} //}
pub fn view_pool (&self) -> impl Content<TuiOut> + use<'_> { //pub fn view_pool (&self) -> impl Content<TuiOut> + use<'_> {
Fixed::x(20, Bsp::s( //Fixed::x(20, Bsp::s(
Fill::x(Align::w(FieldH(self.color, "Clip pool:", ""))), //Fill::x(Align::w(FieldH(self.color, "Clip pool:", ""))),
Fill::y(Align::n(Tui::bg(Rgb(0, 0, 0), Outer(true, Style::default().fg(Tui::g(96))) //Fill::y(Align::n(Tui::bg(Rgb(0, 0, 0), Outer(true, Style::default().fg(Tui::g(96)))
.enclose(PoolView(&self.pool))))))) //.enclose(PoolView(&self.pool)))))))
} //}
pub fn view_samples_keys (&self) -> impl Content<TuiOut> + use<'_> { //pub fn view_samples_keys (&self) -> impl Content<TuiOut> + use<'_> {
self.project.sampler().map(|s|s.view_list(true, self.editor().unwrap())) //self.project.sampler().map(|s|s.view_list(true, self.editor().unwrap()))
} //}
pub fn view_samples_grid (&self) -> impl Content<TuiOut> + use<'_> { //pub fn view_samples_grid (&self) -> impl Content<TuiOut> + use<'_> {
self.project.sampler().map(|s|s.view_grid()) //self.project.sampler().map(|s|s.view_grid())
} //}
pub fn view_sample_viewer (&self) -> impl Content<TuiOut> + use<'_> { //pub fn view_sample_viewer (&self) -> impl Content<TuiOut> + use<'_> {
self.project.sampler().map(|s|s.view_sample(self.editor().unwrap().get_note_pos())) //self.project.sampler().map(|s|s.view_sample(self.editor().unwrap().get_note_pos()))
} //}
pub fn view_sample_info (&self) -> impl Content<TuiOut> + use<'_> { //pub fn view_sample_info (&self) -> impl Content<TuiOut> + use<'_> {
self.project.sampler().map(|s|s.view_sample_info(self.editor().unwrap().get_note_pos())) //self.project.sampler().map(|s|s.view_sample_info(self.editor().unwrap().get_note_pos()))
} //}
pub fn view_sample_status (&self) -> impl Content<TuiOut> + use<'_> { //pub fn view_sample_status (&self) -> impl Content<TuiOut> + use<'_> {
self.project.sampler().map(|s|Outer(true, Style::default().fg(Tui::g(96))).enclose( //self.project.sampler().map(|s|Outer(true, Style::default().fg(Tui::g(96))).enclose(
Fill::y(Align::n(s.view_sample_status(self.editor().unwrap().get_note_pos()))))) //Fill::y(Align::n(s.view_sample_status(self.editor().unwrap().get_note_pos())))))
} //}
pub fn view_meters_input (&self) -> impl Content<TuiOut> + use<'_> { //pub fn view_meters_input (&self) -> impl Content<TuiOut> + use<'_> {
self.project.sampler().map(|s|s.view_meters_input()) //self.project.sampler().map(|s|s.view_meters_input())
} //}
pub fn view_meters_output (&self) -> impl Content<TuiOut> + use<'_> { //pub fn view_meters_output (&self) -> impl Content<TuiOut> + use<'_> {
self.project.sampler().map(|s|s.view_meters_output()) //self.project.sampler().map(|s|s.view_meters_output())
} //}
pub fn view_dialog (&self) -> impl Content<TuiOut> + use<'_> { //pub fn view_dialog (&self) -> impl Content<TuiOut> + use<'_> {
self.dialog.as_ref().map(|dialog|Bsp::b("", //self.dialog.as_ref().map(|dialog|Bsp::b("",
Fixed::xy(70, 23, Tui::fg_bg(Rgb(255,255,255), Rgb(16,16,16), Bsp::b( //Fixed::xy(70, 23, Tui::fg_bg(Rgb(255,255,255), Rgb(16,16,16), Bsp::b(
Repeat(" "), Outer(true, Style::default().fg(Tui::g(96))) //Repeat(" "), Outer(true, Style::default().fg(Tui::g(96)))
.enclose(dialog)))))) //.enclose(dialog))))))
} //}
} }
impl ScenesView for App { impl ScenesView for App {

29
crates/device/src/clock/clock_view.rs
View file

@ -132,4 +132,33 @@ impl ViewCache {
cache.bpm.update(None, rewrite!(buf, "{}", ViewCache::BPM_EMPTY)); cache.bpm.update(None, rewrite!(buf, "{}", ViewCache::BPM_EMPTY));
} }
} }
//pub fn view_h2 (&self) -> impl Content<TuiOut> {
//let cache = self.project.clock.view_cache.clone();
//let cache = cache.read().unwrap();
//add(&Fixed::x(15, Align::w(Bsp::s(
//FieldH(theme, "Beat", cache.beat.view.clone()),
//FieldH(theme, "Time", cache.time.view.clone()),
//))));
//add(&Fixed::x(13, Align::w(Bsp::s(
//Fill::x(Align::w(FieldH(theme, "BPM", cache.bpm.view.clone()))),
//Fill::x(Align::w(FieldH(theme, "SR ", cache.sr.view.clone()))),
//))));
//add(&Fixed::x(12, Align::w(Bsp::s(
//Fill::x(Align::w(FieldH(theme, "Buf", cache.buf.view.clone()))),
//Fill::x(Align::w(FieldH(theme, "Lat", cache.lat.view.clone()))),
//))));
//add(&Bsp::s(
//Fill::x(Align::w(FieldH(theme, "Selected", Align::w(self.selection().describe(
//self.tracks(),
//self.scenes()
//))))),
//Fill::x(Align::w(FieldH(theme, format!("History ({})", self.history.len()),
//self.history.last().map(|last|Fill::x(Align::w(format!("{:?}", last.0)))))))
//));
////if let Some(last) = self.history.last() {
////add(&FieldV(theme, format!("History ({})", self.history.len()),
////Fill::x(Align::w(format!("{:?}", last.0)))));
////}
//}
} }

2
deps/tengri vendored

@ -1 +1 @@
Subproject commit 2048dd2263fc4389c8f510bfd12c851efe34026f Subproject commit 776cea6f1ba502b87bcaed3a7d794076e328df2e