X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fgain_meter.cc;h=50592c77576dc3f55cca41e397d445d7784b241f;hb=d9cb8a807e9cd9e355e9445caad2f7f9adc0bfad;hp=571cffe0a17c4c5d778ec013dd0e86ab2afb2d27;hpb=394ea9cb860354c1f24bbecf5a85e88d1a16d136;p=ardour.git diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index 571cffe0a1..50592c7757 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -30,7 +30,6 @@ #include #include #include -#include #include #include "pbd/fastlog.h" #include "pbd/stacktrace.h" @@ -44,12 +43,14 @@ #include "public_editor.h" #include "utils.h" #include "meter_patterns.h" +#include "timers.h" #include "ardour/session.h" #include "ardour/route.h" #include "ardour/meter.h" #include "ardour/audio_track.h" #include "ardour/midi_track.h" +#include "ardour/dB.h" #include "i18n.h" @@ -62,12 +63,34 @@ using namespace std; using Gtkmm2ext::Keyboard; using namespace ArdourMeter; +static void +reset_cursor_to_default (Gtk::Entry* widget) +{ + Glib::RefPtr win = widget->get_text_window (); + if (win) { + /* C++ doesn't provide a pointer argument version of this + (i.e. you cannot set to NULL to get the default/parent + cursor) + */ + gdk_window_set_cursor (win->gobj(), 0); + } +} + +static void +reset_cursor_to_default_state (Gtk::StateType, Gtk::Entry* widget) +{ + reset_cursor_to_default (widget); +} + 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()), 0.0, 1.0, 0.01, 0.1) + : gain_adjustment (gain_to_slider_position_with_max (1.0, Config->get_max_gain()), // value + 0.0, // lower + 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 ("") , _data_type (DataType::AUDIO) - { using namespace Menu_Helpers; @@ -78,10 +101,13 @@ GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int next_release_selects = false; _width = Wide; + fader_length = rint (fader_length * ARDOUR_UI::ui_scale); + fader_girth = rint (fader_girth * ARDOUR_UI::ui_scale); + if (horizontal) { - gain_slider = manage (new HSliderController (&gain_adjustment, fader_length, fader_girth, false)); + gain_slider = manage (new HSliderController (&gain_adjustment, boost::shared_ptr(), fader_length, fader_girth)); } else { - gain_slider = manage (new VSliderController (&gain_adjustment, fader_length, fader_girth, false)); + gain_slider = manage (new VSliderController (&gain_adjustment, boost::shared_ptr(), fader_length, fader_girth)); } level_meter = new LevelMeterHBox(_session); @@ -90,8 +116,9 @@ 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->signal_button_press_event().connect (sigc::mem_fun(*this, &GainMeter::gain_slider_button_press), false); - gain_slider->signal_button_release_event().connect (sigc::mem_fun(*this, &GainMeter::gain_slider_button_release), false); + 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"); gain_display.set_name ("MixerStripGainDisplay"); @@ -99,13 +126,22 @@ 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(1.0); + 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); + + /* stuff related to the fact that the peak display is not, in + fact, supposed to be a text entry. + */ + peak_display.set_events (peak_display.get_events() & ~(Gdk::EventMask (Gdk::LEAVE_NOTIFY_MASK|Gdk::ENTER_NOTIFY_MASK|Gdk::POINTER_MOTION_MASK))); + peak_display.signal_map().connect (sigc::bind (sigc::ptr_fun (reset_cursor_to_default), &peak_display)); + peak_display.signal_state_changed().connect (sigc::bind (sigc::ptr_fun (reset_cursor_to_default_state), &peak_display)); 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"); @@ -137,15 +173,6 @@ GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int UI::instance()->theme_changed.connect (sigc::mem_fun(*this, &GainMeterBase::on_theme_changed)); ColorsChanged.connect (sigc::bind(sigc::mem_fun (*this, &GainMeterBase::color_handler), false)); DPIReset.connect (sigc::bind(sigc::mem_fun (*this, &GainMeterBase::color_handler), true)); - -// PBD::ScopedConnection _config_connection; -// Config->ParameterChanged.connect ( _config_connection, MISSING_INVALIDATOR, boost::bind(&GainMeterBase::set_flat_buttons, this, _1), gui_context() ); -} - -void -GainMeterBase::set_flat_buttons () -{ -// gain_slider->set_flat_buttons( ARDOUR_UI::config()->flat_buttons.get() ); } GainMeterBase::~GainMeterBase () @@ -238,11 +265,11 @@ GainMeterBase::setup_gain_adjustment () if (_amp->output_streams().n_midi() <= _amp->output_streams().n_audio()) { _data_type = DataType::AUDIO; - gain_adjustment.set_lower (0.0); - gain_adjustment.set_upper (1.0); - gain_adjustment.set_step_increment (0.01); - gain_adjustment.set_page_increment (0.1); - gain_slider->set_default_value (gain_to_slider_position (1)); + gain_adjustment.set_lower (GAIN_COEFF_ZERO); + 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)); } else { _data_type = DataType::MIDI; gain_adjustment.set_lower (0.0); @@ -314,7 +341,15 @@ GainMeter::setup_meters (int len) { switch (_width) { case Wide: - hbox.set_homogeneous(true); + { + uint32_t meter_channels = 0; + if (_meter) { + meter_channels = _meter->input_streams().n_total(); + } else if (_route) { + meter_channels = _route->shared_peak_meter()->input_streams().n_total(); + } + hbox.set_homogeneous(meter_channels < 7 ? true : false); + } break; case Narrow: hbox.set_homogeneous(false); @@ -509,7 +544,7 @@ GainMeterBase::gain_adjusted () void GainMeterBase::effective_gain_display () { - float value = 0.0; + float value = GAIN_COEFF_ZERO; switch (_data_type) { case DataType::AUDIO: @@ -582,7 +617,7 @@ next_meter_point (MeterPoint mp) break; } - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ return MeterInput; } @@ -691,25 +726,16 @@ GainMeterBase::meter_point_clicked () } } -bool -GainMeterBase::gain_slider_button_press (GdkEventButton* ev) +void +GainMeterBase::amp_start_touch () { - switch (ev->type) { - case GDK_BUTTON_PRESS: - _amp->gain_control()->start_touch (_amp->session().transport_frame()); - break; - default: - return false; - } - - return false; + _amp->gain_control()->start_touch (_amp->session().transport_frame()); } -bool -GainMeterBase::gain_slider_button_release (GdkEventButton*) +void +GainMeterBase::amp_stop_touch () { _amp->gain_control()->stop_touch (false, _amp->session().transport_frame()); - return false; } gint @@ -850,10 +876,16 @@ GainMeterBase::gain_automation_state_changed () gain_watching.disconnect(); if (x) { - gain_watching = ARDOUR_UI::RapidScreenUpdate.connect (sigc::mem_fun (*this, &GainMeterBase::effective_gain_display)); + gain_watching = Timers::rapid_connect (sigc::mem_fun (*this, &GainMeterBase::effective_gain_display)); } } +const ChanCount +GainMeterBase::meter_channels() const +{ + if (_meter) { return _meter->input_streams(); } + else { return ChanCount(); } +} void GainMeterBase::update_meters() { @@ -869,7 +901,7 @@ GainMeterBase::update_meters() peak_display.set_text (buf); } } - if (mpeak >= Config->get_meter_peak()) { + if (mpeak >= ARDOUR_UI::config()->get_meter_peak()) { peak_display.set_name ("MixerStripPeakDisplayPeak"); } } @@ -904,6 +936,8 @@ GainMeterBase::redraw_metrics() meter_ticks2_area.queue_draw (); } +#define PX_SCALE(pxmin, dflt) rint(std::max((double)pxmin, (double)dflt * ARDOUR_UI::ui_scale)) + GainMeter::GainMeter (Session* s, int fader_length) : GainMeterBase (s, false, fader_length, 24) , gain_display_box(true, 0) @@ -920,7 +954,7 @@ GainMeter::GainMeter (Session* s, int fader_length) gain_display_box.pack_start (peak_display, true, true); meter_metric_area.set_name ("AudioTrackMetrics"); - meter_metric_area.set_size_request(24, -1); + 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"); @@ -931,8 +965,8 @@ GainMeter::GainMeter (Session* s, int fader_length) 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_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); @@ -943,7 +977,7 @@ GainMeter::GainMeter (Session* s, int fader_length) hbox.pack_start (fader_alignment, true, true); - set_spacing (2); + set_spacing (PX_SCALE(2, 2)); pack_start (gain_display_box, Gtk::PACK_SHRINK); pack_start (hbox, Gtk::PACK_SHRINK); @@ -954,8 +988,8 @@ GainMeter::GainMeter (Session* s, int fader_length) meter_metric_area.signal_expose_event().connect ( sigc::mem_fun(*this, &GainMeter::meter_metrics_expose)); - meter_ticks1_area.set_size_request(3,-1); - meter_ticks2_area.set_size_request(3,-1); + meter_ticks1_area.set_size_request (PX_SCALE(3, 3), -1); + meter_ticks2_area.set_size_request (PX_SCALE(3, 3), -1); meter_ticks1_area.signal_expose_event().connect ( sigc::mem_fun(*this, &GainMeter::meter_ticks1_expose)); @@ -967,6 +1001,7 @@ GainMeter::GainMeter (Session* s, int fader_length) meter_hbox.pack_start (meter_ticks2_area, false, false); meter_hbox.pack_start (meter_metric_area, false, false); } +#undef PX_SCALE GainMeter::~GainMeter () { } @@ -1065,6 +1100,13 @@ GainMeter::meter_ticks2_expose (GdkEventExpose *ev) return meter_expose_ticks(ev, _route->meter_type(), _types, &meter_ticks2_area); } +void +GainMeter::on_style_changed (const Glib::RefPtr&) +{ + gain_display.queue_draw(); + peak_display.queue_draw(); +} + boost::shared_ptr GainMeterBase::get_controllable() { @@ -1078,7 +1120,7 @@ GainMeterBase::get_controllable() bool GainMeterBase::level_meter_button_press (GdkEventButton* ev) { - return LevelMeterButtonPress (ev); /* EMIT SIGNAL */ + return static_cast(LevelMeterButtonPress (ev)); /* EMIT SIGNAL */ } void @@ -1130,6 +1172,7 @@ GainMeter::meter_configuration_changed (ChanCount c) setup_meters(); meter_clear_pattern_cache(4); + on_style_changed(Glib::RefPtr()); } void