X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fgain_meter.cc;h=41323acf19b46fa0a3e3f9a60780d7b009f0d07e;hb=e5a181c323243a03338f5a9934a5df254986370d;hp=f03a001b1ad04913bfa6846f41b62ec25f33d82d;hpb=7c94499aeca8a67ee5f0fe51fb4f957d6618fef4;p=ardour.git diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index f03a001b1a..41323acf19 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -19,6 +19,12 @@ #include +#include + +#include +#include +#include + #include "ardour/amp.h" #include "ardour/logmeter.h" #include "ardour/route_group.h" @@ -26,12 +32,11 @@ #include "ardour/dB.h" #include "ardour/utils.h" -#include -#include -#include -#include -#include -#include +#include "gtkmm2ext/utils.h" +#include "gtkmm2ext/gtk_ui.h" + +#include "widgets/tooltips.h" + #include "pbd/fastlog.h" #include "pbd/stacktrace.h" @@ -42,7 +47,6 @@ #include "utils.h" #include "meter_patterns.h" #include "timers.h" -#include "tooltips.h" #include "ui_config.h" #include "ardour/session.h" @@ -55,7 +59,7 @@ #include "pbd/i18n.h" using namespace ARDOUR; -using namespace ARDOUR_UI_UTILS; +using namespace ArdourWidgets; using namespace PBD; using namespace Gtkmm2ext; using namespace Gtk; @@ -109,8 +113,10 @@ GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int if (horizontal) { gain_slider = manage (new HSliderController (&gain_adjustment, boost::shared_ptr(), fader_length, fader_girth)); + gain_slider->set_tweaks (ArdourFader::Tweaks(ArdourFader::NoButtonForward | ArdourFader::NoVerticalScroll)); } else { gain_slider = manage (new VSliderController (&gain_adjustment, boost::shared_ptr(), fader_length, fader_girth)); + gain_slider->set_tweaks (ArdourFader::NoButtonForward); } level_meter = new LevelMeterHBox(_session); @@ -119,7 +125,6 @@ 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->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"); @@ -258,6 +263,8 @@ GainMeterBase::set_controls (boost::shared_ptr r, 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 (*this, &GainMeterBase::set_gain_astate), (AutoState) ARDOUR::Touch))); + gain_astate_menu.items().push_back (MenuElem (_("Latch"), + sigc::bind (sigc::mem_fun (*this, &GainMeterBase::set_gain_astate), (AutoState) ARDOUR::Latch))); 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))); @@ -288,7 +295,12 @@ GainMeterBase::set_gain_astate (AutoState as) ChangeGainAutomationState (as); return; } - _amp->set_parameter_automation_state (Evoral::Parameter (GainAutomation), as); + if (_amp) { + _amp->set_parameter_automation_state (Evoral::Parameter (GainAutomation), as); + } else if (_control) { + _control->set_automation_state (as); + _session->set_dirty (); + } } void @@ -310,7 +322,7 @@ GainMeterBase::setup_gain_adjustment () 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)); + gain_slider->set_default_value (gain_to_slider_position_with_max (GAIN_COEFF_UNITY, Config->get_max_gain())); } else { _data_type = DataType::MIDI; gain_adjustment.set_lower (0.0); @@ -408,7 +420,7 @@ GainMeter::set_type (MeterType t) bool GainMeterBase::gain_key_press (GdkEventKey* ev) { - if (key_is_legal_for_numeric_entry (ev->keyval)) { + if (ARDOUR_UI_UTILS::key_is_legal_for_numeric_entry (ev->keyval)) { /* drop through to normal handling */ return false; } @@ -617,7 +629,8 @@ GainMeterBase::effective_gain_display () void GainMeterBase::gain_changed () { - Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&GainMeterBase::effective_gain_display, this)); + ENSURE_GUI_THREAD (*this, &GainMeterBase::gain_automation_state_changed); + effective_gain_display (); } void @@ -641,7 +654,7 @@ void GainMeterBase::update_gain_sensitive () { bool x = !(_control->alist()->automation_state() & Play); - static_cast(gain_slider)->set_sensitive (x); + static_cast(gain_slider)->set_sensitive (x); } gint @@ -721,13 +734,13 @@ GainMeterBase::meter_point_clicked (MeterPoint mp) void GainMeterBase::amp_start_touch () { - _control->start_touch (_control->session().transport_frame()); + _control->start_touch (_control->session().transport_sample()); } void GainMeterBase::amp_stop_touch () { - _control->stop_touch (false, _control->session().transport_frame()); + _control->stop_touch (_control->session().transport_sample()); effective_gain_display (); } @@ -772,16 +785,19 @@ GainMeterBase::_astate_string (AutoState state, bool shrt) switch (state) { case ARDOUR::Off: - sstr = (shrt ? "M" : _("M")); + sstr = (shrt ? "M" : S_("Manual|M")); break; case Play: - sstr = (shrt ? "P" : _("P")); + sstr = (shrt ? "P" : S_("Play|P")); break; case Touch: - sstr = (shrt ? "T" : _("T")); + sstr = (shrt ? "T" : S_("Trim|T")); + break; + case Latch: + sstr = (shrt ? "L" : S_("Latch|L")); break; case Write: - sstr = (shrt ? "W" : _("W")); + sstr = (shrt ? "W" : S_("Write|W")); break; } @@ -813,14 +829,6 @@ GainMeterBase::gain_automation_state_changed () update_gain_sensitive (); gain_watching.disconnect(); - - 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