X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fpanner_ui.cc;h=a394932306dcd8aa712b0e568c6c86ec52d0eb02;hb=ba7bbd1d51ff97af0572bfccfa9ffb3fd2a1cdbd;hp=af297a85075843149c9f8cbdce727e201df3b666;hpb=a1a3f6c8265264227ce19f731bf1863aff229a94;p=ardour.git diff --git a/gtk2_ardour/panner_ui.cc b/gtk2_ardour/panner_ui.cc index af297a8507..a394932306 100644 --- a/gtk2_ardour/panner_ui.cc +++ b/gtk2_ardour/panner_ui.cc @@ -19,7 +19,6 @@ #include #include -#include #include "pbd/fastlog.h" @@ -28,15 +27,17 @@ #include "ardour/panner_shell.h" #include "ardour/session.h" -#include "ardour_ui.h" +#include "widgets/tooltips.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 "ui_config.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; @@ -44,12 +45,11 @@ using namespace PBD; using namespace Gtkmm2ext; using namespace Gtk; -const int PannerUI::pan_bar_height = 35; - PannerUI::PannerUI (Session* s) : _current_nouts (-1) , _current_nins (-1) - , pan_automation_style_button ("") + , _current_uri ("") + , _send_mode (false) , pan_automation_state_button ("") , _panner_list() { @@ -60,24 +60,19 @@ PannerUI::PannerUI (Session* s) pan_astate_menu = 0; pan_astyle_menu = 0; in_pan_update = false; - _stereo_panner = 0; + _stereo_panner = 0; _mono_panner = 0; - _ignore_width_change = false; - _ignore_position_change = false; + _ignore_width_change = false; + _ignore_position_change = false; - pan_automation_style_button.set_name ("MixerAutomationModeButton"); pan_automation_state_button.set_name ("MixerAutomationPlaybackButton"); - ARDOUR_UI::instance()->set_tip (pan_automation_state_button, _("Pan automation mode")); - ARDOUR_UI::instance()->set_tip (pan_automation_style_button, _("Pan automation type")); + ArdourWidgets::set_tooltip (pan_automation_state_button, _("Pan automation mode")); //set_size_request_to_display_given_text (pan_automation_state_button, X_("O"), 2, 2); - //set_size_request_to_display_given_text (pan_automation_style_button, X_("0"), 2, 2); - pan_automation_style_button.unset_flags (Gtk::CAN_FOCUS); pan_automation_state_button.unset_flags (Gtk::CAN_FOCUS); - pan_automation_style_button.signal_button_press_event().connect (sigc::mem_fun(*this, &PannerUI::pan_automation_style_button_event), false); pan_automation_state_button.signal_button_press_event().connect (sigc::mem_fun(*this, &PannerUI::pan_automation_state_button_event), false); pan_vbox.set_spacing (2); @@ -92,8 +87,8 @@ PannerUI::PannerUI (Session* s) void PannerUI::set_panner (boost::shared_ptr ps, boost::shared_ptr p) { - /* note that the panshell might not change here (i.e. ps == _panshell) - */ + /* note that the panshell might not change here (i.e. ps == _panshell) + */ connections.drop_connections (); @@ -103,17 +98,17 @@ PannerUI::set_panner (boost::shared_ptr ps, boost::shared_ptr ps, boost::shared_ptrChanged.connect (connections, invalidator (*this), boost::bind (&PannerUI::panshell_changed, this), gui_context()); - /* new panner object, force complete reset of panner GUI - */ + /* new panner object, force complete reset of panner GUI + */ - _current_nouts = 0; - _current_nins = 0; + _current_nouts = 0; + _current_nins = 0; - setup_pan (); + setup_pan (); update_pan_sensitive (); pan_automation_state_changed (); } @@ -181,7 +176,7 @@ PannerUI::build_astyle_menu () void PannerUI::on_size_allocate (Allocation& a) { - HBox::on_size_allocate (a); + HBox::on_size_allocate (a); } void @@ -197,8 +192,8 @@ PannerUI::~PannerUI () delete pan_menu; delete pan_astyle_menu; delete pan_astate_menu; - delete _stereo_panner; - delete _mono_panner; + delete _stereo_panner; + delete _mono_panner; } void @@ -214,19 +209,24 @@ 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_nins = nins; + _current_nouts = nouts; + _current_uri = _panshell->panner_gui_uri(); - container_clear (pan_vbox); + container_clear (pan_vbox); - delete twod_panner; - twod_panner = 0; - delete _stereo_panner; - _stereo_panner = 0; + delete twod_panner; + twod_panner = 0; + delete _stereo_panner; + _stereo_panner = 0; delete _mono_panner; _mono_panner = 0; @@ -236,7 +236,9 @@ PannerUI::setup_pan () return; } - if (_panshell->panner_gui_uri() == "http://ardour.org/plugin/panner_2in2out#ui") + const float scale = std::max (1.f, UIConfiguration::instance().get_ui_scale()); + + if (_current_uri == "http://ardour.org/plugin/panner_2in2out#ui") { delete big_window; big_window = 0; @@ -244,7 +246,8 @@ PannerUI::setup_pan () boost::shared_ptr pannable = _panner->pannable(); _stereo_panner = new StereoPanner (_panshell); - _stereo_panner->set_size_request (-1, pan_bar_height); + _stereo_panner->set_size_request (-1, 5 * ceilf(7.f * scale)); + _stereo_panner->set_send_drawing_mode (_send_mode); pan_vbox.pack_start (*_stereo_panner, false, false); boost::shared_ptr ac; @@ -262,8 +265,8 @@ 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; @@ -279,15 +282,16 @@ 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_size_request (-1, 5 * ceilf(7.f * scale)); + _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); + twod_panner = new Panner2d (_panshell, rintf(61.f * scale)); twod_panner->set_name ("MixerPanZone"); twod_panner->show (); twod_panner->signal_button_press_event().connect (sigc::mem_fun(*this, &PannerUI::pan_button_event), false); @@ -298,7 +302,8 @@ PannerUI::setup_pan () if (big_window) { big_window->reset (nins); } - twod_panner->set_size_request (-1, 61); + twod_panner->set_size_request (-1, rintf(61.f * scale)); + twod_panner->set_send_drawing_mode (_send_mode); /* and finally, add it to the panner frame */ @@ -317,24 +322,37 @@ 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) { - boost::shared_ptr ac = wac.lock(); - if (!ac) { - return; - } - ac->start_touch (ac->session().transport_frame()); + boost::shared_ptr ac = wac.lock(); + if (!ac) { + return; + } + ac->start_touch (ac->session().transport_frame()); } void PannerUI::stop_touch (boost::weak_ptr wac) { - boost::shared_ptr ac = wac.lock(); - if (!ac) { - return; - } - ac->stop_touch (false, ac->session().transport_frame()); + boost::shared_ptr ac = wac.lock(); + if (!ac) { + return; + } + ac->stop_touch (ac->session().transport_frame()); } bool @@ -388,13 +406,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, @@ -444,21 +459,19 @@ 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 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 (); - } + if (_stereo_panner) { + _stereo_panner->queue_draw (); + } else if (_mono_panner) { + _mono_panner->queue_draw (); + } else if (twod_panner) { + twod_panner->queue_draw (); + } } void @@ -466,11 +479,11 @@ PannerUI::update_pan_sensitive () { bool const sensitive = !(_panner->pannable()->automation_state() & Play); - pan_vbox.set_sensitive (sensitive); + pan_vbox.set_sensitive (sensitive); - if (big_window) { - big_window->set_sensitive (sensitive); - } + if (big_window) { + big_window->set_sensitive (sensitive); + } } gint @@ -496,59 +509,24 @@ PannerUI::pan_automation_state_button_event (GdkEventButton *ev) return TRUE; } -gint -PannerUI::pan_automation_style_button_event (GdkEventButton *ev) -{ - if (ev->type == GDK_BUTTON_RELEASE) { - return TRUE; - } - - switch (ev->button) { - case 1: - if (pan_astyle_menu == 0) { - build_astyle_menu (); - } - pan_astyle_menu->popup (1, ev->time); - break; - default: - break; - } - return TRUE; -} - -void -PannerUI::pan_automation_style_changed () -{ - ENSURE_GUI_THREAD (*this, &PannerUI::pan_automation_style_changed) - - switch (_width) { - case Wide: - pan_automation_style_button.set_label (astyle_string(_panner->automation_style())); - break; - case Narrow: - pan_automation_style_button.set_label (short_astyle_string(_panner->automation_style())); - break; - } -} - void PannerUI::pan_automation_state_changed () { - boost::shared_ptr pannable (_panner->pannable()); + boost::shared_ptr pannable (_panner->pannable()); switch (_width) { case Wide: - pan_automation_state_button.set_label (astate_string(pannable->automation_state())); + pan_automation_state_button.set_label (astate_string(pannable->automation_state())); break; case Narrow: - pan_automation_state_button.set_label (short_astate_string(pannable->automation_state())); + pan_automation_state_button.set_label (short_astate_string(pannable->automation_state())); break; } bool x = (pannable->automation_state() != ARDOUR::Off); if (pan_automation_state_button.get_active() != x) { - ignore_toggle = true; + ignore_toggle = true; pan_automation_state_button.set_active (x); ignore_toggle = false; } @@ -560,7 +538,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)); } } @@ -583,46 +561,22 @@ 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; } return sstr; } -string -PannerUI::astyle_string (AutoStyle style) -{ - return _astyle_string (style, false); -} - -string -PannerUI::short_astyle_string (AutoStyle style) -{ - return _astyle_string (style, true); -} - -string -PannerUI::_astyle_string (AutoStyle style, bool shrt) -{ - if (style & Trim) { - return _("Trim"); - } else { - /* XXX it might different in different languages */ - - return (shrt ? _("Abs") : _("Abs")); - } -} - void PannerUI::show_width () { @@ -644,8 +598,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; }