X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fgain_meter.cc;h=53968d7e8c69b600133affc765c96089719c4517;hb=da7d7f950233f109f82f7e7ea5c62f81ef3d7bbb;hp=9e1edbb520a2f1a611f544e7325aa11aac896e6c;hpb=4dc63966f0872efe768dad61eb9b8785d06b92d1;p=ardour.git diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index 9e1edbb520..53968d7e8c 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -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,14 +129,14 @@ 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. */ @@ -161,7 +164,7 @@ GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int gain_astate_menu.set_name ("ArdourContextMenu"); 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); @@ -184,26 +187,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 ( @@ -220,34 +228,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 @@ -282,7 +302,7 @@ GainMeterBase::setup_gain_adjustment () ignore_toggle = false; effective_gain_display (); - + _previous_amp_output_streams = _amp->output_streams (); } @@ -398,7 +418,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"); } @@ -461,7 +481,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; } @@ -470,10 +490,10 @@ GainMeterBase::gain_activated () /* 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()) { @@ -518,24 +538,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 (); @@ -544,20 +561,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 (_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; } } @@ -588,7 +608,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); } @@ -729,13 +749,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 @@ -747,6 +767,7 @@ GainMeterBase::gain_automation_state_button_event (GdkEventButton *ev) switch (ev->button) { case 1: + gain_astate_propagate = Keyboard::modifier_state_contains (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier | Keyboard::TertiaryModifier)); gain_astate_menu.popup (1, ev->time); break; default: @@ -837,10 +858,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; } } @@ -848,35 +869,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) { + 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(); } } @@ -968,19 +989,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); @@ -1008,7 +1028,8 @@ 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); @@ -1018,7 +1039,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 ( @@ -1034,20 +1055,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 (); } @@ -1111,7 +1132,7 @@ boost::shared_ptr GainMeterBase::get_controllable() { if (_amp) { - return _amp->gain_control(); + return _control; } else { return boost::shared_ptr(); }