X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fgain_meter.cc;h=9a4ed70084b72bd2cf1b03e92f2e1055cce5d50a;hb=eb1e423b7521d4c277c11a884113f40e7406ade8;hp=c7c44c59158bb1c0f5a14b6f06f0737c5f98a2fb;hpb=962e7a214aa8841f88e5fbf6bb12499dfddeb269;p=ardour.git diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index c7c44c5915..9a4ed70084 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; @@ -90,7 +94,6 @@ GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int 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 ("") , meter_point_button (_("pre")) , gain_astate_propagate (false) @@ -120,7 +123,7 @@ 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->set_tweaks (ArdourFader::Tweaks(ArdourFader::NoButtonForward | ArdourFader::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"); @@ -147,24 +150,16 @@ GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int peak_display.unset_flags (Gtk::CAN_FOCUS); peak_display.set_editable (false); - gain_automation_style_button.set_name ("mixer strip button"); gain_automation_state_button.set_name ("mixer strip button"); 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_astyle_menu.items().push_back (MenuElem (_("Trim"))); - 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"); @@ -268,12 +263,10 @@ GainMeterBase::set_controls (boost::shared_ptr r, gain_astate_menu.items().push_back (MenuElem (_("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()); gain_automation_state_changed (); } @@ -321,7 +314,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); @@ -419,7 +412,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; } @@ -628,7 +621,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 @@ -652,7 +646,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 @@ -763,22 +757,6 @@ GainMeterBase::gain_automation_state_button_event (GdkEventButton *ev) return TRUE; } -gint -GainMeterBase::gain_automation_style_button_event (GdkEventButton *ev) -{ - if (ev->type == GDK_BUTTON_RELEASE) { - return TRUE; - } - - switch (ev->button) { - case 1: - gain_astyle_menu.popup (1, ev->time); - break; - default: - break; - } - return TRUE; -} string GainMeterBase::astate_string (AutoState state) @@ -815,43 +793,6 @@ GainMeterBase::_astate_string (AutoState state, bool shrt) return sstr; } -string -GainMeterBase::astyle_string (AutoStyle style) -{ - return _astyle_string (style, false); -} - -string -GainMeterBase::short_astyle_string (AutoStyle style) -{ - return _astyle_string (style, true); -} - -string -GainMeterBase::_astyle_string (AutoStyle style, bool shrt) -{ - if (style & Trim) { - return _("Trim"); - } else { - /* XXX it might different in different languages */ - - return (shrt ? _("Abs") : _("Abs")); - } -} - -void -GainMeterBase::gain_automation_style_changed () -{ - switch (_width) { - case Wide: - gain_automation_style_button.set_text (astyle_string(_control->alist()->automation_style())); - break; - case Narrow: - gain_automation_style_button.set_text (short_astyle_string(_control->alist()->automation_style())); - break; - } -} - void GainMeterBase::gain_automation_state_changed () { @@ -877,14 +818,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 @@ -963,17 +896,13 @@ GainMeter::GainMeter (Session* s, int fader_length) meter_metric_area.set_name ("AudioTrackMetrics"); 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"); 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 (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.set_spacing (0); fader_vbox.pack_start (*gain_slider, true, true);