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

put phrases from pool in arrangement

Browse source
This commit is contained in:
🪞👃🪞 2024-10-10 10:02:30 +03:00
parent dc3edc86ff
commit 96ca1e148b
4 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
crates/tek_sequencer/src/arranger.rs
View file

@ -347,6 +347,11 @@ impl<E: Engine> Arrangement<E> {
//}) //})
//}); //});
} }
pub fn phrase_put (&mut self) {
if let ArrangementFocus::Clip(track, scene) = self.selected {
self.scenes[scene].clips[track] = Some(self.phrases.read().unwrap().phrase().clone());
}
}
} }
impl<E: Engine> ArrangementTrack<E> { impl<E: Engine> ArrangementTrack<E> {
pub fn new (name: &str) -> Self { pub fn new (name: &str) -> Self {

2
crates/tek_sequencer/src/arranger_tui.rs
View file

@ -45,6 +45,8 @@ impl Handle<Tui> for Arranger<Tui> {
key!(KeyCode::Down) => { self.focus_down(); }, key!(KeyCode::Down) => { self.focus_down(); },
key!(KeyCode::Left) => { self.focus_left(); }, key!(KeyCode::Left) => { self.focus_left(); },
key!(KeyCode::Right) => { self.focus_right(); }, key!(KeyCode::Right) => { self.focus_right(); },
// Put selected phrase at position
key!(KeyCode::Char('s')) => { self.arrangement.phrase_put(); },
// Global play/pause binding // Global play/pause binding
key!(KeyCode::Char(' ')) => match self.transport { key!(KeyCode::Char(' ')) => match self.transport {
Some(ref mut transport) => { transport.write().unwrap().toggle_play()?; }, Some(ref mut transport) => { transport.write().unwrap().toggle_play()?; },

7
crates/tek_sequencer/src/sequencer.rs
View file

@ -27,7 +27,7 @@ pub struct PhrasePool<E: Engine> {
/// Highlighted phrase /// Highlighted phrase
pub phrase: usize, pub phrase: usize,
/// Phrases in the pool /// Phrases in the pool
pub phrases: Vec<Arc<RwLock<Option<Phrase>>>>, pub phrases: Vec<Arc<RwLock<Phrase>>>,
/// Whether this widget is focused /// Whether this widget is focused
pub focused: bool, pub focused: bool,
} }
@ -126,10 +126,13 @@ impl<E: Engine> PhrasePool<E> {
_engine: Default::default(), _engine: Default::default(),
scroll: 0, scroll: 0,
phrase: 0, phrase: 0,
phrases: vec![Arc::new(RwLock::new(Some(Phrase::default())))], phrases: vec![Arc::new(RwLock::new(Phrase::default()))],
focused: false focused: false
} }
} }
pub fn phrase (&self) -> &Arc<RwLock<Phrase>> {
&self.phrases[self.phrase]
}
} }
impl<E: Engine> PhraseEditor<E> { impl<E: Engine> PhraseEditor<E> {
pub fn new () -> Self { pub fn new () -> Self {

4
crates/tek_sequencer/src/sequencer_tui.rs
View file

@ -76,10 +76,10 @@ impl Handle<Tui> for PhrasePool<Tui> {
self.phrase = (self.phrase + 1) % self.phrases.len() self.phrase = (self.phrase + 1) % self.phrases.len()
}, },
key!(KeyCode::Char('i')) => { key!(KeyCode::Char('i')) => {
self.phrases.insert(self.phrase, Arc::new(RwLock::new(Some(Phrase::default())))) self.phrases.insert(self.phrase, Arc::new(RwLock::new(Phrase::default())))
}, },
key!(KeyCode::Char('a')) => { key!(KeyCode::Char('a')) => {
self.phrases.push(Arc::new(RwLock::new(Some(Phrase::default())))) self.phrases.push(Arc::new(RwLock::new(Phrase::default())))
}, },
_ => return Ok(None), _ => return Ok(None),
} }