unspeaker/tek
1
0
Fork 0
mirror of https://codeberg.org/unspeaker/tek.git synced 2025-12-07 12:16:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

wip: refactor pt.21: 48 errors

Browse source
This commit is contained in:
🪞👃🪞 2024-11-13 17:43:46 +01:00
parent 2188bccd63
commit b8708d6b2d
15 changed files with 313 additions and 355 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/tek_cli/src/cli_arranger.rs
View file

@ -22,10 +22,7 @@ impl ArrangerCli {
/// Run the arranger TUI from CLI arguments.
fn run (&self) -> Usually<()> {
Tui::run(JackClient::new("tek_arranger")?.activate_with(|jack|{
let transport = TransportView::new(jack, None);
let phrases = Arc::new(RwLock::new(PhrasePool::new()));
let mut arrangement = Arrangement::new(&jack, &transport.clock, "", &phrases);
let transport = Arc::new(RwLock::new(transport));
let mut app = TransportApp::try_from(jack)?;
if let Some(name) = self.name.as_ref() {
*arrangement.name.write().unwrap() = name.clone();
}
@ -45,13 +42,8 @@ impl ArrangerCli {
Some(scene_color_1.mix(scene_color_2, i as f32 / self.scenes as f32))
)?;
}
Ok(ArrangerView::new(
jack,
self.transport.then_some(transport),
arrangement,
phrases,
))
})?)?;
Ok(app)
})?)?
Ok(())
}
}

13
crates/tek_cli/src/cli_sequencer.rs
View file

@ -20,7 +20,7 @@ pub struct SequencerCli {
impl SequencerCli {
fn run (&self) -> Usually<()> {
Tui::run(JackClient::new("tek_sequencer")?.activate_with(|jack|{
let transport = TransportView::new(jack, None);
let mut app = SequencerApp::try_from(jack)?;
if let Some(_) = self.name.as_ref() {
// TODO: sequencer.name = Arc::new(RwLock::new(name.clone()));
}
@ -32,16 +32,7 @@ impl SequencerCli {
//phrase.write().unwrap().length = length;
//}
}
Ok(SequencerView {
jack: jack.clone(),
focus_cursor: (1, 1),
entered: false,
phrases: Arc::new(RwLock::new(PhrasePool::new())),
editor: PhraseEditor::new(),
clock: transport.clock.clone(),
player: PhrasePlayer::new(jack, &transport.clock, "tek_sequencer")?,
transport: self.transport.then_some(Arc::new(RwLock::new(transport))),
})
Ok(app)
})?)?;
Ok(())
}

2
crates/tek_cli/src/cli_transport.rs
View file

@ -2,6 +2,6 @@ use tek_core::clap::{self, Parser};
/// Application entrypoint.
pub fn main () -> Usually<()> {
Tui::run(JackClient::new("tek_transport")?.activate_with(TransportApp::run)?)?
Tui::run(JackClient::new("tek_transport")?.activate_with(TransportApp::try_from)?)?
Ok(())
}