smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 15:25:01 +01:00
Code Issues Projects Releases Wiki Activity

AudioRegion::read_peaks() should return 0 or the number of peaks read, not the number of samples

Browse source
This commit is contained in:
Paul Davis 2015-06-02 12:08:02 -04:00
parent 9706125526
commit 88aaf587ad
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
libs/ardour/audioregion.cc
View file

@ -426,15 +426,16 @@ AudioRegion::read_peaks (PeakData *buf, framecnt_t npeaks, framecnt_t offset, fr
if (audio_source(chan_n)->read_peaks (buf, npeaks, offset, cnt, frames_per_pixel)) { if (audio_source(chan_n)->read_peaks (buf, npeaks, offset, cnt, frames_per_pixel)) {
return 0; return 0;
} else { }
if (_scale_amplitude != 1.0f) {
for (framecnt_t n = 0; n < npeaks; ++n) { if (_scale_amplitude != 1.0f) {
buf[n].max *= _scale_amplitude; for (framecnt_t n = 0; n < npeaks; ++n) {
buf[n].min *= _scale_amplitude; buf[n].max *= _scale_amplitude;
} buf[n].min *= _scale_amplitude;
} }
return cnt;
} }
return npeaks;
} }
/** @param buf Buffer to write data to (existing data will be overwritten). /** @param buf Buffer to write data to (existing data will be overwritten).