#include <limits.h>
#include <gtkmm2ext/utils.h>
-#include <gtkmm2ext/barcontroller.h>
#include "pbd/fastlog.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 "mono_panner.h"
#include "i18n.h"
using namespace Gtkmm2ext;
using namespace Gtk;
-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()
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);
return;
}
- if (_panshell->panner_gui_uri() == "http://ardour.org/plugin/panner_2in2out#ui")
+ const float scale = std::max (1.f, ARDOUR_UI::ui_scale);
+
+ if (_current_uri == "http://ardour.org/plugin/panner_2in2out#ui")
{
delete big_window;
big_window = 0;
boost::shared_ptr<Pannable> 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<AutomationControl> ac;
boost::weak_ptr<AutomationControl>(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;
_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);
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 */
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<AutomationControl> wac)
{
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));
}
}
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;
}