ensure that the main outs' panner <-> pannable relationship is setup in a new session
git-svn-id: svn://localhost/ardour2/branches/3.0@8641 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
953c5b575d
commit
07cadd6fca
@ -24,6 +24,7 @@
|
|||||||
|
|
||||||
#include "ardour/midi_buffer.h"
|
#include "ardour/midi_buffer.h"
|
||||||
|
|
||||||
|
#include "ardour/debug.h"
|
||||||
#include "ardour/delivery.h"
|
#include "ardour/delivery.h"
|
||||||
#include "ardour/audio_buffer.h"
|
#include "ardour/audio_buffer.h"
|
||||||
#include "ardour/amp.h"
|
#include "ardour/amp.h"
|
||||||
@ -97,6 +98,7 @@ Delivery::Delivery (Session& s, boost::shared_ptr<Pannable> pannable, boost::sha
|
|||||||
|
|
||||||
Delivery::~Delivery()
|
Delivery::~Delivery()
|
||||||
{
|
{
|
||||||
|
DEBUG_TRACE (DEBUG::Destruction, string_compose ("delivery %1 destructor\n", _name));
|
||||||
delete _output_buffers;
|
delete _output_buffers;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -307,8 +309,6 @@ Delivery::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pf
|
|||||||
if (bufs.count().n_midi() > 0 && ports.count().n_midi () > 0) {
|
if (bufs.count().n_midi() > 0 && ports.count().n_midi () > 0) {
|
||||||
_output->copy_to_outputs (bufs, DataType::MIDI, nframes, _output_offset);
|
_output->copy_to_outputs (bufs, DataType::MIDI, nframes, _output_offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
out:
|
out:
|
||||||
@ -382,8 +382,10 @@ Delivery::reset_panner ()
|
|||||||
|
|
||||||
_panshell->configure_io (ChanCount (DataType::AUDIO, pans_required()), ChanCount (DataType::AUDIO, ntargets));
|
_panshell->configure_io (ChanCount (DataType::AUDIO, pans_required()), ChanCount (DataType::AUDIO, ntargets));
|
||||||
|
|
||||||
|
if (_role == Main) {
|
||||||
|
_panshell->pannable()->set_panner (_panshell->panner());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
panner_legal_c.disconnect ();
|
panner_legal_c.disconnect ();
|
||||||
|
Loading…
Reference in New Issue
Block a user