X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fgain_meter.cc;h=5f0a854e69b1c09599f8dfc57bdfa560973e88e5;hb=56af59953fb612bac7272bd855ebe1911d4b4eb2;hp=daba2e77d4d27316eccaae20559e645de887d380;hpb=049c11de58704790bc652dcb9acfb207af4a8ebe;p=ardour.git diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index daba2e77d4..5f0a854e69 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" @@ -34,23 +35,24 @@ #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; @@ -61,7 +63,6 @@ using namespace std; using Gtkmm2ext::Keyboard; using namespace ArdourMeter; - static void reset_cursor_to_default (Gtk::Entry* widget) { @@ -81,12 +82,18 @@ 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 ("") + , gain_astate_propagate (false) , _data_type (DataType::AUDIO) - { using namespace Menu_Helpers; @@ -97,6 +104,9 @@ 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, boost::shared_ptr(), fader_length, fader_girth)); } else { @@ -119,16 +129,16 @@ 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); + 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_text (_("-inf")); - peak_display.set_alignment(0.5); - + 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. + 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)); @@ -139,8 +149,8 @@ GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int 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); @@ -152,9 +162,10 @@ 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)); + 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); @@ -164,8 +175,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)); + 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 () @@ -177,26 +188,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 ( @@ -213,34 +229,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 @@ -258,11 +286,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); @@ -275,7 +303,7 @@ GainMeterBase::setup_gain_adjustment () ignore_toggle = false; effective_gain_display (); - + _previous_amp_output_streams = _amp->output_streams (); } @@ -391,7 +419,7 @@ GainMeterBase::reset_peak_display () { _meter->reset_max(); level_meter->clear_meters(); - max_peak = -INFINITY; + max_peak = minus_infinity (); peak_display.set_text (_("-inf")); peak_display.set_name ("MixerStripPeakDisplay"); } @@ -449,24 +477,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()) { @@ -511,24 +533,21 @@ 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 { - _amp->set_gain (value, this); + value = gain_adjustment.get_value(); } + + _control->set_value (value, Controllable::UseGroup); } show_gain (); @@ -537,20 +556,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; } } @@ -581,7 +603,7 @@ 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); } @@ -610,7 +632,7 @@ next_meter_point (MeterPoint mp) break; } - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ return MeterInput; } @@ -722,13 +744,13 @@ GainMeterBase::meter_point_clicked () void GainMeterBase::amp_start_touch () { - _amp->gain_control()->start_touch (_amp->session().transport_frame()); + _control->start_touch (_control->session().transport_frame()); } void GainMeterBase::amp_stop_touch () { - _amp->gain_control()->stop_touch (false, _amp->session().transport_frame()); + _control->stop_touch (false, _control->session().transport_frame()); } gint @@ -740,7 +762,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; @@ -830,10 +855,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; } } @@ -841,35 +866,35 @@ 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(); } } @@ -894,7 +919,7 @@ GainMeterBase::update_meters() peak_display.set_text (buf); } } - if (mpeak >= Config->get_meter_peak()) { + if (mpeak >= UIConfiguration::instance().get_meter_peak()) { peak_display.set_name ("MixerStripPeakDisplayPeak"); } } @@ -929,6 +954,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) @@ -945,33 +972,32 @@ GainMeter::GainMeter (Session* s, int fader_length) 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); @@ -979,8 +1005,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)); @@ -992,13 +1018,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); @@ -1008,7 +1036,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 ( @@ -1024,20 +1052,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 (); } @@ -1101,7 +1129,7 @@ boost::shared_ptr GainMeterBase::get_controllable() { if (_amp) { - return _amp->gain_control(); + return _control; } else { return boost::shared_ptr(); } @@ -1110,7 +1138,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