diff options
Diffstat (limited to 'gtk2_ardour/processor_box.cc')
| -rw-r--r-- | gtk2_ardour/processor_box.cc | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc index cb72162773..aa8f285a43 100644 --- a/gtk2_ardour/processor_box.cc +++ b/gtk2_ardour/processor_box.cc @@ -21,6 +21,10 @@ #include "gtk2ardour-config.h" #endif +#ifdef COMPILER_MSVC +#define rintf(x) round((x) + 0.5) +#endif + #include <cmath> #include <iostream> #include <set> @@ -47,6 +51,7 @@ #include "ardour/internal_send.h" #include "ardour/panner_shell.h" #include "ardour/plugin_insert.h" +#include "ardour/pannable.h" #include "ardour/port_insert.h" #include "ardour/profile.h" #include "ardour/return.h" @@ -441,7 +446,7 @@ ProcessorEntry::build_controls_menu () for (list<Control*>::iterator i = _controls.begin(); i != _controls.end(); ++i) { items.push_back (CheckMenuElem ((*i)->name ())); - CheckMenuItem* c = dynamic_cast<CheckMenuItem*> (&items.back ()); + Gtk::CheckMenuItem* c = dynamic_cast<Gtk::CheckMenuItem*> (&items.back ()); c->set_active ((*i)->visible ()); c->signal_toggled().connect (sigc::bind (sigc::mem_fun (*this, &ProcessorEntry::toggle_control_visibility), *i)); } @@ -467,7 +472,7 @@ ProcessorEntry::build_send_options_menu () if (send) { items.push_back (CheckMenuElem (_("Link panner controls"))); - CheckMenuItem* c = dynamic_cast<CheckMenuItem*> (&items.back ()); + Gtk::CheckMenuItem* c = dynamic_cast<Gtk::CheckMenuItem*> (&items.back ()); c->set_active (send->panner_shell()->is_linked_to_route()); c->signal_toggled().connect (sigc::mem_fun (*this, &ProcessorEntry::toggle_panner_link)); @@ -1454,7 +1459,8 @@ ProcessorBox::choose_insert () void 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 */ ChanCount outs = (_session->master_out()) @@ -2103,8 +2109,9 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr continue; } + boost::shared_ptr<Pannable> sendpan(new Pannable (*_session)); XMLNode n (**niter); - InternalSend* s = new InternalSend (*_session, _route->pannable(), _route->mute_master(), + InternalSend* s = new InternalSend (*_session, sendpan, _route->mute_master(), boost::shared_ptr<Route>(), Delivery::Aux); IOProcessor::prepare_for_reset (n, s->name()); @@ -2118,7 +2125,9 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr } else if (type->value() == "send") { + boost::shared_ptr<Pannable> sendpan(new Pannable (*_session)); XMLNode n (**niter); + Send* s = new Send (*_session, _route->pannable(), _route->mute_master()); IOProcessor::prepare_for_reset (n, s->name()); |