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

remove Samplerviewer, SamplerStatus

Browse source
This commit is contained in:
🪞👃🪞 2025-01-11 19:13:59 +01:00
parent 532b648a9e
commit a9cad18891
2 changed files with 59 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

118
sampler/src/sampler_tui.rs
View file

@ -124,68 +124,66 @@ render!(TuiOut: (self: SampleList<'a>) => {
})) }))
}); });
impl Sampler { impl Sampler {
const EMPTY: &[(f64, f64)] = &[(0., 0.), (1., 1.), (2., 2.), (0., 2.), (2., 0.)];
pub fn viewer (&self, note_pt: usize) -> impl Content<TuiOut> { pub fn viewer (&self, note_pt: usize) -> impl Content<TuiOut> {
if let Some((_, sample)) = &self.recording { let sample = if let Some((_, sample)) = &self.recording {
SampleViewer(Some(sample.clone())) Some(sample.clone())
} else if let Some(sample) = &self.mapped[note_pt] { } else if let Some(sample) = &self.mapped[note_pt] {
SampleViewer(Some(sample.clone())) Some(sample.clone())
} else { } else {
SampleViewer(None) None
} };
let min_db = -40.0;
RenderThunk::new(move|to: &mut TuiOut|{
let [x, y, width, height] = to.area();
let area = Rect { x, y, width, height };
let (x_bounds, y_bounds, lines): ([f64;2], [f64;2], Vec<Line>) =
if let Some(sample) = &sample {
let sample = sample.read().unwrap();
let start = sample.start as f64;
let end = sample.end as f64;
let length = end - start;
let step = length / width as f64;
let mut t = start;
let mut lines = vec![];
while t < end {
let chunk = &sample.channels[0][t as usize..((t + step) as usize).min(sample.end)];
let total: f32 = chunk.iter().map(|x|x.abs()).sum();
let count = chunk.len() as f32;
let meter = 10. * (total / count).log10();
let x = t as f64;
let y = meter as f64;
lines.push(Line::new(x, min_db, x, y, Color::Green));
t += step / 2.;
}
(
[sample.start as f64, sample.end as f64],
[min_db, 0.],
lines
)
} else {
(
[0.0, width as f64],
[0.0, height as f64],
vec![
Line::new(0.0, 0.0, width as f64, height as f64, Color::Red),
Line::new(width as f64, 0.0, 0.0, height as f64, Color::Red),
]
)
};
Canvas::default()
.x_bounds(x_bounds)
.y_bounds(y_bounds)
.paint(|ctx| { for line in lines.iter() { ctx.draw(line) } })
.render(area, &mut to.buffer);
})
}
pub fn status (&self, index: usize) -> impl Content<TuiOut> {
Tui::bold(true, Tui::fg(TuiTheme::g(224), self.mapped[index].as_ref().map(|sample|format!(
"Sample {}-{}",
sample.read().unwrap().start,
sample.read().unwrap().end,
)).unwrap_or_else(||"No sample".to_string())))
} }
} }
const EMPTY: &[(f64, f64)] = &[(0., 0.), (1., 1.), (2., 2.), (0., 2.), (2., 0.)];
pub struct SampleViewer(pub Option<Arc<RwLock<Sample>>>);
render!(TuiOut: |self: SampleViewer, to|{
let [x, y, width, height] = to.area();
let area = Rect { x, y, width, height };
let min_db = -40.0;
let (x_bounds, y_bounds, lines): ([f64;2], [f64;2], Vec<Line>) =
if let Some(sample) = &self.0 {
let sample = sample.read().unwrap();
let start = sample.start as f64;
let end = sample.end as f64;
let length = end - start;
let step = length / width as f64;
let mut t = start;
let mut lines = vec![];
while t < end {
let chunk = &sample.channels[0][t as usize..((t + step) as usize).min(sample.end)];
let total: f32 = chunk.iter().map(|x|x.abs()).sum();
let count = chunk.len() as f32;
let meter = 10. * (total / count).log10();
let x = t as f64;
let y = meter as f64;
lines.push(Line::new(x, min_db, x, y, Color::Green));
t += step / 2.;
}
(
[sample.start as f64, sample.end as f64],
[min_db, 0.],
lines
)
} else {
(
[0.0, width as f64],
[0.0, height as f64],
vec![
Line::new(0.0, 0.0, width as f64, height as f64, Color::Red),
Line::new(width as f64, 0.0, 0.0, height as f64, Color::Red),
]
)
};
Canvas::default()
.x_bounds(x_bounds)
.y_bounds(y_bounds)
.paint(|ctx| { for line in lines.iter() { ctx.draw(line) } })
.render(area, &mut to.buffer);
});
pub struct SamplerStatus<'a>(pub &'a Sampler, pub usize);
render!(TuiOut: (self: SamplerStatus<'a>) => Tui::bold(true, Tui::fg(TuiTheme::g(224), self.0.mapped[self.1].as_ref().map(|sample|format!(
"Sample {}-{}",
sample.read().unwrap().start,
sample.read().unwrap().end,
)).unwrap_or_else(||"No sample".to_string()))));

2
tek/src/groovebox.rs
View file

@ -80,7 +80,7 @@ impl Groovebox {
let sample_h = if self.compact { 0 } else { 5 }; let sample_h = if self.compact { 0 } else { 5 };
Max::y(sample_h, Fill::xy( Max::y(sample_h, Fill::xy(
Bsp::a( Bsp::a(
Fill::x(Align::w(Fixed::y(1, SamplerStatus(&self.sampler, note_pt)))), Fill::x(Align::w(Fixed::y(1, self.sampler.status(note_pt)))),
self.sampler.viewer(note_pt)))) self.sampler.viewer(note_pt))))
} }
fn pool_view (&self) -> impl Content<TuiOut> + use<'_> { fn pool_view (&self) -> impl Content<TuiOut> + use<'_> {