X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fpanner_ui.cc;h=08188337674612562c65c1ea27454e4d1907b87a;hb=9a45e0fde9eb6297ea4cc246aa2ef5d085ebe49b;hp=0c57fab244caafc5ccbf23e00cf83515ec326d07;hpb=7000afdc66c9e0ae8dcf9ec080517dabba1e7f34;p=ardour.git diff --git a/gtk2_ardour/panner_ui.cc b/gtk2_ardour/panner_ui.cc index 0c57fab244..0818833767 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,27 +27,29 @@ #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 "timers.h" +#include "tooltips.h" #include "mono_panner.h" +#include "ui_config.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; using namespace PBD; using namespace Gtkmm2ext; using namespace Gtk; - -const int PannerUI::pan_bar_height = 35; +using namespace ARDOUR_UI_UTILS; 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() @@ -68,8 +69,8 @@ PannerUI::PannerUI (Session* s) 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")); + set_tooltip (pan_automation_state_button, _("Pan automation mode")); + set_tooltip (pan_automation_style_button, _("Pan automation type")); //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); @@ -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); @@ -236,7 +242,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 +252,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 +271,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 +288,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 +308,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,6 +328,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) { @@ -392,9 +416,6 @@ PannerUI::build_pan_menu () 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, @@ -558,7 +579,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)); } } @@ -581,16 +602,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; }