X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fpanner_ui.cc;h=d20d719b14cb4e3d4e338378bce5843c5a966d69;hb=ecb92f474f8f39e04f2aee02dabab7fa03af6c19;hp=cd35bc2d8841398192a1e8e2eec0e3323d41b6c4;hpb=f0250cddef5eb4968729437e29c3f1f9883f6351;p=ardour.git diff --git a/gtk2_ardour/panner_ui.cc b/gtk2_ardour/panner_ui.cc index cd35bc2d88..d20d719b14 100644 --- a/gtk2_ardour/panner_ui.cc +++ b/gtk2_ardour/panner_ui.cc @@ -18,13 +18,16 @@ #include -#include "ardour/io.h" -#include "ardour/dB.h" #include #include -#include "midi++/manager.h" + #include "pbd/fastlog.h" +#include "ardour/pannable.h" +#include "ardour/panner.h" +#include "ardour/panner_shell.h" +#include "ardour/session.h" + #include "ardour_ui.h" #include "panner_ui.h" #include "panner2d.h" @@ -33,12 +36,6 @@ #include "stereo_panner.h" #include "mono_panner.h" -#include "ardour/delivery.h" -#include "ardour/session.h" -#include "ardour/panner.h" -#include "ardour/pannable.h" -#include "ardour/route.h" - #include "i18n.h" using namespace std; @@ -52,8 +49,10 @@ const int PannerUI::pan_bar_height = 35; PannerUI::PannerUI (Session* s) : _current_nouts (-1) , _current_nins (-1) + , _current_uri ("") , pan_automation_style_button ("") , pan_automation_state_button ("") + , _panner_list() { set_session (s); @@ -63,6 +62,7 @@ PannerUI::PannerUI (Session* s) pan_astyle_menu = 0; in_pan_update = false; _stereo_panner = 0; + _mono_panner = 0; _ignore_width_change = false; _ignore_position_change = false; @@ -91,8 +91,11 @@ PannerUI::PannerUI (Session* s) } void -PannerUI::set_panner (boost::shared_ptr p) +PannerUI::set_panner (boost::shared_ptr ps, boost::shared_ptr p) { + /* note that the panshell might not change here (i.e. ps == _panshell) + */ + connections.drop_connections (); delete pan_astyle_menu; @@ -101,6 +104,7 @@ PannerUI::set_panner (boost::shared_ptr p) delete pan_astate_menu; pan_astate_menu = 0; + _panshell = ps; _panner = p; delete twod_panner; @@ -109,12 +113,14 @@ PannerUI::set_panner (boost::shared_ptr p) delete _stereo_panner; _stereo_panner = 0; + delete _mono_panner; + _mono_panner = 0; + if (!_panner) { return; } - _panner->Changed.connect (connections, invalidator (*this), boost::bind (&PannerUI::panner_changed, this, this), gui_context()); - _panner->StateChanged.connect (connections, invalidator (*this), boost::bind (&PannerUI::update_pan_state, this), gui_context()); + _panshell->Changed.connect (connections, invalidator (*this), boost::bind (&PannerUI::panshell_changed, this), gui_context()); /* new panner object, force complete reset of panner GUI */ @@ -122,10 +128,9 @@ PannerUI::set_panner (boost::shared_ptr p) _current_nouts = 0; _current_nins = 0; - panner_changed (0); + setup_pan (); update_pan_sensitive (); pan_automation_state_changed (); - } void @@ -140,9 +145,12 @@ PannerUI::build_astate_menu () pan_astate_menu->items().clear (); } - pan_astate_menu->items().push_back (MenuElem (_("Manual"), sigc::bind ( + /** TRANSLATORS: this is `Manual' in the sense of automation not being played, + so that changes to pan must be done by hand. + */ + pan_astate_menu->items().push_back (MenuElem (S_("Automation|Manual"), sigc::bind ( sigc::mem_fun (_panner.get(), &Panner::set_automation_state), - (AutoState) Off))); + (AutoState) ARDOUR::Off))); pan_astate_menu->items().push_back (MenuElem (_("Play"), sigc::bind ( sigc::mem_fun (_panner.get(), &Panner::set_automation_state), (AutoState) Play))); @@ -171,13 +179,6 @@ PannerUI::build_astyle_menu () pan_astyle_menu->items().push_back (MenuElem (_("Abs"))); } -boost::shared_ptr -PannerUI::get_controllable() -{ - assert (!pan_bars.empty()); - return pan_bars[0]->get_controllable(); -} - void PannerUI::on_size_allocate (Allocation& a) { @@ -192,119 +193,107 @@ PannerUI::set_width (Width w) PannerUI::~PannerUI () { - for (vector::iterator i = pan_bars.begin(); i != pan_bars.end(); ++i) { - delete (*i); - } - delete twod_panner; delete big_window; delete pan_menu; delete pan_astyle_menu; delete pan_astate_menu; delete _stereo_panner; + delete _mono_panner; } - void -PannerUI::panner_changed (void* src) +PannerUI::panshell_changed () { + set_panner (_panshell, _panshell->panner()); setup_pan (); } -void -PannerUI::update_pan_state () -{ - /* currently nothing to do */ -} - void PannerUI::setup_pan () { - if (!_panner) { - return; - } + int const nouts = _panner ? _panner->out().n_audio() : -1; + int const nins = _panner ? _panner->in().n_audio() : -1; - uint32_t const nouts = _panner->out().n_audio(); - uint32_t const nins = _panner->in().n_audio(); - - if (int32_t (nouts) == _current_nouts && int32_t (nins) == _current_nins) { + if (nouts == _current_nouts + && nins == _current_nins + && _current_uri == _panshell->panner_gui_uri() + ) + { return; } + _current_nins = nins; + _current_nouts = nouts; + _current_uri = _panshell->panner_gui_uri(); + container_clear (pan_vbox); delete twod_panner; twod_panner = 0; delete _stereo_panner; _stereo_panner = 0; - - if (nouts == 0 || nouts == 1) { + delete _mono_panner; + _mono_panner = 0; - delete _stereo_panner; - delete twod_panner; + if (!_panner) { + delete big_window; + big_window = 0; + return; + } - /* stick something into the panning viewport so that it redraws */ + if (_current_uri == "http://ardour.org/plugin/panner_2in2out#ui") + { + delete big_window; + big_window = 0; - EventBox* eb = manage (new EventBox()); - pan_vbox.pack_start (*eb, false, false); + boost::shared_ptr pannable = _panner->pannable(); - } else if (nouts == 2) { - - if (nins == 2) { - - /* add integrated 2in/2out panner GUI */ - - boost::shared_ptr pannable = _panner->pannable(); - - _stereo_panner = new StereoPanner (_panner); - _stereo_panner->set_size_request (-1, pan_bar_height); - pan_vbox.pack_start (*_stereo_panner, false, false); - - boost::shared_ptr ac; - - ac = pannable->pan_azimuth_control; - _stereo_panner->StartPositionGesture.connect (sigc::bind (sigc::mem_fun (*this, &PannerUI::start_touch), - boost::weak_ptr (ac))); - _stereo_panner->StopPositionGesture.connect (sigc::bind (sigc::mem_fun (*this, &PannerUI::stop_touch), - boost::weak_ptr(ac))); - - ac = pannable->pan_width_control; - _stereo_panner->StartWidthGesture.connect (sigc::bind (sigc::mem_fun (*this, &PannerUI::start_touch), - boost::weak_ptr (ac))); - _stereo_panner->StopWidthGesture.connect (sigc::bind (sigc::mem_fun (*this, &PannerUI::stop_touch), - boost::weak_ptr(ac))); - - } else if (nins == 1) { - /* 1-in/2out */ - - MonoPanner* mp; - boost::shared_ptr pannable = _panner->pannable(); - boost::shared_ptr ac = pannable->pan_azimuth_control; - - mp = new MonoPanner (ac); - - mp->StartGesture.connect (sigc::bind (sigc::mem_fun (*this, &PannerUI::start_touch), - boost::weak_ptr (ac))); - mp->StopGesture.connect (sigc::bind (sigc::mem_fun (*this, &PannerUI::stop_touch), - boost::weak_ptr(ac))); - - mp->signal_button_release_event().connect (sigc::mem_fun(*this, &PannerUI::pan_button_event)); - - mp->set_size_request (-1, pan_bar_height); - - update_pan_sensitive (); - pan_vbox.pack_start (*mp, false, false); - - } else { - warning << string_compose (_("No panner user interface is currently available for %1-in/2out tracks/busses"), - nins) << endmsg; - } + _stereo_panner = new StereoPanner (_panshell); + _stereo_panner->set_size_request (-1, pan_bar_height); + pan_vbox.pack_start (*_stereo_panner, false, false); + boost::shared_ptr ac; - } else { + ac = pannable->pan_azimuth_control; + _stereo_panner->StartPositionGesture.connect (sigc::bind (sigc::mem_fun (*this, &PannerUI::start_touch), + boost::weak_ptr (ac))); + _stereo_panner->StopPositionGesture.connect (sigc::bind (sigc::mem_fun (*this, &PannerUI::stop_touch), + boost::weak_ptr(ac))); + + ac = pannable->pan_width_control; + _stereo_panner->StartWidthGesture.connect (sigc::bind (sigc::mem_fun (*this, &PannerUI::start_touch), + boost::weak_ptr (ac))); + _stereo_panner->StopWidthGesture.connect (sigc::bind (sigc::mem_fun (*this, &PannerUI::stop_touch), + boost::weak_ptr(ac))); + _stereo_panner->signal_button_release_event().connect (sigc::mem_fun(*this, &PannerUI::pan_button_event)); + } + else if (_current_uri == "http://ardour.org/plugin/panner_1in2out#ui" + || _current_uri == "http://ardour.org/plugin/panner_balance#ui") + { + delete big_window; + big_window = 0; + boost::shared_ptr pannable = _panner->pannable(); + boost::shared_ptr ac = pannable->pan_azimuth_control; + + _mono_panner = new MonoPanner (_panshell); + + _mono_panner->StartGesture.connect (sigc::bind (sigc::mem_fun (*this, &PannerUI::start_touch), + boost::weak_ptr (ac))); + _mono_panner->StopGesture.connect (sigc::bind (sigc::mem_fun (*this, &PannerUI::stop_touch), + boost::weak_ptr(ac))); + + _mono_panner->signal_button_release_event().connect (sigc::mem_fun(*this, &PannerUI::pan_button_event)); + _mono_panner->set_size_request (-1, pan_bar_height); + + update_pan_sensitive (); + pan_vbox.pack_start (*_mono_panner, false, false); + } + else if (_current_uri == "http://ardour.org/plugin/panner_vbap#ui") + { if (!twod_panner) { - twod_panner = new Panner2d (_panner, 61); + twod_panner = new Panner2d (_panshell, 61); twod_panner->set_name ("MixerPanZone"); twod_panner->show (); twod_panner->signal_button_press_event().connect (sigc::mem_fun(*this, &PannerUI::pan_button_event), false); @@ -312,17 +301,26 @@ PannerUI::setup_pan () update_pan_sensitive (); twod_panner->reset (nins); - if (big_window) { - big_window->reset (nins); - } + if (big_window) { + big_window->reset (nins); + } twod_panner->set_size_request (-1, 61); /* and finally, add it to the panner frame */ - pan_vbox.pack_start (*twod_panner, false, false); + pan_vbox.pack_start (*twod_panner, false, false); + } + else + { + /* stick something into the panning viewport so that it redraws */ + EventBox* eb = manage (new EventBox()); + pan_vbox.pack_start (*eb, false, false); + + delete big_window; + big_window = 0; } - pan_vbox.show_all (); + pan_vbox.show_all (); } void @@ -352,7 +350,7 @@ PannerUI::pan_button_event (GdkEventButton* ev) case 1: if (twod_panner && ev->type == GDK_2BUTTON_PRESS) { if (!big_window) { - big_window = new Panner2dWindow (_panner, 400, _panner->in().n_audio()); + big_window = new Panner2dWindow (_panshell, 400, _panner->in().n_audio()); } big_window->show (); return true; @@ -384,42 +382,84 @@ PannerUI::build_pan_menu () items.clear (); items.push_back (CheckMenuElem (_("Bypass"), sigc::mem_fun(*this, &PannerUI::pan_bypass_toggle))); - bypass_menu_item = static_cast (&items.back()); + bypass_menu_item = static_cast (&items.back()); /* set state first, connect second */ - bypass_menu_item->set_active (_panner->bypassed()); + bypass_menu_item->set_active (_panshell->bypassed()); bypass_menu_item->signal_toggled().connect (sigc::mem_fun(*this, &PannerUI::pan_bypass_toggle)); - items.push_back (MenuElem (_("Reset"), sigc::mem_fun (*this, &PannerUI::pan_reset))); + if (!_panshell->bypassed()) { + items.push_back (MenuElem (_("Reset"), sigc::mem_fun (*this, &PannerUI::pan_reset))); + items.push_back (MenuElem (_("Edit..."), sigc::mem_fun (*this, &PannerUI::pan_edit))); + } + + if (_panner_list.size() > 1 && !_panshell->bypassed()) { + RadioMenuItem::Group group; + items.push_back (SeparatorElem()); + + _suspend_menu_callbacks = true; + for (std::map::const_iterator p = _panner_list.begin(); p != _panner_list.end(); ++p) { + items.push_back (RadioMenuElem (group, p->second, + sigc::bind(sigc::mem_fun (*this, &PannerUI::pan_set_custom_type), p->first))); + RadioMenuItem* i = dynamic_cast (&items.back ()); + i->set_active (_panshell->current_panner_uri() == p->first); + } + _suspend_menu_callbacks = false; + } } void PannerUI::pan_bypass_toggle () { - if (bypass_menu_item && (_panner->bypassed() != bypass_menu_item->get_active())) { - _panner->set_bypassed (!_panner->bypassed()); + if (bypass_menu_item && (_panshell->bypassed() != bypass_menu_item->get_active())) { + _panshell->set_bypassed (!_panshell->bypassed()); + } +} + +void +PannerUI::pan_edit () +{ + if (_panshell->bypassed()) { + return; + } + if (_mono_panner) { + _mono_panner->edit (); + } else if (_stereo_panner) { + _stereo_panner->edit (); + } else if (twod_panner) { + if (!big_window) { + big_window = new Panner2dWindow (_panshell, 400, _panner->in().n_audio()); + } + big_window->show (); } } void PannerUI::pan_reset () { + if (_panshell->bypassed()) { + return; + } _panner->reset (); } +void +PannerUI::pan_set_custom_type (std::string uri) { + if (_suspend_menu_callbacks) return; + _panshell->select_panner_by_uri(uri); +} + void PannerUI::effective_pan_display () { if (_stereo_panner) { _stereo_panner->queue_draw (); + } else if (_mono_panner) { + _mono_panner->queue_draw (); } else if (twod_panner) { twod_panner->queue_draw (); - } else { - for (vector::iterator i = pan_bars.begin(); i != pan_bars.end(); ++i) { - (*i)->queue_draw (); - } - } + } } void @@ -427,9 +467,8 @@ PannerUI::update_pan_sensitive () { bool const sensitive = !(_panner->pannable()->automation_state() & Play); -#ifdef PANNER_HACKS pan_vbox.set_sensitive (sensitive); -#endif + if (big_window) { big_window->set_sensitive (sensitive); } @@ -507,8 +546,8 @@ PannerUI::pan_automation_state_changed () break; } - bool x = (pannable->automation_state() != Off); - + bool x = (pannable->automation_state() != ARDOUR::Off); + if (pan_automation_state_button.get_active() != x) { ignore_toggle = true; pan_automation_state_button.set_active (x); @@ -516,11 +555,11 @@ PannerUI::pan_automation_state_changed () } update_pan_sensitive (); - + /* start watching automation so that things move */ - + pan_watching.disconnect(); - + if (x) { pan_watching = ARDOUR_UI::RapidScreenUpdate.connect (sigc::mem_fun (*this, &PannerUI::effective_pan_display)); } @@ -544,7 +583,7 @@ PannerUI::_astate_string (AutoState state, bool shrt) string sstr; switch (state) { - case Off: + case ARDOUR::Off: sstr = (shrt ? "M" : _("M")); break; case Play: @@ -604,3 +643,9 @@ void PannerUI::position_adjusted () { } + +void +PannerUI::set_available_panners(std::map p) +{ + _panner_list = p; +}