diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2014-01-02 09:16:28 -0500 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-01-02 09:16:28 -0500 |
commit | e7c47747286c16aa575456b07120e1e8e8271bd5 (patch) | |
tree | 7b74a91fcf5685271f2b90d57a3658c4051dbe84 /libs/ardour/audioregion.cc | |
parent | 393ff4015349318b404d9e799292ce194645df09 (diff) | |
parent | b439b79813a562278e5fc9ac088e4ca1fbf9f6cb (diff) |
Merge branch 'master' into cairocanvas
Diffstat (limited to 'libs/ardour/audioregion.cc')
-rw-r--r-- | libs/ardour/audioregion.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/ardour/audioregion.cc b/libs/ardour/audioregion.cc index 0909140f91..331de043cd 100644 --- a/libs/ardour/audioregion.cc +++ b/libs/ardour/audioregion.cc @@ -744,7 +744,7 @@ AudioRegion::read_from_sources (SourceList const & srcs, framecnt_t limit, Sampl /* copy an existing channel's data in for this non-existant one */ - uint32_t channel = n_channels() % chan_n; + uint32_t channel = chan_n % n_channels(); boost::shared_ptr<AudioSource> src = boost::dynamic_pointer_cast<AudioSource> (srcs[channel]); if (src->read (buf, _start + internal_offset, to_read) != to_read) { |