X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fpanner_ui.cc;h=02f1dd46a2d55f0a542f71a591ce89b4a405e462;hb=ced4378d0914bcfb926267772c45d1d23f3bed38;hp=3ee794e5781ccdc628f0439b7ec0ea186bae4ede;hpb=d15fda6d751a465d278f477923075d4783f3b1ca;p=ardour.git diff --git a/gtk2_ardour/panner_ui.cc b/gtk2_ardour/panner_ui.cc index 3ee794e578..02f1dd46a2 100644 --- a/gtk2_ardour/panner_ui.cc +++ b/gtk2_ardour/panner_ui.cc @@ -19,7 +19,6 @@ #include #include -#include #include "pbd/fastlog.h" @@ -31,9 +30,9 @@ #include "ardour_ui.h" #include "panner_ui.h" #include "panner2d.h" -#include "utils.h" #include "gui_thread.h" #include "stereo_panner.h" +#include "timers.h" #include "mono_panner.h" #include "i18n.h" @@ -49,6 +48,8 @@ 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() @@ -214,12 +215,17 @@ PannerUI::setup_pan () int const nouts = _panner ? _panner->out().n_audio() : -1; int const nins = _panner ? _panner->in().n_audio() : -1; - if (nouts == _current_nouts && 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); @@ -231,15 +237,21 @@ PannerUI::setup_pan () _mono_panner = 0; if (!_panner) { + delete big_window; + big_window = 0; return; } - if (_panshell->panner_gui_uri() == "http://ardour.org/plugin/panner_2in2out#ui") + if (_current_uri == "http://ardour.org/plugin/panner_2in2out#ui") { + delete big_window; + big_window = 0; + boost::shared_ptr pannable = _panner->pannable(); _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); boost::shared_ptr ac; @@ -257,9 +269,11 @@ PannerUI::setup_pan () boost::weak_ptr(ac))); _stereo_panner->signal_button_release_event().connect (sigc::mem_fun(*this, &PannerUI::pan_button_event)); } - else if (_panshell->panner_gui_uri() == "http://ardour.org/plugin/panner_1in2out#ui" - || _panshell->panner_gui_uri() == "http://ardour.org/plugin/panner_balance#ui") + 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; @@ -273,11 +287,12 @@ PannerUI::setup_pan () _mono_panner->signal_button_release_event().connect (sigc::mem_fun(*this, &PannerUI::pan_button_event)); _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 (_panshell->panner_gui_uri() == "http://ardour.org/plugin/panner_vbap#ui") + else if (_current_uri == "http://ardour.org/plugin/panner_vbap#ui") { if (!twod_panner) { twod_panner = new Panner2d (_panshell, 61); @@ -292,6 +307,7 @@ PannerUI::setup_pan () 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 */ @@ -310,6 +326,19 @@ PannerUI::setup_pan () 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 PannerUI::start_touch (boost::weak_ptr wac) { @@ -369,7 +398,7 @@ 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 */ @@ -381,13 +410,10 @@ PannerUI::build_pan_menu () items.push_back (MenuElem (_("Edit..."), sigc::mem_fun (*this, &PannerUI::pan_edit))); } - if (_route && _panner_list.size() > 1 && !_panshell->bypassed()) { + if (_panner_list.size() > 1 && !_panshell->bypassed()) { RadioMenuItem::Group group; items.push_back (SeparatorElem()); - assert(_panshell->user_selected_panner_uri() == "" - || _panshell->user_selected_panner_uri() == _panshell->current_panner_uri()); - _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, @@ -417,6 +443,11 @@ PannerUI::pan_edit () _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 (); } } @@ -432,9 +463,7 @@ PannerUI::pan_reset () void PannerUI::pan_set_custom_type (std::string uri) { if (_suspend_menu_callbacks) return; - if (_route) { - _route->set_custom_panner_uri(uri); - } + _panshell->select_panner_by_uri(uri); } void @@ -548,7 +577,7 @@ PannerUI::pan_automation_state_changed () pan_watching.disconnect(); if (x) { - pan_watching = ARDOUR_UI::RapidScreenUpdate.connect (sigc::mem_fun (*this, &PannerUI::effective_pan_display)); + pan_watching = Timers::rapid_connect (sigc::mem_fun (*this, &PannerUI::effective_pan_display)); } } @@ -571,16 +600,16 @@ PannerUI::_astate_string (AutoState state, bool shrt) switch (state) { case ARDOUR::Off: - sstr = (shrt ? "M" : _("M")); + sstr = (shrt ? "M" : S_("Manual|M")); break; case Play: - sstr = (shrt ? "P" : _("P")); + sstr = (shrt ? "P" : S_("Play|P")); break; case Touch: - sstr = (shrt ? "T" : _("T")); + sstr = (shrt ? "T" : S_("Touch|T")); break; case Write: - sstr = (shrt ? "W" : _("W")); + sstr = (shrt ? "W" : S_("Write|W")); break; } @@ -632,8 +661,7 @@ PannerUI::position_adjusted () } void -PannerUI::set_available_panners(boost::shared_ptr r, std::map p) +PannerUI::set_available_panners(std::map p) { - _route = r; _panner_list = p; }