From abeeda47a9e3adf56acbb0cd149852b40dd1f4d9 Mon Sep 17 00:00:00 2001 From: carlh Date: Tue, 19 Jul 2011 00:22:08 +0000 Subject: [PATCH] Make _read_at take notice of its srcs parameter; fixes part of #3908. git-svn-id: http://subversion.ardour.org/svn/ardour2/ardour2/branches/3.0@9900 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/audioregion.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/ardour/audioregion.cc b/libs/ardour/audioregion.cc index 808d45bba..c0de894e7 100644 --- a/libs/ardour/audioregion.cc +++ b/libs/ardour/audioregion.cc @@ -369,7 +369,7 @@ AudioRegion::master_read_at (Sample *buf, Sample *mixdown_buffer, float *gain_bu } framecnt_t -AudioRegion::_read_at (const SourceList& /*srcs*/, framecnt_t limit, +AudioRegion::_read_at (const SourceList& srcs, framecnt_t limit, Sample *buf, Sample *mixdown_buffer, float *gain_buffer, framepos_t position, framecnt_t cnt, @@ -421,7 +421,7 @@ AudioRegion::_read_at (const SourceList& /*srcs*/, framecnt_t limit, if (chan_n < n_channels()) { - boost::shared_ptr src = audio_source(chan_n); + boost::shared_ptr src = boost::dynamic_pointer_cast (srcs[chan_n]); if (src->read (mixdown_buffer, _start + internal_offset, to_read) != to_read) { return 0; /* "read nothing" */ } @@ -441,7 +441,7 @@ AudioRegion::_read_at (const SourceList& /*srcs*/, framecnt_t limit, */ uint32_t channel = n_channels() % chan_n; - boost::shared_ptr src = audio_source (channel); + boost::shared_ptr src = boost::dynamic_pointer_cast (srcs[channel]); if (src->read (mixdown_buffer, _start + internal_offset, to_read) != to_read) { return 0; /* "read nothing" */ -- 2.11.4.GIT