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

tests compile again

Browse source
This commit is contained in:
🪞👃🪞 2025-05-09 22:11:15 +03:00
parent 5c74ffd916
commit 9e8572ae0f
5 changed files with 51 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

7
crates/app/examples/midi_import.rs
View file

@ -11,7 +11,10 @@ impl HasClips for ExampleClips {
}
}
fn main () -> Result<(), Box<dyn std::error::Error>> {
let mut clips = ExampleClips(Arc::new(vec![].into()));
PoolClipCommand::Import(0, std::path::PathBuf::from("./example.mid")).execute(&mut clips)?;
let mut clips = MidiPool::default();//ExampleClips(Arc::new(vec![].into()));
PoolClipCommand::Import {
index: 0,
path: std::path::PathBuf::from("./example.mid")
}.execute(&mut clips)?;
Ok(())
}

26
crates/app/src/lib.rs
View file

@ -122,3 +122,29 @@ mod view; pub use self::view::*;
let _ = app.h_outputs();
let _ = app.h_scenes();
}
#[cfg(test)] #[test] fn test_midi_edit () {
let editor = MidiEditor::default();
let mut editor = MidiEditor {
mode: PianoHorizontal::new(Some(&Arc::new(RwLock::new(MidiClip::stop_all())))),
size: Default::default(),
//keys: Default::default(),
};
let _ = editor.put_note(true);
let _ = editor.put_note(false);
let _ = editor.clip_status();
let _ = editor.edit_status();
struct TestEditorHost(Option<MidiEditor>);
has_editor!(|self: TestEditorHost|{
editor = self.0;
editor_w = 0;
editor_h = 0;
is_editing = false;
});
let mut host = TestEditorHost(Some(editor));
let _ = host.editor();
let _ = host.editor_mut();
let _ = host.is_editing();
let _ = host.editor_w();
let _ = host.editor_h();
}

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

@ -4,10 +4,10 @@ pub(crate) use ::tengri::tui::ratatui::prelude::Position;
#[tengri_proc::view(TuiOut)]
impl App {
fn view_nil (&self) -> impl Content<TuiOut> + use<'_> {
pub fn view_nil (&self) -> impl Content<TuiOut> + use<'_> {
"nil"
}
fn view_status (&self) -> impl Content<TuiOut> + use<'_> {
pub fn view_status (&self) -> impl Content<TuiOut> + use<'_> {
self.update_clock();
let cache = self.view_cache.read().unwrap();
view_status(
@ -15,7 +15,7 @@ impl App {
cache.sr.view.clone(), cache.buf.view.clone(), cache.lat.view.clone(),
)
}
fn view_transport (&self) -> impl Content<TuiOut> + use<'_> {
pub fn view_transport (&self) -> impl Content<TuiOut> + use<'_> {
self.update_clock();
let cache = self.view_cache.read().unwrap();
view_transport(
@ -23,25 +23,25 @@ impl App {
cache.bpm.view.clone(), cache.beat.view.clone(), cache.time.view.clone(),
)
}
fn view_arranger (&self) -> impl Content<TuiOut> + use<'_> {
pub fn view_arranger (&self) -> impl Content<TuiOut> + use<'_> {
ArrangerView::new(self)
}
fn view_pool (&self) -> impl Content<TuiOut> + use<'_> {
pub fn view_pool (&self) -> impl Content<TuiOut> + use<'_> {
self.pool().map(|p|Fixed::x(self.w_sidebar(), PoolView(self.is_editing(), p)))
}
fn view_editor (&self) -> impl Content<TuiOut> + use<'_> {
pub fn view_editor (&self) -> impl Content<TuiOut> + use<'_> {
self.editor().map(|e|Bsp::n(Bsp::e(e.clip_status(), e.edit_status()), e))
}
fn view_samples_keys (&self) -> impl Content<TuiOut> + use<'_> {
pub fn view_samples_keys (&self) -> impl Content<TuiOut> + use<'_> {
self.sampler().map(|s|s.view_list(false, self.editor().unwrap()))
}
fn view_samples_grid (&self) -> impl Content<TuiOut> + use<'_> {
pub fn view_samples_grid (&self) -> impl Content<TuiOut> + use<'_> {
self.sampler().map(|s|s.view_grid())
}
fn view_sample_viewer (&self) -> impl Content<TuiOut> + use<'_> {
pub fn view_sample_viewer (&self) -> impl Content<TuiOut> + use<'_> {
self.sampler().map(|s|s.view_sample(self.editor().unwrap().get_note_pos()))
}
fn view_dialog (&self) -> impl Content<TuiOut> + use<'_> {
pub fn view_dialog (&self) -> impl Content<TuiOut> + use<'_> {
When::new(self.dialog.is_some(), Bsp::b(
Fill::xy(Tui::fg_bg(Rgb(64,64,64), Rgb(32,32,32), "")),
Fixed::xy(30, 15, Tui::fg_bg(Rgb(255,255,255), Rgb(16,16,16), Bsp::b(

28
crates/device/src/sequencer.rs
View file

@ -13,7 +13,7 @@ mod seq_view; pub use self::seq_view::*;
let mut clip = MidiClip::new("clip", true, 1, None, None);
clip.set_length(96);
clip.toggle_loop();
clip.record_event(12, midly::MidiMessage::NoteOn { key: 36.into(), vel: 100.into() });
clip.record_event(12, MidiMessage::NoteOn { key: 36.into(), vel: 100.into() });
assert!(clip.contains_note_on(36.into(), 6, 18));
assert_eq!(&clip.notes, &clip.duplicate().notes);
@ -25,29 +25,3 @@ mod seq_view; pub use self::seq_view::*;
let player = MidiPlayer::default();
println!("{player:?}");
}
#[cfg(test)] #[test] fn test_midi_edit () {
let editor = MidiEditor::default();
let mut editor = MidiEditor {
mode: PianoHorizontal::new(Some(&Arc::new(RwLock::new(MidiClip::stop_all())))),
size: Default::default(),
keys: Default::default(),
};
let _ = editor.put_note(true);
let _ = editor.put_note(false);
let _ = editor.clip_status();
let _ = editor.edit_status();
struct TestEditorHost(Option<MidiEditor>);
has_editor!(|self: TestEditorHost|{
editor = self.0;
editor_w = 0;
editor_h = 0;
is_editing = false;
});
let mut host = TestEditorHost(Some(editor));
let _ = host.editor();
let _ = host.editor_mut();
let _ = host.is_editing();
let _ = host.editor_w();
let _ = host.editor_h();
}

18
crates/engine/src/lib.rs
View file

@ -58,14 +58,14 @@ impl InteriorMutable<usize> for AtomicUsize {
#[cfg(test)] #[test] fn test_midi_range () {
let model = MidiRangeModel::from((1, false));
let _ = model.time_len();
let _ = model.time_zoom();
let _ = model.time_lock();
let _ = model.time_start();
let _ = model.time_axis();
let _ = model.time_end();
let _ = model.get_time_len();
let _ = model.get_time_zoom();
let _ = model.get_time_lock();
let _ = model.get_time_start();
let _ = model.get_time_axis();
let _ = model.get_time_end();
let _ = model.note_lo();
let _ = model.note_axis();
let _ = model.note_hi();
let _ = model.get_note_lo();
let _ = model.get_note_axis();
let _ = model.get_note_hi();
}