refactors and cleanups

This commit is contained in:
🪞👃🪞 2024-07-10 21:53:38 +03:00
parent 78afaf9693
commit 6979fd67ec
8 changed files with 126 additions and 173 deletions

View file

@ -1,118 +1,107 @@
use crate::{core::*, model::App};
pub struct TransportView<'a> {
pub timebase: &'a Arc<Timebase>,
use crate::{core::*, view::Split, model::App};
pub struct TransportView {
pub playing: TransportState,
pub record: bool,
pub overdub: bool,
pub monitor: bool,
pub frame: usize,
pub quant: usize,
pub ppq: usize,
pub bpm: usize,
pub pulse: usize,
pub usecs: usize,
}
impl<'a> TransportView<'a> {
pub fn new (app: &'a App) -> Self {
impl TransportView {
pub fn new (app: &App) -> Self {
Self {
timebase: &app.timebase,
playing: *app.playing.as_ref().unwrap_or(&TransportState::Stopped),
monitor: app.track().map(|t|t.1.monitoring).unwrap_or(false),
record: app.track().map(|t|t.1.recording).unwrap_or(false),
overdub: app.track().map(|t|t.1.overdub).unwrap_or(false),
frame: app.playhead,
quant: app.quant,
ppq: app.timebase.ppq() as usize,
bpm: app.timebase.bpm() as usize,
pulse: app.timebase.frame_to_pulse(app.playhead as f64) as usize,
usecs: app.timebase.frame_to_usec(app.playhead as f64) as usize,
}
}
}
render!(TransportView |self, buf, area| {
let Self { ppq, frame, bpm, quant, pulse, usecs, .. } = self;
let frame = *frame as f64;
let Rect { x, y, width, .. } = area;
fill_bg(buf, Rect {
x, y, width, height: if width > 100 { 1 } else { 2 }
}, Color::Rgb(20, 45, 5));
let mut area = Split::right([
impl<'a> Render for TransportView<'a> {
fn render (&self, buf: &mut Buffer, area: Rect) -> Usually<Rect> {
fill_bg(buf, area, Color::Rgb(20, 45, 5));
let Rect { x, y, width, .. } = area;
draw_play_stop(buf, x + 1, y, &self.playing);
if width > 100 {
draw_rec(buf, x + 12, y, self.record);
draw_dub(buf, x + 19, y, self.overdub);
draw_mon(buf, x + 26, y, self.monitor);
draw_bpm(buf, x + 33, y, self.timebase.bpm() as usize, self.quant);
draw_timer(buf, x + width - 1, y,
self.timebase.ppq() as usize,
self.timebase.frame_to_pulse(self.frame as f64) as usize,
self.timebase.frame_to_usec(self.frame as f64) as usize,
);
Ok(Rect { x, y, width, height: 1 })
} else {
draw_bpm(buf, x + 12, y, self.timebase.bpm() as usize, self.quant);
draw_timer(buf, x + width - 1, y,
self.timebase.ppq() as usize,
self.timebase.frame_to_pulse(self.frame as f64) as usize,
self.timebase.frame_to_usec(self.frame as f64) as usize,
);
draw_rec(buf, x + 1, y + 1, self.record);
draw_dub(buf, x + 8, y + 1, self.overdub);
draw_mon(buf, x + 15, y + 1, self.monitor);
Ok(Rect { x, y, width, height: 2 })
// Play/Pause button
&|buf: &mut Buffer, Rect { x, y, .. }: Rect|{
let style = Style::default().gray();
let style = Some(match &self.playing {
TransportState::Stopped => style.dim().bold(),
TransportState::Starting => style.not_dim().bold(),
TransportState::Rolling => style.not_dim().white().bold()
});
let label = match &self.playing {
TransportState::Rolling => "▶ PLAYING",
TransportState::Starting => "READY ...",
TransportState::Stopped => "⏹ STOPPED",
};
label.blit(buf, x, y, style)
},
// Record button/indicator
&|buf: &mut Buffer, Rect { x, y, .. }: Rect|{
"⏺ REC".blit(buf, x, y, Some(if self.record {
Style::default().bold().red()
} else {
Style::default().bold().dim()
}))
},
// Overdub button/indicator
&|buf: &mut Buffer, Rect { x, y, .. }: Rect|{
"⏺ DUB".blit(buf, x, y, Some(if self.overdub {
Style::default().bold().yellow()
} else {
Style::default().bold().dim()
}))
},
// Monitor button/indicator
&|buf: &mut Buffer, Rect { x, y, .. }: Rect|{
"⏺ MON".blit(buf, x, y, Some(if self.monitor {
Style::default().bold().green()
} else {
Style::default().bold().dim()
}))
},
// Time settings
&|buf: &mut Buffer, Rect { x, y, .. }: Rect|{
let style = Style::default().not_dim();
"BPM".blit(buf, x, y, Some(style))?;
format!("{}.{:03}", bpm, bpm % 1).blit(buf, x + 4, y, Some(style.bold()))?;
"SYNC".blit(buf, x + 13, y, Some(style))?;
"4/4".blit(buf, x + 18, y, Some(style.bold()))?;
"QUANT".blit(buf, x + 23, y, Some(style))?;
ppq_to_name(*quant).blit(buf, x + 29, y, Some(style.bold()))?;
Ok(Rect { x, y, width: 40, height: 1 })
},
// Clock
&|buf: &mut Buffer, Rect { x, y, .. }: Rect|{
let (beats, pulses) = (pulse / ppq, pulse % ppq);
let (bars, beats) = ((beats / 4) + 1, (beats % 4) + 1);
let (seconds, msecs) = (usecs / 1000000, usecs / 1000 % 1000);
let (minutes, seconds) = (seconds / 60, seconds % 60);
let timer = format!("{minutes}:{seconds:02}:{msecs:03} {bars}.{beats}.{pulses:02}");
timer.blit(buf, x - timer.len() as u16, y, Some(Style::default().not_dim()))
}
}
}
pub fn draw_timer (buf: &mut Buffer, x: u16, y: u16, ppq: usize, pulse: usize, usecs: usize) {
let (beats, pulses) = (pulse / ppq, pulse % ppq);
let (bars, beats) = ((beats / 4) + 1, (beats % 4) + 1);
let (seconds, msecs) = (usecs / 1000000, usecs / 1000 % 1000);
let (minutes, seconds) = (seconds / 60, seconds % 60);
let timer = format!("{minutes}:{seconds:02}:{msecs:03} {bars}.{beats}.{pulses:02}");
timer.blit(buf, x - timer.len() as u16, y, Some(Style::default().not_dim()));
}
pub fn draw_play_stop (buf: &mut Buffer, x: u16, y: u16, state: &TransportState) {
let style = Style::default().gray();
match state {
TransportState::Rolling => "▶ PLAYING",
TransportState::Starting => "READY ...",
TransportState::Stopped => "⏹ STOPPED",
}.blit(buf, x, y, Some(match state {
TransportState::Stopped => style.dim().bold(),
TransportState::Starting => style.not_dim().bold(),
TransportState::Rolling => style.not_dim().white().bold()
}));
}
pub fn draw_rec (buf: &mut Buffer, x: u16, y: u16, on: bool) {
"⏺ REC".blit(buf, x, y, Some(if on {
Style::default().bold().red()
} else {
Style::default().bold().dim()
}))
}
pub fn draw_dub (buf: &mut Buffer, x: u16, y: u16, on: bool) {
"⏺ DUB".blit(buf, x, y, Some(if on {
Style::default().bold().yellow()
} else {
Style::default().bold().dim()
}))
}
pub fn draw_mon (buf: &mut Buffer, x: u16, y: u16, on: bool) {
"⏺ MON".blit(buf, x, y, Some(if on {
Style::default().bold().green()
} else {
Style::default().bold().dim()
}))
}
pub fn draw_bpm (buf: &mut Buffer, x: u16, y: u16, bpm: usize, quant: usize) {
let style = Style::default().not_dim();
"BPM"
.blit(buf, x, y, Some(style));
format!("{}.{:03}", bpm as usize, bpm % 1)
.blit(buf, x + 4, y, Some(style.bold()));
"SYNC"
.blit(buf, x + 13, y, Some(style));
"4/4"
.blit(buf, x + 18, y, Some(style.bold()));
"QUANT"
.blit(buf, x + 23, y, Some(style));
ppq_to_name(quant)
.blit(buf, x + 29, y, Some(style.bold()));
}
]).render(buf, area)?;
area.height = 1;
Ok(area)
});