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

wip: refactor pt.24: 45 errors

Browse source
This commit is contained in:
🪞👃🪞 2024-11-14 15:09:30 +01:00
parent ff4698d046
commit da074eb5fa
5 changed files with 120 additions and 199 deletions
Download patch file Download diff file Expand all files Collapse all files

94
crates/tek_tui/src/tui_arranger.rs
View file

@ -1,18 +1,11 @@
use crate::*;
pub type ArrangerApp = AppContainer<
Tui,
ArrangerModel,
ArrangerView<Tui>,
ArrangerViewCommand,
ArrangerAudio,
ArrangerStatusBar
>;
pub type ArrangerApp<E: Engine> = AppView<E, ArrangerView<E>, ArrangerViewCommand>;
impl TryFrom<&Arc<RwLock<JackClient>>> for ArrangerApp {
impl TryFrom<&Arc<RwLock<JackClient>>> for ArrangerApp<Tui> {
type Error = Box<dyn std::error::Error>;
fn try_from (jack: &Arc<RwLock<JackClient>>) -> Usually<Self> {
let model = Arc::new(RwLock::new(ArrangerModel {
Ok(Self::new(ArrangerModel {
name: Arc::new(RwLock::new(String::new())),
phrases: vec![],
scenes: vec![],
@ -23,22 +16,15 @@ impl TryFrom<&Arc<RwLock<JackClient>>> for ArrangerApp {
clock: Arc::new(Clock::from(Instant::default())),
jack: jack.clone(),
},
}));
Ok(Self::new(
&model,
ArrangerView::from(&model),
ArrangerAudio(model.clone()),
None,
None
))
}.into(), None, None))
}
}
impl<E: Engine> From<&Arc<RwLock<ArrangerModel>>> for ArrangerView<E> {
fn from (model: &Arc<RwLock<ArrangerModel>>) -> Self {
impl<E: Engine> From<ArrangerModel> for ArrangerView<E> {
fn from (model: ArrangerModel) -> Self {
let mut view = Self {
model: model.clone(),
sequencer: SequencerView::from(&model.read().unwrap().sequencer),
model,
sequencer: SequencerView::from(&model.sequencer),
split: 20,
selected: ArrangerFocus::Clip(0, 0),
mode: ArrangerMode::Vertical(2),
@ -96,31 +82,6 @@ impl ArrangerMode {
}
}
impl<E: Engine> Audio for ArrangerView<E> {
#[inline] fn process (&mut self, _: &Client, _: &ProcessScope) -> Control {
// FIXME: one of these per playing track
if let ArrangerFocus::Clip(t, s) = self.selected {
let phrase = self.model.scenes().get(s).map(|scene|scene.clips.get(t));
if let Some(Some(Some(phrase))) = phrase {
if let Some(track) = self.model.tracks().get(t) {
if let Some((ref started_at, Some(ref playing))) = track.player.phrase {
let phrase = phrase.read().unwrap();
if *playing.read().unwrap() == *phrase {
let pulse = self.sequencer.transport.model.clock().current.pulse.get();
let start = started_at.pulse.get();
let now = (pulse - start) % phrase.length as f64;
self.sequencer.editor.now.set(now);
return Control::Continue
}
}
}
}
}
self.sequencer.editor.now.set(0.);
return Control::Continue
}
}
/// Layout for standalone arranger app.
impl Content for ArrangerView<Tui> {
type Engine = Tui;
@ -172,11 +133,13 @@ impl<E: Engine> ArrangerView<E> {
}
pub fn activate (&mut self) {
let scenes = self.model.scenes();
let tracks = self.model.tracks_mut();
match self.selected {
ArrangerFocus::Scene(s) => {
for (t, track) in self.model.tracks_mut().iter_mut().enumerate() {
for (t, track) in tracks.iter_mut().enumerate() {
let player = &mut track.player;
let clip = self.model.scenes()[s].clips[t].as_ref();
let clip = scenes[s].clips[t].as_ref();
if player.phrase.is_some() || clip.is_some() {
player.enqueue_next(clip);
}
@ -188,8 +151,7 @@ impl<E: Engine> ArrangerView<E> {
//}
},
ArrangerFocus::Clip(t, s) => {
let clip = self.model.scenes()[s].clips[t].as_ref();
self.model.tracks_mut()[t].player.enqueue_next(clip);
tracks[t].player.enqueue_next(scenes[s].clips[t]);
},
_ => {}
}
@ -221,7 +183,7 @@ impl<E: Engine> ArrangerView<E> {
self.color = ItemColor::random_dark()
},
ArrangerFocus::Track(t) => {
self.model.tracks_mu()[t].color = ItemColor::random()
self.model.tracks_mut()[t].color = ItemColor::random()
},
ArrangerFocus::Scene(s) => {
self.model.scenes_mut()[s].color = ItemColor::random()
@ -243,3 +205,31 @@ impl<E: Engine> ArrangerView<E> {
self.selected_scene()?.clips.get(self.selected.track()?)?.clone()
}
}
impl Audio for ArrangerView<Tui> {
#[inline] fn process (&mut self, client: &Client, scope: &ProcessScope) -> Control {
if self.model.process(client, scope) == Control::Quit {
return Control::Quit
}
// FIXME: one of these per playing track
if let ArrangerFocus::Clip(t, s) = self.selected {
let phrase = self.model.scenes().get(s).map(|scene|scene.clips.get(t));
if let Some(Some(Some(phrase))) = phrase {
if let Some(track) = self.model.tracks().get(t) {
if let Some((ref started_at, Some(ref playing))) = track.player.phrase {
let phrase = phrase.read().unwrap();
if *playing.read().unwrap() == *phrase {
let pulse = self.sequencer.transport.model.clock().current.pulse.get();
let start = started_at.pulse.get();
let now = (pulse - start) % phrase.length as f64;
self.sequencer.editor.now.set(now);
return Control::Continue
}
}
}
}
}
self.sequencer.editor.now.set(0.);
return Control::Continue
}
}