mirror of
https://codeberg.org/unspeaker/tek.git
synced 2025-12-07 20:26:42 +01:00
wip: refactor pt.35 (16e) even more traits, even fewer structs
This commit is contained in:
parent
beca1a6ade
commit
7af5bbd02b
12 changed files with 121 additions and 191 deletions
|
|
@ -4,11 +4,14 @@ use crate::*;
|
|||
impl TryFrom<&Arc<RwLock<JackClient>>> for TransportApp<Tui> {
|
||||
type Error = Box<dyn std::error::Error>;
|
||||
fn try_from (jack: &Arc<RwLock<JackClient>>) -> Usually<Self> {
|
||||
Ok(Self::new(TransportModel {
|
||||
Ok(Self::new(TransportView {
|
||||
metronome: false,
|
||||
transport: jack.read().unwrap().transport(),
|
||||
jack: jack.clone(),
|
||||
clock: Arc::new(Clock::from(Instant::default()))
|
||||
focused: false,
|
||||
focus: TransportViewFocus::PlayPause,
|
||||
size: Measure::new(),
|
||||
}.into(), None, None))
|
||||
}
|
||||
}
|
||||
|
|
@ -121,18 +124,6 @@ impl Command<TransportApp<Tui>> for TransportCommand {
|
|||
}
|
||||
}
|
||||
|
||||
impl<E: Engine> From<TransportModel> for TransportView<E> {
|
||||
fn from (model: TransportModel) -> Self {
|
||||
Self {
|
||||
_engine: Default::default(),
|
||||
focused: false,
|
||||
focus: TransportViewFocus::PlayPause,
|
||||
size: Measure::new(),
|
||||
model
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Stores and displays time-related info.
|
||||
#[derive(Debug)]
|
||||
pub struct TransportView<E: Engine> {
|
||||
|
|
@ -298,3 +289,26 @@ impl FocusGrid for TransportApp<Tui> {
|
|||
// TODO
|
||||
}
|
||||
}
|
||||
|
||||
impl HasJack for TransportView {
|
||||
fn jack (&self) -> &Arc<RwLock<JackClient>> {
|
||||
&self.jack
|
||||
}
|
||||
}
|
||||
|
||||
impl HasClock for TransportView {
|
||||
fn clock (&self) -> &Arc<Clock> {
|
||||
&self.clock
|
||||
}
|
||||
}
|
||||
|
||||
impl std::fmt::Debug for TransportView {
|
||||
fn fmt (&self, f: &mut std::fmt::Formatter<'_>) -> std::result::Result<(), Error> {
|
||||
f.debug_struct("transport")
|
||||
.field("jack", &self.jack)
|
||||
.field("transport", &"(JACK transport)")
|
||||
.field("clock", &self.clock)
|
||||
.field("metronome", &self.metronome)
|
||||
.finish()
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue