mirror of
https://codeberg.org/unspeaker/tek.git
synced 2025-12-09 13:16:44 +01:00
wip(p60,e90): impl macros
This commit is contained in:
parent
f4a4b08c8a
commit
9d4fcaa32b
17 changed files with 748 additions and 1083 deletions
|
|
@ -5,18 +5,10 @@ impl TryFrom<&Arc<RwLock<JackClient>>> for TransportTui {
|
|||
type Error = Box<dyn std::error::Error>;
|
||||
fn try_from (jack: &Arc<RwLock<JackClient>>) -> Usually<Self> {
|
||||
Ok(Self {
|
||||
current: Instant::default(),
|
||||
cursor: (0, 0),
|
||||
focus: TransportFocus::PlayPause,
|
||||
focused: false,
|
||||
jack: jack.clone(),
|
||||
metronome: false,
|
||||
playing: RwLock::new(None),
|
||||
quant: Quantize::default(),
|
||||
size: Measure::new(),
|
||||
started: RwLock::new(None),
|
||||
sync: LaunchSync::default(),
|
||||
transport: jack.read().unwrap().transport(),
|
||||
cursor: (0, 0),
|
||||
state: TransportModel::from(jack.read().unwrap().transport()),
|
||||
jack: jack.clone(),
|
||||
size: Measure::new(),
|
||||
})
|
||||
}
|
||||
}
|
||||
|
|
@ -25,33 +17,17 @@ impl TryFrom<&Arc<RwLock<JackClient>>> for SequencerTui {
|
|||
type Error = Box<dyn std::error::Error>;
|
||||
fn try_from (jack: &Arc<RwLock<JackClient>>) -> Usually<Self> {
|
||||
Ok(Self {
|
||||
current: Instant::default(),
|
||||
cursor: (0, 0),
|
||||
entered: false,
|
||||
jack: jack.clone(),
|
||||
metronome: false,
|
||||
midi_buf: vec![],
|
||||
midi_inputs: vec![],
|
||||
midi_outputs: vec![],
|
||||
monitoring: true,
|
||||
next_phrase: None,
|
||||
note_buf: vec![],
|
||||
notes_in: RwLock::new([false;128]).into(),
|
||||
notes_out: RwLock::new([false;128]).into(),
|
||||
overdub: true,
|
||||
phrases: vec![],
|
||||
phrases_mode: None,
|
||||
play_phrase: None,
|
||||
playing: RwLock::new(None),
|
||||
quant: Quantize::default(),
|
||||
recording: true,
|
||||
reset: false,
|
||||
size: Measure::new(),
|
||||
split: 20,
|
||||
started: RwLock::new(None),
|
||||
sync: LaunchSync::default(),
|
||||
transport: jack.read().unwrap().transport(),
|
||||
view_phrase: 0,
|
||||
transport: TransportModel::from(jack.read().unwrap().transport()),
|
||||
player: PhrasePlayerModel::default(),
|
||||
editor: PhraseEditorModel::default(),
|
||||
})
|
||||
}
|
||||
}
|
||||
|
|
@ -61,13 +37,11 @@ impl TryFrom<&Arc<RwLock<JackClient>>> for ArrangerTui {
|
|||
fn try_from (jack: &Arc<RwLock<JackClient>>) -> Usually<Self> {
|
||||
Ok(Self {
|
||||
color: Color::Rgb(28, 35, 25).into(),
|
||||
current: Instant::default(),
|
||||
cursor: (0, 0),
|
||||
entered: false,
|
||||
history: vec![],
|
||||
jack: jack.clone(),
|
||||
menu_bar: None,
|
||||
metronome: false,
|
||||
midi_buf: vec![],
|
||||
mode: ArrangerMode::Vertical(2),
|
||||
name: Arc::new(RwLock::new(String::new())),
|
||||
|
|
@ -75,17 +49,13 @@ impl TryFrom<&Arc<RwLock<JackClient>>> for ArrangerTui {
|
|||
phrase: 0,
|
||||
phrases: vec![],
|
||||
phrases_mode: None,
|
||||
playing: None.into(),
|
||||
quant: Default::default(),
|
||||
scenes: vec![],
|
||||
selected: ArrangerSelection::Clip(0, 0),
|
||||
size: Measure::new(),
|
||||
splits: [20, 20],
|
||||
started: None.into(),
|
||||
status_bar: None,
|
||||
sync: Default::default(),
|
||||
tracks: vec![],
|
||||
transport: jack.read().unwrap().transport(),
|
||||
transport: TransportModel::from(jack.read().unwrap().transport()),
|
||||
})
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue