diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2017-06-11 14:30:34 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2017-09-18 11:40:53 -0400 |
| commit | eb24353cadf6e25a26283cd9faad0bca0d118326 (patch) | |
| tree | 7162a02c1ec53080829e3f4f499e62dffe88e6f8 /libs/ardour/disk_reader.cc | |
| parent | 51865535b1c9064d38c06ebbd85184052e7d89cc (diff) | |
move channel-count setting for DiskReader so that it actually reflects the correct numbers
Diffstat (limited to 'libs/ardour/disk_reader.cc')
| -rw-r--r-- | libs/ardour/disk_reader.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/libs/ardour/disk_reader.cc b/libs/ardour/disk_reader.cc index 833541d726..d84dc52a63 100644 --- a/libs/ardour/disk_reader.cc +++ b/libs/ardour/disk_reader.cc @@ -333,7 +333,6 @@ DiskReader::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, return; } - } if (scaling != 1.0f) { @@ -368,6 +367,8 @@ DiskReader::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, playback_sample += playback_distance; } + ChanCount cnt; + if (_playlists[DataType::AUDIO]) { if (!c->empty()) { if (_slaved) { @@ -384,6 +385,8 @@ DiskReader::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, } } } + + cnt.set (DataType::AUDIO, bufs.count().n_audio()); } if (_playlists[DataType::MIDI]) { @@ -435,14 +438,13 @@ DiskReader::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, } else { _need_butler = true; } + + cnt.set (DataType::MIDI, 1); + } DEBUG_TRACE (DEBUG::Butler, string_compose ("%1 reader run, needs butler = %2\n", name(), _need_butler)); - /* make sure bufs shows whatever data we had available */ - ChanCount cnt; - cnt.set (DataType::MIDI, 1); - cnt.set (DataType::AUDIO, bufs.count().n_audio()); bufs.set_count (cnt); } |