smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-09 00:04:56 +01:00
Code Issues Projects Releases Wiki Activity

independent panning for external sends

Browse source
This commit is contained in:
Robin Gareus 2014-01-13 10:50:49 +01:00 • committed by Paul Davis
parent 533e0091b7
commit 113f28b6fe
4 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
gtk2_ardour/processor_box.cc
View file

@ -1403,7 +1403,8 @@ ProcessorBox::choose_insert ()
void void
ProcessorBox::choose_send () ProcessorBox::choose_send ()
{ {
boost::shared_ptr<Send> send (new Send (*_session, _route->pannable(), _route->mute_master())); boost::shared_ptr<Pannable> sendpan(new Pannable (*_session));
boost::shared_ptr<Send> send (new Send (*_session, sendpan, _route->mute_master()));
/* make an educated guess at the initial number of outputs for the send */ /* make an educated guess at the initial number of outputs for the send */
ChanCount outs = (_session->master_out()) ChanCount outs = (_session->master_out())
@ -2068,8 +2069,9 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr
} else if (type->value() == "send") { } else if (type->value() == "send") {
boost::shared_ptr<Pannable> sendpan(new Pannable (*_session));
XMLNode n (**niter); XMLNode n (**niter);
Send* s = new Send (*_session, _route->pannable(), _route->mute_master()); Send* s = new Send (*_session, sendpan, _route->mute_master());
IOProcessor::prepare_for_reset (n, s->name()); IOProcessor::prepare_for_reset (n, s->name());

5
gtk2_ardour/send_ui.cc
View file

@ -52,10 +52,7 @@ SendUI::SendUI (Gtk::Window* parent, boost::shared_ptr<Send> s, Session* session
_vbox.set_border_width (5); _vbox.set_border_width (5);
_vbox.pack_start (_hbox, false, false, false); _vbox.pack_start (_hbox, false, false, false);
// until sends have their own Pannable, don't show this _vbox.pack_start (_panners, false, false);
// because it controls the Route Pannable which confuses
// users (among others)
// _vbox.pack_start (_panners, false, false);
io = Gtk::manage (new IOSelector (parent, session, s->output())); io = Gtk::manage (new IOSelector (parent, session, s->output()));

2
libs/ardour/delivery.cc
View file

@ -396,7 +396,7 @@ Delivery::reset_panner ()
if (_panshell) { if (_panshell) {
_panshell->configure_io (ChanCount (DataType::AUDIO, pans_required()), ChanCount (DataType::AUDIO, pan_outs())); _panshell->configure_io (ChanCount (DataType::AUDIO, pans_required()), ChanCount (DataType::AUDIO, pan_outs()));
if (_role == Main || _role == Aux) { if (_role == Main || _role == Aux || _role == Send) {
_panshell->pannable()->set_panner (_panshell->panner()); _panshell->pannable()->set_panner (_panshell->panner());
} }
} }

6
libs/ardour/route.cc
View file

@ -1069,7 +1069,8 @@ Route::add_processor_from_xml_2X (const XMLNode& node, int version)
} else if (node.name() == "Send") { } else if (node.name() == "Send") {
processor.reset (new Send (_session, _pannable, _mute_master)); boost::shared_ptr<Pannable> sendpan (new Pannable (_session));
processor.reset (new Send (_session, sendpan, _mute_master));
} else { } else {
@ -2569,7 +2570,8 @@ Route::set_processor_state (const XMLNode& node)
} else if (prop->value() == "send") { } else if (prop->value() == "send") {
processor.reset (new Send (_session, _pannable, _mute_master)); boost::shared_ptr<Pannable> sendpan (new Pannable (_session));
processor.reset (new Send (_session, sendpan, _mute_master));
} else { } else {
error << string_compose(_("unknown Processor type \"%1\"; ignored"), prop->value()) << endmsg; error << string_compose(_("unknown Processor type \"%1\"; ignored"), prop->value()) << endmsg;