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: tying it together...

Browse source
This commit is contained in:
🪞👃🪞 2024-11-01 02:15:51 +02:00
parent bbafb72e9b
commit ad2f75bee6
7 changed files with 76 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -73,16 +73,12 @@ pub struct Arrangement<E: Engine> {
pub struct ArrangementTrack {
/// Name of track
pub name: Arc<RwLock<String>>,
/// Inputs
pub inputs: Vec<Port<MidiIn>>,
/// MIDI player/recorder
pub player: PhrasePlayer,
/// Outputs
pub outputs: Vec<Port<MidiIn>>,
/// Preferred width of track column
pub width: usize,
/// Identifying color of track
pub color: Color,
/// MIDI player/recorder
pub player: PhrasePlayer,
}
#[derive(Default, Debug)]
pub struct Scene {
@ -515,11 +511,9 @@ impl ArrangementTrack {
pub fn new (clock: &Arc<TransportTime>, name: &str, color: Option<Color>) -> Self {
Self {
name: Arc::new(RwLock::new(name.into())),
inputs: vec![],
player: PhrasePlayer::new(clock),
outputs: vec![],
width: name.len() + 2,
color: color.unwrap_or_else(random_color)
color: color.unwrap_or_else(random_color),
player: PhrasePlayer::new(clock),
}
}
pub fn longest_name (tracks: &[Self]) -> usize {

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

@ -171,11 +171,11 @@ impl<'a> Content for VerticalArranger<'a, Tui> {
}))?;
// track titles
let header = row!((track, w) in tracks.iter().zip(cols.iter().map(|col|col.0))=>{
let name = track.name.read().unwrap();
let max_w = w.saturating_sub(1).min(name.len()).max(2);
let name = format!("▎{}", &name[0..max_w]);
let name = TuiStyle::bold(name, true);
let input_name = track.inputs.get(0)
let name = track.name.read().unwrap();
let max_w = w.saturating_sub(1).min(name.len()).max(2);
let name = format!("▎{}", &name[0..max_w]);
let name = TuiStyle::bold(name, true);
let input_name = track.player.midi_inputs.get(0)
.map(|port|port.short_name())
.transpose()?
.unwrap_or("(none)".into());
@ -190,14 +190,14 @@ impl<'a> Content for VerticalArranger<'a, Tui> {
let player = &track.player;
let clock = &player.clock;
let elapsed = player.phrase.as_ref()
.map(|_|player.frames_since_start())
.map(|_|player.samples_since_start())
.flatten()
.map(|t|format!("▎{t:>}"))
.unwrap_or(String::from("▎"));
let until_next = player.next_phrase.as_ref()
.map(|(t, _)|format!("▎-{:>}", clock.format_beats(t.load(Ordering::Relaxed))))
.map(|(t, _)|format!("▎-{:>}", t.format_beat()))
.unwrap_or(String::from("▎"));
let output_name = track.outputs.get(0)
let output_name = track.player.midi_outputs.get(0)
.map(|port|port.short_name())
.transpose()?
.unwrap_or("(none)".into());
@ -279,11 +279,11 @@ impl<'a> Content for VerticalArranger<'a, Tui> {
},
};
if let Some([x, y, width, height]) = track_area {
to.fill_fg([x, y, 1, height], Color::Rgb(70, 80, 50));
to.fill_fg([x, y, 1, height], Color::Rgb(70, 80, 50));
to.fill_fg([x + width, y, 1, height], Color::Rgb(70, 80, 50));
}
if let Some([_, y, _, height]) = scene_area {
to.fill_ul([area.x(), y - 1, area.w(), 1], Color::Rgb(70, 80, 50));
to.fill_ul([area.x(), y - 1, area.w(), 1], Color::Rgb(70, 80, 50));
to.fill_ul([area.x(), y + height - 1, area.w(), 1], Color::Rgb(70, 80, 50));
}
Ok(if focused {
@ -295,7 +295,7 @@ impl<'a> Content for VerticalArranger<'a, Tui> {
}))
}).bg(bg).grow_y(1).border(border);
let color = if self.0.focused {Color::Rgb(150, 160, 90)} else {Color::Rgb(120, 130, 100)};
let size = format!("{}x{}", self.0.size.w(), self.0.size.h());
let size = format!("{}x{}", self.0.size.w(), self.0.size.h());
let lower_right = TuiStyle::fg(size, color).pull_x(1).align_se().fill_xy();
lay!(arrangement, lower_right)
}

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

@ -117,31 +117,29 @@ pub struct PhraseEditor<E: Engine> {
/// Phrase player.
pub struct PhrasePlayer {
/// Global timebase
pub clock: Arc<TransportTime>,
pub clock: Arc<TransportTime>,
/// Start time and phrase being played
pub phrase: Option<(AtomicUsize, Option<Arc<RwLock<Phrase>>>)>,
/// Start time (FIXME move into phrase, using Instant)
pub started: Option<(usize, usize)>,
pub phrase: Option<(Instant, Option<Arc<RwLock<Phrase>>>)>,
/// Start time and next phrase
pub next_phrase: Option<(AtomicUsize, Option<Arc<RwLock<Phrase>>>)>,
pub next_phrase: Option<(Instant, Option<Arc<RwLock<Phrase>>>)>,
/// Play input through output.
pub monitoring: bool,
pub monitoring: bool,
/// Write input to sequence.
pub recording: bool,
pub recording: bool,
/// Overdub input to sequence.
pub overdub: bool,
pub overdub: bool,
/// Send all notes off
pub reset: bool, // TODO?: after Some(nframes)
pub reset: bool, // TODO?: after Some(nframes)
/// Record from MIDI ports to current sequence.
pub midi_inputs: Vec<Port<MidiIn>>,
pub midi_inputs: Vec<Port<MidiIn>>,
/// Play from current sequence to MIDI ports
pub midi_outputs: Vec<Port<MidiOut>>,
pub midi_outputs: Vec<Port<MidiOut>>,
/// MIDI output buffer
pub midi_out_buf: Vec<Vec<Vec<u8>>>,
pub midi_out_buf: Vec<Vec<Vec<u8>>>,
/// Notes currently held at input
pub notes_in: Arc<RwLock<[bool; 128]>>,
pub notes_in: Arc<RwLock<[bool; 128]>>,
/// Notes currently held at output
pub notes_out: Arc<RwLock<[bool; 128]>>,
pub notes_out: Arc<RwLock<[bool; 128]>>,
}
/// Focus layout of sequencer app
impl<E: Engine> FocusGrid<SequencerFocus> for Sequencer<E> {
@ -377,7 +375,6 @@ impl PhrasePlayer {
Self {
clock: clock.clone(),
phrase: None,
started: None,
next_phrase: None,
notes_in: Arc::new(RwLock::new([false;128])),
notes_out: Arc::new(RwLock::new([false;128])),
@ -395,21 +392,22 @@ impl PhrasePlayer {
pub fn toggle_overdub (&mut self) { self.overdub = !self.overdub; }
pub fn enqueue_next (&mut self, phrase: Option<&Arc<RwLock<Phrase>>>) {
let start = self.clock.next_launch_pulse();
self.next_phrase = Some((start.into(), phrase.map(|p|p.clone())));
self.next_phrase = Some((
Instant::from_pulse(&self.clock.timebase, start as f64),
phrase.map(|p|p.clone())
));
self.reset = true;
}
pub fn frames_since_start (&self) -> Option<usize> {
pub fn samples_since_start (&self) -> Option<usize> {
self.phrase.as_ref()
.map(|(started,_)|started.load(Ordering::Relaxed))
.map(|(started,_)|started.sample())
.map(|started|started - self.clock.sample())
}
pub fn playing_phrase (&self) -> Option<(usize, Arc<RwLock<Phrase>>)> {
if let (
Some(TransportState::Rolling),
Some((start_frame, _)),
Some((_started, Some(ref phrase)))
) = (*self.clock.playing.read().unwrap(), self.started, &self.phrase) {
Some((start_frame, phrase.clone()))
Some(TransportState::Rolling), Some((started, Some(ref phrase)))
) = (*self.clock.playing.read().unwrap(), &self.phrase) {
Some((started.sample(), phrase.clone()))
} else {
None
}

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

@ -26,16 +26,17 @@ impl Audio for PhrasePlayer {
let output = &mut self.midi_out_buf;
let notes_on = &mut self.notes_out.write().unwrap();
let frame0 = frame0.saturating_sub(start_frame);
let frameN = frame0 + frames;
let ticks = self.clock.timebase.pulses_between_samples(frame0, frameN);
let mut buf = Vec::with_capacity(8);
let ticks = Ticks(self.clock.timebase.pulses_per_sample());
for (time, tick) in ticks.between_samples(frame0, frame0 + frames) {
for (sample, tick) in ticks {
let tick = tick % phrase.length;
for message in phrase.notes[tick].iter() {
buf.clear();
let channel = 0.into();
let message = *message;
LiveEvent::Midi { channel, message }.write(&mut buf).unwrap();
output[time as usize].push(buf.clone());
output[sample].push(buf.clone());
update_keys(notes_on, &message);
}
}

13
crates/tek_sequencer/src/transport.rs
View file

@ -2,7 +2,7 @@ use crate::*;
#[derive(Debug, Default)]
pub struct TransportTime {
/// Current sample sr, tempo, and PPQ.
pub timebase: Timebase,
pub timebase: Arc<Timebase>,
/// Current moment in time
pub instant: Instant,
/// Playback state
@ -71,7 +71,6 @@ pub struct TransportToolbar<E: Engine> {
/// Which item of the transport toolbar is focused
#[derive(Clone, Copy, PartialEq)]
pub enum TransportToolbarFocus { Bpm, Sync, PlayPause, Clock, Quant, }
impl<E: Engine> TransportToolbar<E> {
pub fn new (
clock: Option<&Arc<TransportTime>>,
@ -90,11 +89,11 @@ impl<E: Engine> TransportToolbar<E> {
None => {
let timebase = Timebase::default();
Arc::new(TransportTime {
playing: Some(TransportState::Stopped).into(),
quant: 24.into(),
sync: (timebase.ppq() as usize * 4).into(),
instant: Instant::default(),
timebase,
playing: Some(TransportState::Stopped).into(),
quant: 24.into(),
sync: (timebase.ppq() as usize * 4).into(),
instant: Instant::default(),
timebase: timebase.into(),
})
}
}

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

@ -34,7 +34,7 @@ impl Content for TransportToolbar<Tui> {
).align_w().fill_x(),
self.focus.wrap(self.focused, TransportToolbarFocus::Clock, &{
let time1 = self.clock.format_current_pulse();
let time1 = self.clock.format_beat();
let time2 = self.clock.format_current_usec();
row!("B" ,time1.as_str(), " T", time2.as_str()).outset_x(1)
}).align_e().fill_x(),