X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fpanner_ui.cc;h=f35c79d4fe7cc2ba77184048cb1032e987480835;hb=8ada45344e949f3d36a96094ed443cac82ffd3c7;hp=627d4e76aaa98d5435852a8b78b0a62abb55a563;hpb=df04f8c1e57f279ed75db707597d61ba06a3d096;p=ardour.git diff --git a/gtk2_ardour/panner_ui.cc b/gtk2_ardour/panner_ui.cc index 627d4e76aa..f35c79d4fe 100644 --- a/gtk2_ardour/panner_ui.cc +++ b/gtk2_ardour/panner_ui.cc @@ -18,28 +18,22 @@ #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" -#include "utils.h" #include "gui_thread.h" #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/panner_shell.h" -#include "ardour/route.h" - #include "i18n.h" using namespace std; @@ -53,8 +47,11 @@ const int PannerUI::pan_bar_height = 35; PannerUI::PannerUI (Session* s) : _current_nouts (-1) , _current_nins (-1) + , _current_uri ("") + , _send_mode (false) , pan_automation_style_button ("") , pan_automation_state_button ("") + , _panner_list() { set_session (s); @@ -115,6 +112,9 @@ PannerUI::set_panner (boost::shared_ptr ps, boost::shared_ptritems().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))); @@ -175,13 +178,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) { @@ -196,10 +192,6 @@ 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; @@ -212,26 +204,27 @@ PannerUI::~PannerUI () void PannerUI::panshell_changed () { - set_panner (_panshell, _panshell->panner()); + set_panner (_panshell, _panshell->panner()); setup_pan (); } 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); @@ -242,73 +235,64 @@ PannerUI::setup_pan () delete _mono_panner; _mono_panner = 0; - if (nouts == 0 || nouts == 1) { - - /* stick something into the panning viewport so that it redraws */ - - EventBox* eb = manage (new EventBox()); - pan_vbox.pack_start (*eb, false, false); - + if (!_panner) { delete big_window; big_window = 0; + return; + } - } 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))); - _stereo_panner->signal_button_release_event().connect (sigc::mem_fun(*this, &PannerUI::pan_button_event)); + if (_current_uri == "http://ardour.org/plugin/panner_2in2out#ui") + { + delete big_window; + big_window = 0; - } else if (nins == 1) { - /* 1-in/2out */ + boost::shared_ptr pannable = _panner->pannable(); - boost::shared_ptr pannable = _panner->pannable(); - boost::shared_ptr ac = pannable->pan_azimuth_control; + _stereo_panner = new StereoPanner (_panshell); + _stereo_panner->set_size_request (-1, pan_bar_height); + _stereo_panner->set_send_drawing_mode (_send_mode); + pan_vbox.pack_start (*_stereo_panner, false, false); - _mono_panner = new MonoPanner (_panner); - - _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))); + boost::shared_ptr ac; - _mono_panner->signal_button_release_event().connect (sigc::mem_fun(*this, &PannerUI::pan_button_event)); + 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))); - _mono_panner->set_size_request (-1, pan_bar_height); + 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; - update_pan_sensitive (); - pan_vbox.pack_start (*_mono_panner, false, false); + _mono_panner = new MonoPanner (_panshell); - } else { - warning << string_compose (_("No panner user interface is currently available for %1-in/2out tracks/busses"), - nins) << endmsg; - } + _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))); - delete big_window; - big_window = 0; + _mono_panner->signal_button_release_event().connect (sigc::mem_fun(*this, &PannerUI::pan_button_event)); - } else { + _mono_panner->set_size_request (-1, pan_bar_height); + _mono_panner->set_send_drawing_mode (_send_mode); + 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 (_panshell, 61); twod_panner->set_name ("MixerPanZone"); @@ -318,17 +302,40 @@ 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); + twod_panner->set_send_drawing_mode (_send_mode); /* 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); - pan_vbox.show_all (); + delete big_window; + big_window = 0; + } + + pan_vbox.show_all (); +} + +void +PannerUI::set_send_drawing_mode (bool onoff) +{ + if (_stereo_panner) { + _stereo_panner->set_send_drawing_mode (onoff); + } else if (_mono_panner) { + _mono_panner->set_send_drawing_mode (onoff); + } else if (twod_panner) { + twod_panner->set_send_drawing_mode (onoff); + } + _send_mode = onoff; } void @@ -390,14 +397,31 @@ 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 (_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 @@ -408,24 +432,49 @@ PannerUI::pan_bypass_toggle () } } +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 @@ -512,7 +561,7 @@ 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; @@ -549,7 +598,7 @@ PannerUI::_astate_string (AutoState state, bool shrt) string sstr; switch (state) { - case Off: + case ARDOUR::Off: sstr = (shrt ? "M" : _("M")); break; case Play: @@ -609,3 +658,9 @@ void PannerUI::position_adjusted () { } + +void +PannerUI::set_available_panners(std::map p) +{ + _panner_list = p; +}