diff --git a/tek/src/device.rs b/tek/src/device.rs index e69de29b..1179f97c 100644 --- a/tek/src/device.rs +++ b/tek/src/device.rs @@ -0,0 +1,6 @@ +use crate::*; +pub trait Device: Send + Sync + std::fmt::Debug { + fn boxed <'a> (self) -> Box where Self: Sized + 'a { Box::new(self) } +} +impl Device for Sampler {} +impl Device for Plugin {} diff --git a/tek/src/model.rs b/tek/src/model.rs index 64682aae..2e946666 100644 --- a/tek/src/model.rs +++ b/tek/src/model.rs @@ -145,8 +145,3 @@ impl Tek { Ok(()) } } -pub trait Device: Send + Sync + std::fmt::Debug { - fn boxed <'a> (self) -> Box where Self: Sized + 'a { Box::new(self) } -} -impl Device for Sampler {} -impl Device for Plugin {} diff --git a/tek/src/view_arranger.rs b/tek/src/view_arranger.rs index 4bd3ad69..6b43e5f8 100644 --- a/tek/src/view_arranger.rs +++ b/tek/src/view_arranger.rs @@ -333,11 +333,29 @@ fn io_conns <'a, T: PortsSizes<'a>> ( use super::*; #[test] fn test_view_arranger () { let mut app = Tek::default(); + let mut output = TuiOut::default(); app.editor = Some(Default::default()); - let _ = io_ports(Reset, Reset, ||app.inputs_sizes()); - let _ = io_conns(Reset, Reset, ||app.outputs_sizes()); - let _ = app.per_track(|_, _|()); - let _ = app.per_track_top(|_, _|()); - let _ = app.redraw_arranger(); + app.scenes_add(5); + app.tracks_add(5, Some(5), &[], &[]); + Content::render(&io_ports(Reset, Reset, ||app.inputs_sizes()), &mut output); + Content::render(&io_conns(Reset, Reset, ||app.outputs_sizes()), &mut output); + Content::render(&app.per_track(|_, _|()), &mut output); + Content::render(&app.per_track_top(|_, _|()), &mut output); + app.redraw_arranger(); + Content::render(&app.view_arranger(), &mut output); + Content::render(&app.view_inputs(), &mut output); + Content::render(&app.view_outputs(), &mut output); + Content::render(&track_header(0, &Default::default(), true), &mut output); + Content::render(&scene_cell( + false, + None, + false, + 0, + &Default::default(), + None, + None, + &"", + Default::default(), + ), &mut output); } }