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

sampler, meter: switch to rms; reenable viewer

Browse source
This commit is contained in:
🪞👃🪞 2025-05-11 01:28:05 +03:00
parent 6db5df5210
commit b9c101081b
5 changed files with 45 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

9
crates/device/src/sampler/sampler_api.rs
View file

@ -57,14 +57,11 @@ impl SamplerCommand {
Self::record_begin(sampler, sample)
}
}
fn record_begin (sampler: &mut Sampler, sample: usize) -> Perhaps<Self> {
fn record_begin (sampler: &mut Sampler, pitch: usize) -> Perhaps<Self> {
sampler.recording = Some((
sample,
pitch,
Arc::new(RwLock::new(Sample::new(
"Sample",
0,
0,
vec![vec![];sampler.audio_ins.len()]
"Sample", 0, 0, vec![vec![];sampler.audio_ins.len()]
)))
));
Ok(None)

4
crates/device/src/sampler/sampler_audio.rs
View file

@ -41,7 +41,7 @@ impl Sampler {
for ((input, meter), channel) in samples_with_meters {
let slice = input.port().as_slice(scope);
length = length.max(slice.len());
*meter = to_log10(slice);
*meter = to_rms(slice);
channel.extend_from_slice(slice);
}
sample.end += length;
@ -51,7 +51,7 @@ impl Sampler {
fn update_input_meters (&mut self, scope: &ProcessScope) {
for (input, meter) in self.audio_ins.iter().zip(self.input_meters.iter_mut()) {
let slice = input.port().as_slice(scope);
*meter = to_log10(slice);
*meter = to_rms(slice);
}
}

4
crates/device/src/sampler/sampler_model.rs
View file

@ -52,8 +52,8 @@ impl Default for Sampler {
Self {
midi_in: None,
audio_ins: vec![],
input_meters: vec![f32::MIN;2],
output_meters: vec![f32::MIN;2],
input_meters: vec![0.0;2],
output_meters: vec![0.0;2],
audio_outs: vec![],
name: "tek_sampler".to_string(),
mapped: [const { None };128],

21
crates/device/src/sampler/sampler_view.rs
View file

@ -90,13 +90,14 @@ impl Sampler {
}
pub fn view_sample (&self, note_pt: usize) -> impl Content<TuiOut> + use<'_> {
Outer(true, Style::default().fg(Tui::g(96))).enclose(draw_viewer(if let Some((_, sample)) = &self.recording {
Some(sample)
} else if let Some(sample) = &self.mapped[note_pt] {
Some(sample)
} else {
None
}))
Outer(true, Style::default().fg(Tui::g(96)))
.enclose(Fill::xy(draw_viewer(if let Some((_, sample)) = &self.recording {
Some(sample)
} else if let Some(sample) = &self.mapped[note_pt] {
Some(sample)
} else {
None
})))
}
pub fn status (&self, index: usize) -> impl Content<TuiOut> {
@ -105,13 +106,13 @@ impl Sampler {
pub fn view_meters_input (&self) -> impl Content<TuiOut> + use<'_> {
Tui::bg(Black, Fixed::x(2, Map::east(1, ||self.input_meters.iter(), |value, _index|{
Fill::y(Meter(*value))
Fill::y(RmsMeter(*value))
})))
}
pub fn view_meters_output (&self) -> impl Content<TuiOut> + use<'_> {
Tui::bg(Black, Fixed::x(2, Map::east(1, ||self.output_meters.iter(), |value, _index|{
Fill::y(Meter(*value))
Fill::y(RmsMeter(*value))
})))
}
}
@ -132,7 +133,7 @@ fn draw_list_item (sample: &Option<Arc<RwLock<Sample>>>) -> String {
}
fn draw_viewer (sample: Option<&Arc<RwLock<Sample>>>) -> impl Content<TuiOut> + use<'_> {
let min_db = -40.0;
let min_db = -64.0;
ThunkRender::new(move|to: &mut TuiOut|{
let [x, y, width, height] = to.area();
let area = Rect { x, y, width, height };