sergey/nih-plug
1
0
Fork 0
mirror of https://github.com/robbert-vdh/nih-plug.git synced 2026-07-01 02:36:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename Buffer::len() to Buffer::samples()

Browse Source 
To reduce ambiguity.
This commit is contained in:
Robbert van der Helm
2023-01-05 16:03:23 +01:00
parent 9e1a888b38
commit cb827d18dd
9 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
plugins/spectral_compressor/src/dry_wet_mixer.rs
View File

@@ -84,10 +84,12 @@ impl DryWetMixer {
assert_eq!(buffer.channels(), self.delay_line.len());
let delay_line_len = self.delay_line[0].len();
assert!(buffer.len() <= delay_line_len);
assert!(buffer.samples() <= delay_line_len);
let num_samples_before_wrap = buffer.len().min(delay_line_len - self.next_write_position);
let num_samples_after_wrap = buffer.len() - num_samples_before_wrap;
let num_samples_before_wrap = buffer
.samples()
.min(delay_line_len - self.next_write_position);
let num_samples_after_wrap = buffer.samples() - num_samples_before_wrap;
for (buffer_channel, delay_line) in buffer
.as_slice_immutable()
@@ -101,7 +103,7 @@ impl DryWetMixer {
.copy_from_slice(&buffer_channel[num_samples_before_wrap..]);
}
self.next_write_position = (self.next_write_position + buffer.len()) % delay_line_len;
self.next_write_position = (self.next_write_position + buffer.samples()) % delay_line_len;
}
/// Mix the dry signal into the buffer. The ratio is a `[0, 1]` integer where 0 results in an
@@ -134,12 +136,13 @@ impl DryWetMixer {
assert_eq!(buffer.channels(), self.delay_line.len());
let delay_line_len = self.delay_line[0].len();
assert!(buffer.len() + latency <= delay_line_len);
assert!(buffer.samples() + latency <= delay_line_len);
let read_position =
(self.next_write_position + delay_line_len - buffer.len() - latency) % delay_line_len;
let num_samples_before_wrap = buffer.len().min(delay_line_len - read_position);
let num_samples_after_wrap = buffer.len() - num_samples_before_wrap;
(self.next_write_position + delay_line_len - buffer.samples() - latency)
% delay_line_len;
let num_samples_before_wrap = buffer.samples().min(delay_line_len - read_position);
let num_samples_after_wrap = buffer.samples() - num_samples_before_wrap;
for (buffer_channel, delay_line) in buffer.as_slice().iter_mut().zip(self.delay_line.iter())
{

2
plugins/spectral_compressor/src/lib.rs
View File

@@ -449,7 +449,7 @@ impl Plugin for SpectralCompressor {
.global
.dry_wet_ratio
.smoothed
.next_step(buffer.len() as u32),
.next_step(buffer.samples() as u32),
// The dry and wet signals are in phase, so we can do a linear mix
dry_wet_mixer::MixingStyle::Linear,
self.stft.latency_samples() as usize,