summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2011-07-19 13:08:11 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2011-07-19 13:08:11 +0000
commit57cb31ea6e79779ae571d02dd1fd8fa27f591c0c (patch)
tree0c23b62929d4edd5f4fc482203a68ba8212d80d0 /libs
parent828939a7f58c478a4f2d75e9559a35eaf77a9157 (diff)
check for _panshell->panner() before ::run-ing the panshell, so that MIDI tracks or other tracks with no panner just get the 1:1 copy-to-outputs code invoked
git-svn-id: svn://localhost/ardour2/branches/3.0@9902 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
-rw-r--r--libs/ardour/delivery.cc17
1 files changed, 1 insertions, 16 deletions
diff --git a/libs/ardour/delivery.cc b/libs/ardour/delivery.cc
index e7d435bacf..cf81207592 100644
--- a/libs/ardour/delivery.cc
+++ b/libs/ardour/delivery.cc
@@ -285,22 +285,7 @@ Delivery::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pf
Amp::apply_simple_gain (bufs, nframes, tgain);
}
-#if 0
- if (_session.transport_rolling()) {
- cerr << name() << " first value written : " << scnt << endl;
- for (BufferSet::audio_iterator b = bufs.audio_begin(); b != bufs.audio_end(); ++b) {
- Sample* p = b->data ();
- float s = (float) scnt;
- for (pframes_t n = 0; n < nframes; ++n) {
- p[n] = s * 0.001;
- s += 1.0;
- }
- }
- scnt += nframes;
- }
-#endif
-
- if (_panshell && !_panshell->bypassed()) {
+ if (_panshell && !_panshell->bypassed() && _panshell->panner()) {
// Use the panner to distribute audio to output port buffers