X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fgain_meter.cc;h=5e2cd62c624f3b2b31440f1ef47f6178b9b94520;hb=54fd56de755a44420d906ad660b18c2d671f1057;hp=b38e653bac3edd7c0b4364092bbd1e5586782a70;hpb=1249e61d73b863179ffc08f1b7e42e3279709578;p=ardour.git diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index b38e653bac..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" @@ -35,7 +36,6 @@ #include "pbd/stacktrace.h" #include "gain_meter.h" -#include "logmeter.h" #include "gui_thread.h" #include "keyboard.h" #include "public_editor.h" @@ -52,7 +52,7 @@ #include "ardour/midi_track.h" #include "ardour/dB.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; using namespace ARDOUR_UI_UTILS; @@ -82,6 +82,8 @@ 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()), // value 0.0, // lower @@ -90,6 +92,8 @@ GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int 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; @@ -126,13 +130,13 @@ 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. @@ -159,8 +163,38 @@ 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"); + 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); @@ -225,20 +259,17 @@ 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))); _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()); @@ -259,6 +290,17 @@ GainMeterBase::set_controls (boost::shared_ptr r, } } +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 GainMeterBase::setup_gain_adjustment () { @@ -342,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 @@ -405,9 +447,13 @@ 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; + max_peak = minus_infinity (); peak_display.set_text (_("-inf")); peak_display.set_name ("MixerStripPeakDisplay"); } @@ -465,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); - _control->set_value (dB_to_coefficient(f), Controllable::NoGroup); + _control->set_value (dB_to_coefficient(f), Controllable::UseGroup); } else { f = min (fabs (f), 2.0f); - _control->set_value (f, Controllable::NoGroup); + _control->set_value (f, Controllable::UseGroup); } if (gain_display.has_focus()) { @@ -541,10 +581,13 @@ GainMeterBase::fader_moved () value = gain_adjustment.get_value(); } - if (_route && _control == _route->gain_control()) { - _route->set_gain (value, Controllable::UseGroup); - } else { + // 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 { + _control->set_value (value, Controllable::UseGroup); } } @@ -605,111 +648,41 @@ GainMeterBase::update_gain_sensitive () 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; - } - - abort(); /*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; } @@ -732,10 +705,20 @@ 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; + } } } @@ -749,6 +732,7 @@ void GainMeterBase::amp_stop_touch () { _control->stop_touch (false, _control->session().transport_frame()); + effective_gain_display (); } gint @@ -760,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;