#include <limits.h>
#include <gtkmm2ext/utils.h>
-#include <gtkmm2ext/barcontroller.h>
#include "pbd/fastlog.h"
#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 "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;
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()
{
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);
void
PannerUI::set_panner (boost::shared_ptr<PannerShell> ps, boost::shared_ptr<Panner> 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 ();
delete pan_astate_menu;
pan_astate_menu = 0;
- _panshell = ps;
+ _panshell = ps;
_panner = p;
delete twod_panner;
twod_panner = 0;
- delete _stereo_panner;
- _stereo_panner = 0;
+ delete _stereo_panner;
+ _stereo_panner = 0;
- delete _mono_panner;
- _mono_panner = 0;
+ delete _mono_panner;
+ _mono_panner = 0;
if (!_panner) {
return;
_panshell->Changed.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 ();
}
pan_astate_menu->items().push_back (MenuElem (_("Touch"), sigc::bind (
sigc::mem_fun (_panner.get(), &Panner::set_automation_state),
(AutoState) Touch)));
+ pan_astate_menu->items().push_back (MenuElem (_("Latch"), sigc::bind (
+ sigc::mem_fun (_panner.get(), &Panner::set_automation_state),
+ (AutoState) Latch)));
}
void
PannerUI::on_size_allocate (Allocation& a)
{
- HBox::on_size_allocate (a);
+ HBox::on_size_allocate (a);
}
void
delete pan_menu;
delete pan_astyle_menu;
delete pan_astate_menu;
- delete _stereo_panner;
- delete _mono_panner;
+ delete _stereo_panner;
+ delete _mono_panner;
}
void
return;
}
- _current_nins = nins;
- _current_nouts = nouts;
- _current_uri = _panshell->panner_gui_uri();
+ _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;
return;
}
+ 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;
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);
_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 ();
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 */
+ /* and finally, add it to the panner sample */
pan_vbox.pack_start (*twod_panner, false, false);
}
void
PannerUI::start_touch (boost::weak_ptr<AutomationControl> wac)
{
-
boost::shared_ptr<AutomationControl> ac = wac.lock();
- if (!ac) {
- return;
- }
- ac->start_touch (ac->session().transport_frame());
+ boost::shared_ptr<AutomationControl> ac = wac.lock();
+ if (!ac) {
+ return;
+ }
+ ac->start_touch (ac->session().transport_sample());
}
void
PannerUI::stop_touch (boost::weak_ptr<AutomationControl> wac)
{
-
boost::shared_ptr<AutomationControl> ac = wac.lock();
- if (!ac) {
- return;
- }
- ac->stop_touch (false, ac->session().transport_frame());
+ boost::shared_ptr<AutomationControl> ac = wac.lock();
+ if (!ac) {
+ return;
+ }
+ ac->stop_touch (ac->session().transport_sample());
}
bool
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
{
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
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> pannable (_panner->pannable());
+ boost::shared_ptr<Pannable> 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;
}
update_pan_sensitive ();
-
- /* start watching automation so that things move */
-
- pan_watching.disconnect();
-
- if (x) {
- pan_watching = ARDOUR_UI::RapidScreenUpdate.connect (sigc::mem_fun (*this, &PannerUI::effective_pan_display));
- }
}
string
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 Latch:
+ sstr = (shrt ? "L" : S_("Latch|L"));
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 ()
{
projects / ardour.git / blobdiff