X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fgain_meter.cc;h=85122b93ee8caa2a9bdc7aa20069315f2f5e4a66;hb=adb492b914ab157dfd718b0555d1d48a4e591974;hp=e06f2b024c9a1c6bdbc27feaea5374c7167539fd;hpb=3dc7728038860bda6eb4b0de1f4a3e14ec9e86cc;p=ardour.git diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index e06f2b024c..85122b93ee 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -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,7 @@ 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 ("") + , gain_astate_propagate (false) , _data_type (DataType::AUDIO) { using namespace Menu_Helpers; @@ -126,13 +129,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,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); @@ -190,12 +194,15 @@ GainMeterBase::set_controls (boost::shared_ptr r, 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; } @@ -204,8 +211,6 @@ GainMeterBase::set_controls (boost::shared_ptr r, _route = r; _control = control; - assert (_control); - level_meter->set_meter (pm.get()); gain_slider->set_controllable (_control); @@ -224,20 +229,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()); @@ -250,6 +252,23 @@ GainMeterBase::set_controls (boost::shared_ptr r, 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 @@ -400,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"); } @@ -463,7 +482,7 @@ GainMeterBase::gain_activated () // if they use different LC_NUMERIC conventions, // we will honor them. - PBD::LocaleGuard lg (); + PBD::LocaleGuard lg; if (sscanf (gain_display.get_text().c_str(), "%f", &f) != 1) { return; } @@ -472,10 +491,10 @@ GainMeterBase::gain_activated () /* 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()) { @@ -520,24 +539,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(); - } + /* convert from adjustment range (0..1) to gain coefficient */ - if (!ignore_toggle) { - if (_route && _route->amp() == _amp) { - _route->set_gain (value, Controllable::UseGroup); + if (_data_type == DataType::AUDIO) { + value = slider_position_to_gain_with_max (gain_adjustment.get_value(), Config->get_max_gain()); } else { - _control->set_value (value, Controllable::NoGroup); + value = gain_adjustment.get_value(); } + + _control->set_value (value, Controllable::UseGroup); } show_gain (); @@ -546,20 +562,23 @@ GainMeterBase::gain_adjusted () void GainMeterBase::effective_gain_display () { - float value = GAIN_COEFF_ZERO; + gain_t fader_position = 0; switch (_data_type) { case DataType::AUDIO: - value = gain_to_slider_position_with_max (_control->get_value(), 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 = _control->get_value (); + 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; } } @@ -731,13 +750,13 @@ GainMeterBase::meter_point_clicked () void GainMeterBase::amp_start_touch () { - _control->start_touch (_amp->session().transport_frame()); + _control->start_touch (_control->session().transport_frame()); } void GainMeterBase::amp_stop_touch () { - _control->stop_touch (false, _amp->session().transport_frame()); + _control->stop_touch (false, _control->session().transport_frame()); } gint @@ -749,7 +768,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; @@ -970,19 +992,18 @@ GainMeter::GainMeter (Session* s, int fader_length) 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 (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); @@ -1037,20 +1058,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 (); }