diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-01-27 01:31:03 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-01-27 01:31:03 +0000 |
| commit | 15b5fce90480490455237da917167b0bcb5ce946 (patch) | |
| tree | 5c1c5929a83c05db1a901e775fefe4f6cf8dc1b7 /libs/ardour/auditioner.cc | |
| parent | 1385643131a2b2231bbbc0c584c76883fcfb580a (diff) | |
merge 3.0-panexp (pan experiments) branch, revisions 8534-8585 into 3.0, thus ending 3.0-panexp. THIS COMMIT WILL BREAK ALL EXISTING 3.0 SESSIONS IN SOME WAY (possibly not fatally).
git-svn-id: svn://localhost/ardour2/branches/3.0@8586 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/auditioner.cc')
| -rw-r--r-- | libs/ardour/auditioner.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/ardour/auditioner.cc b/libs/ardour/auditioner.cc index d7605f26e1..209d26dc30 100644 --- a/libs/ardour/auditioner.cc +++ b/libs/ardour/auditioner.cc @@ -30,6 +30,7 @@ #include "ardour/auditioner.h" #include "ardour/audioplaylist.h" #include "ardour/audio_port.h" +#include "ardour/panner_shell.h" #include "ardour/panner.h" #include "ardour/data_type.h" #include "ardour/region_factory.h" @@ -139,7 +140,8 @@ Auditioner::audition_current_playlist () /* force a panner reset now that we have all channels */ - _main_outs->panner()->reset (n_outputs().n_audio(), _diskstream->n_channels().n_audio()); + _main_outs->panner_shell()->configure_io (ChanCount (DataType::AUDIO, _diskstream->n_channels().n_audio()), + ChanCount (DataType::AUDIO, n_outputs().n_audio())); g_atomic_int_set (&_auditioning, 1); } |