X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fgain_meter.cc;h=5e2cd62c624f3b2b31440f1ef47f6178b9b94520;hb=5b4f5c477dddc767f0d79ec96c2f51bec987ac50;hp=edf07a13a584c0079007a1346b58dfedd8ee9b6d;hpb=fa22520fd257f166c00615e7e40ec10c9e29b948;p=ardour.git diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index edf07a13a5..5e2cd62c62 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -20,6 +20,7 @@ #include #include "ardour/amp.h" +#include "ardour/logmeter.h" #include "ardour/route_group.h" #include "ardour/session_route.h" #include "ardour/dB.h" @@ -30,30 +31,31 @@ #include #include #include -#include #include #include "pbd/fastlog.h" #include "pbd/stacktrace.h" -#include "ardour_ui.h" #include "gain_meter.h" -#include "global_signals.h" -#include "logmeter.h" #include "gui_thread.h" #include "keyboard.h" #include "public_editor.h" #include "utils.h" #include "meter_patterns.h" +#include "timers.h" +#include "tooltips.h" +#include "ui_config.h" #include "ardour/session.h" #include "ardour/route.h" #include "ardour/meter.h" #include "ardour/audio_track.h" #include "ardour/midi_track.h" +#include "ardour/dB.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; +using namespace ARDOUR_UI_UTILS; using namespace PBD; using namespace Gtkmm2ext; using namespace Gtk; @@ -61,12 +63,38 @@ using namespace std; using Gtkmm2ext::Keyboard; using namespace ArdourMeter; +static void +reset_cursor_to_default (Gtk::Entry* widget) +{ + Glib::RefPtr win = widget->get_text_window (); + if (win) { + /* C++ doesn't provide a pointer argument version of this + (i.e. you cannot set to NULL to get the default/parent + cursor) + */ + gdk_window_set_cursor (win->gobj(), 0); + } +} + +static void +reset_cursor_to_default_state (Gtk::StateType, Gtk::Entry* widget) +{ + reset_cursor_to_default (widget); +} + +sigc::signal GainMeterBase::ChangeGainAutomationState; + GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int fader_girth) - : gain_adjustment (gain_to_slider_position_with_max (1.0, Config->get_max_gain()), 0.0, 1.0, 0.01, 0.1) + : gain_adjustment (gain_to_slider_position_with_max (1.0, Config->get_max_gain()), // value + 0.0, // lower + 1.0, // upper + dB_coeff_step(Config->get_max_gain()) / 10.0, // step increment + dB_coeff_step(Config->get_max_gain())) // page increment , gain_automation_style_button ("") , gain_automation_state_button ("") + , meter_point_button (_("pre")) + , gain_astate_propagate (false) , _data_type (DataType::AUDIO) - { using namespace Menu_Helpers; @@ -77,10 +105,13 @@ GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int next_release_selects = false; _width = Wide; + fader_length = rint (fader_length * UIConfiguration::instance().get_ui_scale()); + fader_girth = rint (fader_girth * UIConfiguration::instance().get_ui_scale()); + if (horizontal) { - gain_slider = manage (new HSliderController (&gain_adjustment, fader_length, fader_girth, false)); + gain_slider = manage (new HSliderController (&gain_adjustment, boost::shared_ptr(), fader_length, fader_girth)); } else { - gain_slider = manage (new VSliderController (&gain_adjustment, fader_length, fader_girth, false)); + gain_slider = manage (new VSliderController (&gain_adjustment, boost::shared_ptr(), fader_length, fader_girth)); } level_meter = new LevelMeterHBox(_session); @@ -89,8 +120,9 @@ GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int meter_metric_area.signal_button_press_event().connect (sigc::mem_fun (*this, &GainMeterBase::level_meter_button_press)); meter_metric_area.add_events (Gdk::BUTTON_PRESS_MASK); - gain_slider->signal_button_press_event().connect (sigc::mem_fun(*this, &GainMeter::gain_slider_button_press), false); - gain_slider->signal_button_release_event().connect (sigc::mem_fun(*this, &GainMeter::gain_slider_button_release), false); + gain_slider->set_tweaks (PixFader::Tweaks(PixFader::NoButtonForward | PixFader::NoVerticalScroll)); + gain_slider->StartGesture.connect (sigc::mem_fun (*this, &GainMeter::amp_start_touch)); + gain_slider->StopGesture.connect (sigc::mem_fun (*this, &GainMeter::amp_stop_touch)); gain_slider->set_name ("GainFader"); gain_display.set_name ("MixerStripGainDisplay"); @@ -98,18 +130,28 @@ GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int gain_display.signal_activate().connect (sigc::mem_fun (*this, &GainMeter::gain_activated)); gain_display.signal_focus_in_event().connect (sigc::mem_fun (*this, &GainMeter::gain_focused), false); gain_display.signal_focus_out_event().connect (sigc::mem_fun (*this, &GainMeter::gain_focused), false); + gain_display.set_alignment (0.5); peak_display.set_name ("MixerStripPeakDisplay"); set_size_request_to_display_given_text (peak_display, "-80.g", 2, 6); /* note the descender */ max_peak = minus_infinity(); - peak_display.set_label (_("-inf")); + peak_display.set_text (_("-inf")); + peak_display.set_alignment (0.5); + + /* stuff related to the fact that the peak display is not, in + fact, supposed to be a text entry. + */ + peak_display.set_events (peak_display.get_events() & ~(Gdk::EventMask (Gdk::LEAVE_NOTIFY_MASK|Gdk::ENTER_NOTIFY_MASK|Gdk::POINTER_MOTION_MASK))); + peak_display.signal_map().connect (sigc::bind (sigc::ptr_fun (reset_cursor_to_default), &peak_display)); + peak_display.signal_state_changed().connect (sigc::bind (sigc::ptr_fun (reset_cursor_to_default_state), &peak_display)); peak_display.unset_flags (Gtk::CAN_FOCUS); + peak_display.set_editable (false); gain_automation_style_button.set_name ("mixer strip button"); gain_automation_state_button.set_name ("mixer strip button"); - ARDOUR_UI::instance()->set_tip (gain_automation_state_button, _("Fader automation mode")); - ARDOUR_UI::instance()->set_tip (gain_automation_style_button, _("Fader automation type")); + set_tooltip (gain_automation_state_button, _("Fader automation mode")); + set_tooltip (gain_automation_style_button, _("Fader automation type")); gain_automation_style_button.unset_flags (Gtk::CAN_FOCUS); gain_automation_state_button.unset_flags (Gtk::CAN_FOCUS); @@ -121,9 +163,39 @@ GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int gain_astyle_menu.items().push_back (MenuElem (_("Abs"))); gain_astate_menu.set_name ("ArdourContextMenu"); + gain_astate_menu.set_reserve_toggle_size(false); gain_astyle_menu.set_name ("ArdourContextMenu"); - gain_adjustment.signal_value_changed().connect (sigc::mem_fun(*this, &GainMeterBase::gain_adjusted)); + meter_point_button.set_name ("mixer strip button"); + + set_tooltip (&meter_point_button, _("Metering point")); + + meter_point_button.unset_flags (Gtk::CAN_FOCUS); + + meter_point_button.set_size_request(15, 15); + + meter_point_menu.set_name ("ArdourContextMenu"); + meter_point_menu.set_reserve_toggle_size(false); + + meter_point_menu.items().clear (); + meter_point_menu.items().push_back (MenuElem(_("Input"), + sigc::bind (sigc::mem_fun (*this, + &GainMeterBase::meter_point_clicked), (MeterPoint) MeterInput))); + meter_point_menu.items().push_back (MenuElem(_("Pre Fader"), + sigc::bind (sigc::mem_fun (*this, + &GainMeterBase::meter_point_clicked), (MeterPoint) MeterPreFader))); + meter_point_menu.items().push_back (MenuElem(_("Post Fader"), + sigc::bind (sigc::mem_fun (*this, + &GainMeterBase::meter_point_clicked), (MeterPoint) MeterPostFader))); + meter_point_menu.items().push_back (MenuElem(_("Output"), + sigc::bind (sigc::mem_fun (*this, + &GainMeterBase::meter_point_clicked), (MeterPoint) MeterOutput))); + meter_point_menu.items().push_back (MenuElem(_("Custom"), + sigc::bind (sigc::mem_fun (*this, + &GainMeterBase::meter_point_clicked), (MeterPoint) MeterCustom))); + meter_point_button.signal_button_press_event().connect (sigc::mem_fun (*this, &GainMeter::meter_press), false); + + gain_adjustment.signal_value_changed().connect (sigc::mem_fun(*this, &GainMeterBase::fader_moved)); peak_display.signal_button_release_event().connect (sigc::mem_fun(*this, &GainMeterBase::peak_button_release), false); gain_display.signal_key_press_event().connect (sigc::mem_fun(*this, &GainMeterBase::gain_key_press), false); @@ -133,18 +205,8 @@ GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int RedrawMetrics.connect (sigc::mem_fun(*this, &GainMeterBase::redraw_metrics)); UI::instance()->theme_changed.connect (sigc::mem_fun(*this, &GainMeterBase::on_theme_changed)); - ColorsChanged.connect (sigc::bind(sigc::mem_fun (*this, &GainMeterBase::color_handler), false)); - DPIReset.connect (sigc::bind(sigc::mem_fun (*this, &GainMeterBase::color_handler), true)); - -// PBD::ScopedConnection _config_connection; -// Config->ParameterChanged.connect ( _config_connection, MISSING_INVALIDATOR, boost::bind(&GainMeterBase::set_flat_buttons, this, _1), gui_context() ); -} - -void -GainMeterBase::set_flat_buttons () -{ -printf("set_flat_butt\n"); -// gain_slider->set_flat_buttons( ARDOUR_UI::config()->get_flat_buttons() ); + UIConfiguration::instance().ColorsChanged.connect (sigc::bind(sigc::mem_fun (*this, &GainMeterBase::color_handler), false)); + UIConfiguration::instance().DPIReset.connect (sigc::bind(sigc::mem_fun (*this, &GainMeterBase::color_handler), true)); } GainMeterBase::~GainMeterBase () @@ -156,26 +218,31 @@ GainMeterBase::~GainMeterBase () void GainMeterBase::set_controls (boost::shared_ptr r, boost::shared_ptr pm, - boost::shared_ptr amp) + boost::shared_ptr amp, + boost::shared_ptr control) { - connections.clear (); + connections.clear (); model_connections.drop_connections (); - if (!pm && !amp) { + /* no meter and no control? nothing to do ... */ + + if (!pm && !control) { level_meter->set_meter (0); gain_slider->set_controllable (boost::shared_ptr()); _meter.reset (); _amp.reset (); _route.reset (); + _control.reset (); return; } _meter = pm; _amp = amp; _route = r; + _control = control; - level_meter->set_meter (pm.get()); - gain_slider->set_controllable (amp->gain_control()); + level_meter->set_meter (pm.get()); + gain_slider->set_controllable (_control); if (amp) { amp->ConfigurationChanged.connect ( @@ -192,34 +259,46 @@ GainMeterBase::set_controls (boost::shared_ptr r, gain_astate_menu.items().clear (); gain_astate_menu.items().push_back (MenuElem (S_("Automation|Manual"), - sigc::bind (sigc::mem_fun (*(amp.get()), &Automatable::set_parameter_automation_state), - Evoral::Parameter(GainAutomation), (AutoState) ARDOUR::Off))); + sigc::bind (sigc::mem_fun (*this, &GainMeterBase::set_gain_astate), (AutoState) ARDOUR::Off))); gain_astate_menu.items().push_back (MenuElem (_("Play"), - sigc::bind (sigc::mem_fun (*(amp.get()), &Automatable::set_parameter_automation_state), - Evoral::Parameter(GainAutomation), (AutoState) Play))); + sigc::bind (sigc::mem_fun (*this, &GainMeterBase::set_gain_astate), (AutoState) ARDOUR::Play))); gain_astate_menu.items().push_back (MenuElem (_("Write"), - sigc::bind (sigc::mem_fun (*(amp.get()), &Automatable::set_parameter_automation_state), - Evoral::Parameter(GainAutomation), (AutoState) Write))); + sigc::bind (sigc::mem_fun (*this, &GainMeterBase::set_gain_astate), (AutoState) ARDOUR::Write))); gain_astate_menu.items().push_back (MenuElem (_("Touch"), - sigc::bind (sigc::mem_fun (*(amp.get()), &Automatable::set_parameter_automation_state), - Evoral::Parameter(GainAutomation), (AutoState) Touch))); + sigc::bind (sigc::mem_fun (*this, &GainMeterBase::set_gain_astate), (AutoState) ARDOUR::Touch))); connections.push_back (gain_automation_style_button.signal_button_press_event().connect (sigc::mem_fun(*this, &GainMeterBase::gain_automation_style_button_event), false)); connections.push_back (gain_automation_state_button.signal_button_press_event().connect (sigc::mem_fun(*this, &GainMeterBase::gain_automation_state_button_event), false)); + connections.push_back (ChangeGainAutomationState.connect (sigc::mem_fun(*this, &GainMeterBase::set_gain_astate))); - boost::shared_ptr gc = amp->gain_control(); - - gc->alist()->automation_state_changed.connect (model_connections, invalidator (*this), boost::bind (&GainMeter::gain_automation_state_changed, this), gui_context()); - gc->alist()->automation_style_changed.connect (model_connections, invalidator (*this), boost::bind (&GainMeter::gain_automation_style_changed, this), gui_context()); + _control->alist()->automation_state_changed.connect (model_connections, invalidator (*this), boost::bind (&GainMeter::gain_automation_state_changed, this), gui_context()); + _control->alist()->automation_style_changed.connect (model_connections, invalidator (*this), boost::bind (&GainMeter::gain_automation_style_changed, this), gui_context()); gain_automation_state_changed (); } - amp->gain_control()->Changed.connect (model_connections, invalidator (*this), boost::bind (&GainMeterBase::gain_changed, this), gui_context()); + _control->Changed.connect (model_connections, invalidator (*this), boost::bind (&GainMeterBase::gain_changed, this), gui_context()); gain_changed (); show_gain (); update_gain_sensitive (); + + if (!_meter) { + peak_display.hide (); + } else { + peak_display.show (); + } +} + +void +GainMeterBase::set_gain_astate (AutoState as) +{ + if (gain_astate_propagate) { + gain_astate_propagate = false; + ChangeGainAutomationState (as); + return; + } + _amp->set_parameter_automation_state (Evoral::Parameter (GainAutomation), as); } void @@ -237,11 +316,11 @@ GainMeterBase::setup_gain_adjustment () if (_amp->output_streams().n_midi() <= _amp->output_streams().n_audio()) { _data_type = DataType::AUDIO; - gain_adjustment.set_lower (0.0); - gain_adjustment.set_upper (1.0); - gain_adjustment.set_step_increment (0.01); - gain_adjustment.set_page_increment (0.1); - gain_slider->set_default_value (gain_to_slider_position (1)); + gain_adjustment.set_lower (GAIN_COEFF_ZERO); + gain_adjustment.set_upper (GAIN_COEFF_UNITY); + gain_adjustment.set_step_increment (dB_coeff_step(Config->get_max_gain()) / 10.0); + gain_adjustment.set_page_increment (dB_coeff_step(Config->get_max_gain())); + gain_slider->set_default_value (gain_to_slider_position (GAIN_COEFF_UNITY)); } else { _data_type = DataType::MIDI; gain_adjustment.set_lower (0.0); @@ -254,7 +333,7 @@ GainMeterBase::setup_gain_adjustment () ignore_toggle = false; effective_gain_display (); - + _previous_amp_output_streams = _amp->output_streams (); } @@ -274,18 +353,24 @@ void GainMeterBase::setup_meters (int len) { int meter_width = 5; + uint32_t meter_channels = 0; + if (_meter) { + meter_channels = _meter->input_streams().n_total(); + } else if (_route) { + meter_channels = _route->shared_peak_meter()->input_streams().n_total(); + } switch (_width) { case Wide: //meter_ticks1_area.show(); //meter_ticks2_area.show(); meter_metric_area.show(); - if (_route && _route->shared_peak_meter()->input_streams().n_total() == 1) { + if (meter_channels == 1) { meter_width = 10; } break; case Narrow: - if (_route && _route->shared_peak_meter()->input_streams().n_total() > 1) { + if (meter_channels > 1) { meter_width = 4; } //meter_ticks1_area.hide(); @@ -299,7 +384,7 @@ GainMeterBase::setup_meters (int len) void GainMeterBase::set_type (MeterType t) { - level_meter->set_type(t); + level_meter->set_meter_type(t); } void @@ -307,7 +392,15 @@ GainMeter::setup_meters (int len) { switch (_width) { case Wide: - hbox.set_homogeneous(true); + { + uint32_t meter_channels = 0; + if (_meter) { + meter_channels = _meter->input_streams().n_total(); + } else if (_route) { + meter_channels = _route->shared_peak_meter()->input_streams().n_total(); + } + hbox.set_homogeneous(meter_channels < 7 ? true : false); + } break; case Narrow: hbox.set_homogeneous(false); @@ -354,10 +447,14 @@ GainMeterBase::peak_button_release (GdkEventButton* ev) void GainMeterBase::reset_peak_display () { + if (!_route) { + // catch "reset all" for VCAs + return; + } _meter->reset_max(); level_meter->clear_meters(); - max_peak = -INFINITY; - peak_display.set_label (_("-inf")); + max_peak = minus_infinity (); + peak_display.set_text (_("-inf")); peak_display.set_name ("MixerStripPeakDisplay"); } @@ -414,24 +511,18 @@ GainMeterBase::gain_activated () { float f; - { - // Switch to user's preferred locale so that - // if they use different LC_NUMERIC conventions, - // we will honor them. - - PBD::LocaleGuard lg (""); - if (sscanf (gain_display.get_text().c_str(), "%f", &f) != 1) { - return; - } + // Use the user's preferred locale/LC_NUMERIC setting + if (sscanf (gain_display.get_text().c_str(), "%f", &f) != 1) { + return; } /* clamp to displayable values */ if (_data_type == DataType::AUDIO) { f = min (f, 6.0f); - _amp->set_gain (dB_to_coefficient(f), this); + _control->set_value (dB_to_coefficient(f), Controllable::UseGroup); } else { f = min (fabs (f), 2.0f); - _amp->set_gain (f, this); + _control->set_value (f, Controllable::UseGroup); } if (gain_display.has_focus()) { @@ -476,23 +567,27 @@ GainMeterBase::show_gain () } void -GainMeterBase::gain_adjusted () +GainMeterBase::fader_moved () { - gain_t value; + if (!ignore_toggle) { - /* convert from adjustment range (0..1) to gain coefficient */ + gain_t value; - if (_data_type == DataType::AUDIO) { - value = slider_position_to_gain_with_max (gain_adjustment.get_value(), Config->get_max_gain()); - } else { - value = gain_adjustment.get_value(); - } - - if (!ignore_toggle) { - if (_route && _route->amp() == _amp) { - _route->set_gain (value, this); + /* convert from adjustment range (0..1) to gain coefficient */ + + if (_data_type == DataType::AUDIO) { + value = slider_position_to_gain_with_max (gain_adjustment.get_value(), Config->get_max_gain()); + } else { + value = gain_adjustment.get_value(); + } + + // XXX hack allow to override group + // (this breaks group'ed shift+click reset) + if (Keyboard::the_keyboard().key_is_down (GDK_Shift_R) + || Keyboard::the_keyboard().key_is_down (GDK_Shift_L)) { + _control->set_value (value, Controllable::NoGroup); } else { - _amp->set_gain (value, this); + _control->set_value (value, Controllable::UseGroup); } } @@ -502,20 +597,23 @@ GainMeterBase::gain_adjusted () void GainMeterBase::effective_gain_display () { - float value = 0.0; + gain_t fader_position = 0; switch (_data_type) { case DataType::AUDIO: - value = gain_to_slider_position_with_max (_amp->gain(), Config->get_max_gain()); + /* the position of the fader should reflect any master gain, + * not just the control's own inherent value + */ + fader_position = gain_to_slider_position_with_max (_control->get_value(), Config->get_max_gain()); break; case DataType::MIDI: - value = _amp->gain (); + fader_position = _control->get_value (); break; } - if (gain_adjustment.get_value() != value) { + if (gain_adjustment.get_value() != fader_position) { ignore_toggle = true; - gain_adjustment.set_value (value); + gain_adjustment.set_value (fader_position); ignore_toggle = false; } } @@ -546,115 +644,45 @@ GainMeterBase::set_fader_name (const char * name) void GainMeterBase::update_gain_sensitive () { - bool x = !(_amp->gain_control()->alist()->automation_state() & Play); + bool x = !(_control->alist()->automation_state() & Play); static_cast(gain_slider)->set_sensitive (x); } -static MeterPoint -next_meter_point (MeterPoint mp) -{ - switch (mp) { - case MeterInput: - return MeterPreFader; - break; - - case MeterPreFader: - return MeterPostFader; - break; - - case MeterPostFader: - return MeterOutput; - break; - - case MeterOutput: - return MeterCustom; - break; - - case MeterCustom: - return MeterInput; - break; - } - - /*NOTREACHED*/ - return MeterInput; -} - gint GainMeterBase::meter_press(GdkEventButton* ev) { - wait_for_release = false; - if (!_route) { - return FALSE; + return false; } - if (!ignore_toggle) { - - if (Keyboard::is_context_menu_event (ev)) { - - // no menu at this time. - - } else { - - if (Keyboard::is_button2_event(ev)) { - - // Primary-button2 click is the midi binding click - // button2-click is "momentary" - - if (!Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier))) { - wait_for_release = true; - old_meter_point = _route->meter_point (); - } - } - - if (_route && (ev->button == 1 || Keyboard::is_button2_event (ev))) { - + switch (ev->button) { + case 1: if (Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::TertiaryModifier))) { /* Primary+Tertiary-click applies change to all routes */ - _session->foreach_route (this, &GainMeterBase::set_meter_point, next_meter_point (_route->meter_point())); - + meter_point_change_target = MeterPointChangeAll; } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) { - /* Primary-click: solo mix group. - NOTE: Primary-button2 is MIDI learn. - */ + /* Primary-click: apply change to all routes in group */ - if (ev->button == 1) { - set_route_group_meter_point (*_route, next_meter_point (_route->meter_point())); - } + meter_point_change_target = MeterPointChangeGroup; } else { /* click: change just this route */ - // XXX no undo yet - - _route->set_meter_point (next_meter_point (_route->meter_point())); + meter_point_change_target = MeterPointChangeSingle; } - } - } - } - - return true; - -} - -gint -GainMeterBase::meter_release(GdkEventButton*) -{ - if (!ignore_toggle) { - if (wait_for_release) { - wait_for_release = false; - - if (_route) { - set_meter_point (*_route, old_meter_point); - } + Gtkmm2ext::anchored_menu_popup(&meter_point_menu, + &meter_point_button, + "", 1, ev->time); + break; + default: + break; } } - return true; } @@ -677,32 +705,34 @@ GainMeterBase::set_route_group_meter_point (Route& route, MeterPoint mp) } void -GainMeterBase::meter_point_clicked () +GainMeterBase::meter_point_clicked (MeterPoint mp) { if (_route) { - /* WHAT? */ + switch (meter_point_change_target) { + case MeterPointChangeAll: + _session->foreach_route (this, &GainMeterBase::set_meter_point, mp); + break; + case MeterPointChangeGroup: + set_route_group_meter_point (*_route, mp); + break; + case MeterPointChangeSingle: + _route->set_meter_point (mp); + break; + } } } -bool -GainMeterBase::gain_slider_button_press (GdkEventButton* ev) +void +GainMeterBase::amp_start_touch () { - switch (ev->type) { - case GDK_BUTTON_PRESS: - _amp->gain_control()->start_touch (_amp->session().transport_frame()); - break; - default: - return false; - } - - return false; + _control->start_touch (_control->session().transport_frame()); } -bool -GainMeterBase::gain_slider_button_release (GdkEventButton*) +void +GainMeterBase::amp_stop_touch () { - _amp->gain_control()->stop_touch (false, _amp->session().transport_frame()); - return false; + _control->stop_touch (false, _control->session().transport_frame()); + effective_gain_display (); } gint @@ -714,7 +744,10 @@ GainMeterBase::gain_automation_state_button_event (GdkEventButton *ev) switch (ev->button) { case 1: - gain_astate_menu.popup (1, ev->time); + gain_astate_propagate = Keyboard::modifier_state_contains (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier | Keyboard::TertiaryModifier)); + Gtkmm2ext::anchored_menu_popup(&gain_astate_menu, + &gain_automation_state_button, + "", 1, ev->time); break; default: break; @@ -804,10 +837,10 @@ GainMeterBase::gain_automation_style_changed () { switch (_width) { case Wide: - gain_automation_style_button.set_text (astyle_string(_amp->gain_control()->alist()->automation_style())); + gain_automation_style_button.set_text (astyle_string(_control->alist()->automation_style())); break; case Narrow: - gain_automation_style_button.set_text (short_astyle_string(_amp->gain_control()->alist()->automation_style())); + gain_automation_style_button.set_text (short_astyle_string(_control->alist()->automation_style())); break; } } @@ -815,38 +848,44 @@ GainMeterBase::gain_automation_style_changed () void GainMeterBase::gain_automation_state_changed () { - ENSURE_GUI_THREAD (*this, &GainMeterBase::gain_automation_state_changed) - - bool x; + ENSURE_GUI_THREAD (*this, &GainMeterBase::gain_automation_state_changed); switch (_width) { case Wide: - gain_automation_state_button.set_text (astate_string(_amp->gain_control()->alist()->automation_state())); + gain_automation_state_button.set_text (astate_string(_control->alist()->automation_state())); break; case Narrow: - gain_automation_state_button.set_text (short_astate_string(_amp->gain_control()->alist()->automation_state())); + gain_automation_state_button.set_text (short_astate_string(_control->alist()->automation_state())); break; } - x = (_amp->gain_control()->alist()->automation_state() != ARDOUR::Off); + const bool automation_watch_required = (_control->alist()->automation_state() != ARDOUR::Off); - if (gain_automation_state_button.get_active() != x) { + if (gain_automation_state_button.get_active() != automation_watch_required) { ignore_toggle = true; - gain_automation_state_button.set_active (x); + gain_automation_state_button.set_active (automation_watch_required); ignore_toggle = false; } update_gain_sensitive (); - /* start watching automation so that things move */ - gain_watching.disconnect(); - if (x) { - gain_watching = ARDOUR_UI::RapidScreenUpdate.connect (sigc::mem_fun (*this, &GainMeterBase::effective_gain_display)); + if (automation_watch_required) { + /* start watching automation so that things move */ + gain_watching = Timers::rapid_connect (sigc::mem_fun (*this, &GainMeterBase::effective_gain_display)); + } else { + /* update once to get the correct value shown as we re-enter off/manual mode */ + effective_gain_display(); } } +const ChanCount +GainMeterBase::meter_channels() const +{ + if (_meter) { return _meter->input_streams(); } + else { return ChanCount(); } +} void GainMeterBase::update_meters() { @@ -856,13 +895,13 @@ GainMeterBase::update_meters() if (mpeak > max_peak) { max_peak = mpeak; if (mpeak <= -200.0f) { - peak_display.set_label (_("-inf")); + peak_display.set_text (_("-inf")); } else { snprintf (buf, sizeof(buf), "%.1f", mpeak); - peak_display.set_label (buf); + peak_display.set_text (buf); } } - if (mpeak >= Config->get_meter_peak()) { + if (mpeak >= UIConfiguration::instance().get_meter_peak()) { peak_display.set_name ("MixerStripPeakDisplayPeak"); } } @@ -897,6 +936,8 @@ GainMeterBase::redraw_metrics() meter_ticks2_area.queue_draw (); } +#define PX_SCALE(pxmin, dflt) rint(std::max((double)pxmin, (double)dflt * UIConfiguration::instance().get_ui_scale())) + GainMeter::GainMeter (Session* s, int fader_length) : GainMeterBase (s, false, fader_length, 24) , gain_display_box(true, 0) @@ -907,34 +948,38 @@ GainMeter::GainMeter (Session* s, int fader_length) } gain_display_box.pack_start (gain_display, true, true); + if (peak_display.get_parent()) { + peak_display.get_parent()->remove (gain_display); + } + gain_display_box.pack_start (peak_display, true, true); + meter_metric_area.set_name ("AudioTrackMetrics"); - meter_metric_area.set_size_request(24, -1); + meter_metric_area.set_size_request(PX_SCALE(24, 24), -1); gain_automation_style_button.set_name ("mixer strip button"); gain_automation_state_button.set_name ("mixer strip button"); - ARDOUR_UI::instance()->set_tip (gain_automation_state_button, _("Fader automation mode")); - ARDOUR_UI::instance()->set_tip (gain_automation_style_button, _("Fader automation type")); + set_tooltip (gain_automation_state_button, _("Fader automation mode")); + set_tooltip (gain_automation_style_button, _("Fader automation type")); gain_automation_style_button.unset_flags (Gtk::CAN_FOCUS); gain_automation_state_button.unset_flags (Gtk::CAN_FOCUS); - gain_automation_state_button.set_size_request(15, 15); - gain_automation_style_button.set_size_request(15, 15); + gain_automation_state_button.set_size_request (PX_SCALE(12, 15), PX_SCALE(12, 15)); + gain_automation_style_button.set_size_request (PX_SCALE(12, 15), PX_SCALE(12, 15)); - fader_vbox = manage (new Gtk::VBox()); - fader_vbox->set_spacing (0); - fader_vbox->pack_start (*gain_slider, true, true); + fader_vbox.set_spacing (0); + fader_vbox.pack_start (*gain_slider, true, true); fader_alignment.set (0.5, 0.5, 0.0, 1.0); - fader_alignment.add (*fader_vbox); + fader_alignment.add (fader_vbox); hbox.pack_start (fader_alignment, true, true); - set_spacing (2); + set_spacing (PX_SCALE(2, 2)); pack_start (gain_display_box, Gtk::PACK_SHRINK); - pack_start (hbox, Gtk::PACK_SHRINK); + pack_start (hbox, true, true); meter_alignment.set (0.5, 0.5, 0.0, 1.0); meter_alignment.add (*level_meter); @@ -942,8 +987,8 @@ GainMeter::GainMeter (Session* s, int fader_length) meter_metric_area.signal_expose_event().connect ( sigc::mem_fun(*this, &GainMeter::meter_metrics_expose)); - meter_ticks1_area.set_size_request(3,-1); - meter_ticks2_area.set_size_request(3,-1); + meter_ticks1_area.set_size_request (PX_SCALE(3, 3), -1); + meter_ticks2_area.set_size_request (PX_SCALE(3, 3), -1); meter_ticks1_area.signal_expose_event().connect ( sigc::mem_fun(*this, &GainMeter::meter_ticks1_expose)); @@ -955,13 +1000,15 @@ GainMeter::GainMeter (Session* s, int fader_length) meter_hbox.pack_start (meter_ticks2_area, false, false); meter_hbox.pack_start (meter_metric_area, false, false); } +#undef PX_SCALE GainMeter::~GainMeter () { } void GainMeter::set_controls (boost::shared_ptr r, boost::shared_ptr meter, - boost::shared_ptr amp) + boost::shared_ptr amp, + boost::shared_ptr control) { if (meter_hbox.get_parent()) { hbox.remove (meter_hbox); @@ -971,7 +1018,7 @@ GainMeter::set_controls (boost::shared_ptr r, // fader_vbox->remove (gain_automation_state_button); // } - GainMeterBase::set_controls (r, meter, amp); + GainMeterBase::set_controls (r, meter, amp, control); if (_meter) { _meter->ConfigurationChanged.connect ( @@ -987,20 +1034,20 @@ GainMeter::set_controls (boost::shared_ptr r, if (_route) { _route->active_changed.connect (model_connections, invalidator (*this), boost::bind (&GainMeter::route_active_changed, this), gui_context ()); + hbox.pack_start (meter_hbox, true, true); + meter_hbox.show (); } - /* - if we have a non-hidden route (ie. we're not the click or the auditioner), - pack some route-dependent stuff. - */ - - hbox.pack_start (meter_hbox, true, true); - // if (r && !r->is_auditioner()) { // fader_vbox->pack_start (gain_automation_state_button, false, false, 0); // } - hbox.show_all (); + gain_display_box.show (); + gain_display.show (); + gain_slider->show (); + fader_vbox.show (); + fader_alignment.show (); + hbox.show (); setup_meters (); } @@ -1009,6 +1056,7 @@ GainMeter::get_gm_width () { Gtk::Requisition sz; int min_w = 0; + sz.width = 0; meter_metric_area.size_request (sz); min_w += sz.width; level_meter->size_request (sz); @@ -1052,11 +1100,18 @@ GainMeter::meter_ticks2_expose (GdkEventExpose *ev) return meter_expose_ticks(ev, _route->meter_type(), _types, &meter_ticks2_area); } +void +GainMeter::on_style_changed (const Glib::RefPtr&) +{ + gain_display.queue_draw(); + peak_display.queue_draw(); +} + boost::shared_ptr GainMeterBase::get_controllable() { if (_amp) { - return _amp->gain_control(); + return _control; } else { return boost::shared_ptr(); } @@ -1065,7 +1120,7 @@ GainMeterBase::get_controllable() bool GainMeterBase::level_meter_button_press (GdkEventButton* ev) { - return LevelMeterButtonPress (ev); /* EMIT SIGNAL */ + return static_cast(LevelMeterButtonPress (ev)); /* EMIT SIGNAL */ } void @@ -1117,6 +1172,7 @@ GainMeter::meter_configuration_changed (ChanCount c) setup_meters(); meter_clear_pattern_cache(4); + on_style_changed(Glib::RefPtr()); } void