summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2009-03-24 13:43:36 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2009-03-24 13:43:36 +0000
commit21571906411af0f88344a3baf306ecfda408e15d (patch)
tree92e7e12b88585b5c86c5da45a5a6cdca6f0b0301 /libs
parentd6698e19070c2059530e373626b08fe13aa14e80 (diff)
possible fix for clipping in RB effect-created regions
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@4888 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
-rw-r--r--libs/ardour/audioregion.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/libs/ardour/audioregion.cc b/libs/ardour/audioregion.cc
index 287d9dbe46..9a627472d7 100644
--- a/libs/ardour/audioregion.cc
+++ b/libs/ardour/audioregion.cc
@@ -509,14 +509,18 @@ AudioRegion::read_at (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, n
uint32_t chan_n, nframes_t read_frames, nframes_t skip_frames) const
{
/* regular diskstream/butler read complete with fades etc */
- return _read_at (sources, _length, buf, mixdown_buffer, gain_buffer, file_position, cnt, chan_n, read_frames, skip_frames, ReadOps (~0));
+ return _read_at (sources, _length, buf, mixdown_buffer, gain_buffer, file_position, cnt,
+ chan_n, read_frames, skip_frames, ReadOps (~0));
}
nframes_t
AudioRegion::master_read_at (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, nframes_t position,
nframes_t cnt, uint32_t chan_n) const
{
- return _read_at (master_sources, master_sources.front()->length(), buf, mixdown_buffer, gain_buffer, position, cnt, chan_n, 0, 0);
+ /* do not read gain/scaling/fades and do not count this disk i/o in statistics */
+
+ return _read_at (master_sources, master_sources.front()->length(), buf, mixdown_buffer,
+ gain_buffer, position, cnt, chan_n, 0, 0, ReadOps (0));
}
nframes_t