ardour/livetrax
13
0
Fork 0
Code

Prefer AudioBuffer reference over raw buffer

Browse Source 
This allows for consistent libardour API usage, in particular Amp.
This commit is contained in:
Robin Gareus 2019-02-07 15:27:35 +01:00
parent 18af4dd55a
commit 8dda9f4ca8
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libs/ardour/disk_reader.cc
View File

@ -325,15 +325,8 @@ DiskReader::run (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_samp
ChannelInfo* chaninfo (*chan);
AudioBuffer& output (bufs.get_audio (n%n_buffers));
Sample* disk_signal = 0; /* assignment not really needed but it keeps the compiler quiet and helps track bugs */
if (ms & MonitoringInput) {
/* put disk stream in scratch buffer, blend at end */
disk_signal = scratch_bufs.get_audio(n).data ();
} else {
/* no input stream needed, just overwrite buffers */
disk_signal = output.data ();
}
AudioBuffer& disk_buf ((ms & MonitoringInput) ? scratch_bufs.get_audio(n) : output);
if (start_sample != playback_sample) {
cerr << owner()->name() << " playback @ " << start_sample << " not aligned with " << playback_sample << " jump " << (start_sample - playback_sample) << endl;
@ -348,8 +341,7 @@ DiskReader::run (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_samp
}
if (speed != 0.0) {
assert (disk_signal);
const samplecnt_t total = chaninfo->rbuf->read (disk_signal, disk_samples_to_consume);
const samplecnt_t total = chaninfo->rbuf->read (disk_buf.data(), disk_samples_to_consume);
if (disk_samples_to_consume > total) {
cerr << _name << " Need " << disk_samples_to_consume << " total = " << total << endl;
cerr << "underrun for " << _name << endl;
@ -361,12 +353,12 @@ DiskReader::run (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_samp
}
if (scaling != 1.0f && speed != 0.0) {
apply_gain_to_buffer (disk_signal, disk_samples_to_consume, scaling);
Amp::apply_simple_gain (disk_buf, disk_samples_to_consume, scaling);
}
if (ms & MonitoringInput) {
/* mix the disk signal into the input signal (already in bufs) */
mix_buffers_no_gain (output.data(), disk_signal, disk_samples_to_consume);
mix_buffers_no_gain (output.data(), disk_buf.data(), disk_samples_to_consume);
}
}
}