X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fgain_meter.cc;h=b7b53a64bf0909faa179c7a23e32530574d6cae0;hb=0c9249604fdce2f313f356ca63d85fb8a0792e45;hp=38fd7f14df3f83c1b7bd4675a590bd36e9b57ef9;hpb=97d3393c50e877be842d176db93db184a79c1945;p=ardour.git diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index 38fd7f14df..90585c3676 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -30,49 +30,67 @@ #include #include #include -#include #include -#include "midi++/manager.h" #include "pbd/fastlog.h" #include "pbd/stacktrace.h" -#include "ardour_ui.h" #include "gain_meter.h" -#include "global_signals.h" #include "logmeter.h" #include "gui_thread.h" #include "keyboard.h" #include "public_editor.h" #include "utils.h" +#include "meter_patterns.h" +#include "timers.h" +#include "tooltips.h" +#include "ui_config.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" using namespace ARDOUR; +using namespace ARDOUR_UI_UTILS; using namespace PBD; using namespace Gtkmm2ext; using namespace Gtk; using namespace std; using Gtkmm2ext::Keyboard; +using namespace ArdourMeter; -sigc::signal GainMeterBase::ResetAllPeakDisplays; -sigc::signal GainMeterBase::ResetGroupPeakDisplays; +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); + } +} -GainMeter::MetricPatterns GainMeter::metric_patterns; +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 ("") - , style_changed (false) - , dpi_changed (false) , _data_type (DataType::AUDIO) - { using namespace Menu_Helpers; @@ -83,20 +101,24 @@ GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int next_release_selects = false; _width = Wide; + fader_length = rint (fader_length * UIConfiguration::instance().get_ui_scale()); + fader_girth = rint (fader_girth * UIConfiguration::instance().get_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 LevelMeter(_session); + level_meter = new LevelMeterHBox(_session); level_meter->ButtonPress.connect_same_thread (_level_meter_connection, boost::bind (&GainMeterBase::level_meter_button_press, this, _1)); 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"); @@ -104,18 +126,28 @@ 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); 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_label (_("-inf")); + 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"); - ARDOUR_UI::instance()->set_tip (gain_automation_state_button, _("Fader automation mode")); - ARDOUR_UI::instance()->set_tip (gain_automation_style_button, _("Fader automation type")); + 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); @@ -134,21 +166,13 @@ GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int gain_display.signal_key_press_event().connect (sigc::mem_fun(*this, &GainMeterBase::gain_key_press), false); ResetAllPeakDisplays.connect (sigc::mem_fun(*this, &GainMeterBase::reset_peak_display)); + ResetRoutePeakDisplays.connect (sigc::mem_fun(*this, &GainMeterBase::reset_route_peak_display)); ResetGroupPeakDisplays.connect (sigc::mem_fun(*this, &GainMeterBase::reset_group_peak_display)); + RedrawMetrics.connect (sigc::mem_fun(*this, &GainMeterBase::redraw_metrics)); 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 () -{ -printf("set_flat_butt\n"); -// gain_slider->set_flat_buttons( ARDOUR_UI::config()->flat_buttons.get() ); + UIConfiguration::instance().ColorsChanged.connect (sigc::bind(sigc::mem_fun (*this, &GainMeterBase::color_handler), false)); + UIConfiguration::instance().DPIReset.connect (sigc::bind(sigc::mem_fun (*this, &GainMeterBase::color_handler), true)); } GainMeterBase::~GainMeterBase () @@ -241,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); @@ -258,7 +282,7 @@ GainMeterBase::setup_gain_adjustment () ignore_toggle = false; effective_gain_display (); - + _previous_amp_output_streams = _amp->output_streams (); } @@ -271,37 +295,75 @@ GainMeterBase::hide_all_meters () void GainMeter::hide_all_meters () { - bool remove_metric_area = false; - GainMeterBase::hide_all_meters (); - - if (remove_metric_area) { - if (meter_metric_area.get_parent()) { - level_meter->remove (meter_metric_area); - } - } } void GainMeterBase::setup_meters (int len) { int meter_width = 5; - if (_route && _route->shared_peak_meter()->input_streams().n_total() == 1) { - meter_width = 10; + 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(); + } + + switch (_width) { + case Wide: + //meter_ticks1_area.show(); + //meter_ticks2_area.show(); + meter_metric_area.show(); + if (meter_channels == 1) { + meter_width = 10; + } + break; + case Narrow: + if (meter_channels > 1) { + meter_width = 4; + } + //meter_ticks1_area.hide(); + //meter_ticks2_area.hide(); + meter_metric_area.hide(); + break; } level_meter->setup_meters(len, meter_width); } +void +GainMeterBase::set_type (MeterType t) +{ + level_meter->set_type(t); +} + void GainMeter::setup_meters (int len) { - if (!meter_metric_area.get_parent()) { - level_meter->pack_end (meter_metric_area, false, false); - meter_metric_area.show_all (); + switch (_width) { + case Wide: + { + 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); + break; } GainMeterBase::setup_meters (len); } +void +GainMeter::set_type (MeterType t) +{ + GainMeterBase::set_type (t); +} + bool GainMeterBase::gain_key_press (GdkEventKey* ev) { @@ -325,7 +387,7 @@ GainMeterBase::peak_button_release (GdkEventButton* ev) ResetGroupPeakDisplays (_route->route_group()); } } else { - reset_peak_display (); + ResetRoutePeakDisplays (_route.get()); } return true; @@ -337,10 +399,18 @@ GainMeterBase::reset_peak_display () _meter->reset_max(); level_meter->clear_meters(); max_peak = -INFINITY; - peak_display.set_label (_("-inf")); + peak_display.set_text (_("-inf")); peak_display.set_name ("MixerStripPeakDisplay"); } +void +GainMeterBase::reset_route_peak_display (Route* route) +{ + if (_route && _route.get() == route) { + reset_peak_display (); + } +} + void GainMeterBase::reset_group_peak_display (RouteGroup* group) { @@ -400,10 +470,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); + _amp->gain_control()->set_value (dB_to_coefficient(f), Controllable::NoGroup); } else { f = min (fabs (f), 2.0f); - _amp->set_gain (f, this); + _amp->gain_control()->set_value (f, Controllable::NoGroup); } if (gain_display.has_focus()) { @@ -459,12 +529,12 @@ GainMeterBase::gain_adjusted () } else { value = gain_adjustment.get_value(); } - + if (!ignore_toggle) { if (_route && _route->amp() == _amp) { - _route->set_gain (value, this); + _route->set_gain (value, Controllable::UseGroup); } else { - _amp->set_gain (value, this); + _amp->gain_control()->set_value (value, Controllable::NoGroup); } } @@ -474,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: @@ -501,7 +571,12 @@ GainMeterBase::gain_changed () void GainMeterBase::set_meter_strip_name (const char * name) { + char tmp[256]; meter_metric_area.set_name (name); + sprintf(tmp, "Mark%sLeft", name); + meter_ticks1_area.set_name (tmp); + sprintf(tmp, "Mark%sRight", name); + meter_ticks2_area.set_name (tmp); } void @@ -542,7 +617,7 @@ next_meter_point (MeterPoint mp) break; } - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ return MeterInput; } @@ -651,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 @@ -782,9 +848,9 @@ GainMeterBase::gain_automation_style_changed () void GainMeterBase::gain_automation_state_changed () { - ENSURE_GUI_THREAD (*this, &GainMeterBase::gain_automation_state_changed) + ENSURE_GUI_THREAD (*this, &GainMeterBase::gain_automation_state_changed); - bool x; + cerr << "GMB:autostate change to " << _amp->gain_control()->alist()->automation_state() << endl; switch (_width) { case Wide: @@ -795,25 +861,33 @@ GainMeterBase::gain_automation_state_changed () break; } - x = (_amp->gain_control()->alist()->automation_state() != ARDOUR::Off); + const bool automation_watch_required = (_amp->gain_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) { - gain_watching = ARDOUR_UI::RapidScreenUpdate.connect (sigc::mem_fun (*this, &GainMeterBase::effective_gain_display)); + 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 +GainMeterBase::meter_channels() const +{ + if (_meter) { return _meter->input_streams(); } + else { return ChanCount(); } +} void GainMeterBase::update_meters() { @@ -823,22 +897,19 @@ GainMeterBase::update_meters() if (mpeak > max_peak) { max_peak = mpeak; if (mpeak <= -200.0f) { - peak_display.set_label (_("-inf")); + peak_display.set_text (_("-inf")); } else { snprintf (buf, sizeof(buf), "%.1f", mpeak); - peak_display.set_label (buf); - } - - if (mpeak >= 0.0f) { - peak_display.set_name ("MixerStripPeakDisplayPeak"); + peak_display.set_text (buf); } } + if (mpeak >= UIConfiguration::instance().get_meter_peak()) { + peak_display.set_name ("MixerStripPeakDisplayPeak"); + } } -void GainMeterBase::color_handler(bool dpi) +void GainMeterBase::color_handler(bool /*dpi*/) { - color_changed = true; - dpi_changed = (dpi) ? true : false; setup_meters(); } @@ -847,7 +918,7 @@ GainMeterBase::set_width (Width w, int len) { _width = w; int meter_width = 5; - if (_route && _route->shared_peak_meter()->input_streams().n_total() == 1) { + if (_width == Wide && _route && _route->shared_peak_meter()->input_streams().n_total() == 1) { meter_width = 10; } level_meter->setup_meters(len, meter_width); @@ -857,9 +928,18 @@ GainMeterBase::set_width (Width w, int len) void GainMeterBase::on_theme_changed() { - style_changed = true; } +void +GainMeterBase::redraw_metrics() +{ + meter_metric_area.queue_draw (); + meter_ticks1_area.queue_draw (); + meter_ticks2_area.queue_draw (); +} + +#define PX_SCALE(pxmin, dflt) rint(std::max((double)pxmin, (double)dflt * UIConfiguration::instance().get_ui_scale())) + GainMeter::GainMeter (Session* s, int fader_length) : GainMeterBase (s, false, fader_length, 24) , gain_display_box(true, 0) @@ -870,20 +950,25 @@ GainMeter::GainMeter (Session* s, int fader_length) } gain_display_box.pack_start (gain_display, true, true); + if (peak_display.get_parent()) { + peak_display.get_parent()->remove (gain_display); + } + gain_display_box.pack_start (peak_display, true, true); + meter_metric_area.set_name ("AudioTrackMetrics"); - set_size_request_to_display_given_text (meter_metric_area, "-127", 1, 0); + 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"); - ARDOUR_UI::instance()->set_tip (gain_automation_state_button, _("Fader automation mode")); - ARDOUR_UI::instance()->set_tip (gain_automation_style_button, _("Fader automation type")); + 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_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); @@ -894,7 +979,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); @@ -904,15 +989,31 @@ 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 (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)); + meter_ticks2_area.signal_expose_event().connect ( + sigc::mem_fun(*this, &GainMeter::meter_ticks2_expose)); + + meter_hbox.pack_start (meter_ticks1_area, false, false); + meter_hbox.pack_start (meter_alignment, false, false); + meter_hbox.pack_start (meter_ticks2_area, false, false); + meter_hbox.pack_start (meter_metric_area, false, false); } +#undef PX_SCALE + +GainMeter::~GainMeter () { } void GainMeter::set_controls (boost::shared_ptr r, boost::shared_ptr meter, boost::shared_ptr amp) { - if (meter_alignment.get_parent()) { - hbox.remove (meter_alignment); + if (meter_hbox.get_parent()) { + hbox.remove (meter_hbox); } // if (gain_automation_state_button.get_parent()) { @@ -925,222 +1026,87 @@ GainMeter::set_controls (boost::shared_ptr r, _meter->ConfigurationChanged.connect ( model_connections, invalidator (*this), boost::bind (&GainMeter::meter_configuration_changed, this, _1), gui_context() ); + _meter->TypeChanged.connect ( + model_connections, invalidator (*this), boost::bind (&GainMeter::meter_type_changed, this, _1), gui_context() + ); meter_configuration_changed (_meter->input_streams ()); } + if (_route) { + _route->active_changed.connect (model_connections, invalidator (*this), boost::bind (&GainMeter::route_active_changed, this), gui_context ()); + } + /* 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_alignment, true, true); + hbox.pack_start (meter_hbox, true, true); // if (r && !r->is_auditioner()) { // fader_vbox->pack_start (gain_automation_state_button, false, false, 0); // } - setup_meters (); hbox.show_all (); + setup_meters (); } int GainMeter::get_gm_width () { Gtk::Requisition sz; - hbox.size_request (sz); - return sz.width; + int min_w = 0; + sz.width = 0; + meter_metric_area.size_request (sz); + min_w += sz.width; + level_meter->size_request (sz); + min_w += sz.width; + + fader_alignment.size_request (sz); + if (_width == Wide) + return max(sz.width * 2, min_w * 2) + 6; + else + return sz.width + min_w + 6; + } -cairo_pattern_t* -GainMeter::render_metrics (Gtk::Widget& w, vector types) +gint +GainMeter::meter_metrics_expose (GdkEventExpose *ev) { - Glib::RefPtr win (w.get_window()); - - gint width, height; - win->get_size (width, height); - - cairo_surface_t* surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24, width, height); - cairo_t* cr = cairo_create (surface); - Glib::RefPtr layout = Pango::Layout::create(w.get_pango_context()); - - - Pango::AttrList audio_font_attributes; - Pango::AttrList midi_font_attributes; - - Pango::AttrFontDesc* font_attr; - Pango::FontDescription font; - - font = Pango::FontDescription (""); // use defaults - //font = get_font_for_style("gain-fader"); - //font = w.get_style()->get_font(); - - font.set_weight (Pango::WEIGHT_NORMAL); - font.set_size (9.0 * PANGO_SCALE); - font_attr = new Pango::AttrFontDesc (Pango::Attribute::create_attr_font_desc (font)); - audio_font_attributes.change (*font_attr); - delete font_attr; - - font.set_weight (Pango::WEIGHT_ULTRALIGHT); - font.set_stretch (Pango::STRETCH_ULTRA_CONDENSED); - font.set_size (7.5 * PANGO_SCALE); - font_attr = new Pango::AttrFontDesc (Pango::Attribute::create_attr_font_desc (font)); - midi_font_attributes.change (*font_attr); - delete font_attr; - - - cairo_move_to (cr, 0, 0); - cairo_rectangle (cr, 0, 0, width, height); - { - Gdk::Color c = w.get_style()->get_bg (Gtk::STATE_NORMAL); - cairo_set_source_rgb (cr, c.get_red_p(), c.get_green_p(), c.get_blue_p()); - } - cairo_fill (cr); - - for (vector::const_iterator i = types.begin(); i != types.end(); ++i) { - - Gdk::Color c; - - if (types.size() > 1) { - /* we're overlaying more than 1 set of marks, so use different colours */ - Gdk::Color c; - switch (*i) { - case DataType::AUDIO: - c = w.get_style()->get_fg (Gtk::STATE_NORMAL); - cairo_set_source_rgb (cr, c.get_red_p(), c.get_green_p(), c.get_blue_p()); - break; - case DataType::MIDI: - c = w.get_style()->get_fg (Gtk::STATE_ACTIVE); - cairo_set_source_rgb (cr, c.get_red_p(), c.get_green_p(), c.get_blue_p()); - break; - } - } else { - c = w.get_style()->get_fg (Gtk::STATE_NORMAL); - cairo_set_source_rgb (cr, c.get_red_p(), c.get_green_p(), c.get_blue_p()); - } - - vector points; - - switch (*i) { - case DataType::AUDIO: - layout->set_attributes (audio_font_attributes); - points.push_back (-50); - points.push_back (-40); - points.push_back (-30); - points.push_back (-20); - points.push_back (-10); - points.push_back (-3); - points.push_back (0); - points.push_back (4); - break; - - case DataType::MIDI: - layout->set_attributes (midi_font_attributes); - points.push_back (0); - if (types.size() == 1) { - points.push_back (32); - } else { - /* tweak so as not to overlay the -30dB mark */ - points.push_back (48); - } - points.push_back (64); - points.push_back (96); - points.push_back (127); - break; - } - - char buf[32]; - - for (vector::const_iterator j = points.begin(); j != points.end(); ++j) { - - float fraction = 0; - switch (*i) { - case DataType::AUDIO: - fraction = log_meter (*j); - break; - case DataType::MIDI: - fraction = *j / 127.0; - break; - } - - gint const pos = height - (gint) floor (height * fraction); - float const linepos = min((float) height, (float)(pos + .5f)); - - cairo_set_line_width (cr, 1.0); - cairo_move_to (cr, 0, linepos); - cairo_line_to (cr, 3.5, linepos); - cairo_stroke (cr); - - snprintf (buf, sizeof (buf), "%2d", abs (*j)); - layout->set_text(buf); - - /* we want logical extents, not ink extents here */ - - int tw, th; - layout->get_pixel_size(tw, th); - - int p = pos - (th / 2); - p = min (p, height - th); - p = max (p, 0); - - cairo_move_to (cr, 5, p); - pango_cairo_show_layout (cr, layout->gobj()); - } + if (!_route) { + if (_types.empty()) { _types.push_back(DataType::AUDIO); } + return meter_expose_metrics(ev, MeterPeak, _types, &meter_metric_area); } + return meter_expose_metrics(ev, _route->meter_type(), _types, &meter_metric_area); +} - cairo_pattern_t* pattern = cairo_pattern_create_for_surface (surface); - MetricPatterns::iterator p; - - if ((p = metric_patterns.find (w.get_name())) != metric_patterns.end()) { - cairo_pattern_destroy (p->second); +gint +GainMeter::meter_ticks1_expose (GdkEventExpose *ev) +{ + if (!_route) { + if (_types.empty()) { _types.push_back(DataType::AUDIO); } + return meter_expose_ticks(ev, MeterPeak, _types, &meter_ticks1_area); } - - metric_patterns[w.get_name()] = pattern; - - cairo_destroy (cr); - cairo_surface_destroy (surface); - - return pattern; + return meter_expose_ticks(ev, _route->meter_type(), _types, &meter_ticks1_area); } gint -GainMeter::meter_metrics_expose (GdkEventExpose *ev) +GainMeter::meter_ticks2_expose (GdkEventExpose *ev) { - Glib::RefPtr win (meter_metric_area.get_window()); - cairo_t* cr; - - cr = gdk_cairo_create (win->gobj()); - - /* clip to expose area */ - - gdk_cairo_rectangle (cr, &ev->area); - cairo_clip (cr); - - cairo_pattern_t* pattern; - MetricPatterns::iterator i = metric_patterns.find (meter_metric_area.get_name()); - - if (i == metric_patterns.end() || style_changed || dpi_changed) { - pattern = render_metrics (meter_metric_area, _types); - } else { - pattern = i->second; + if (!_route) { + if (_types.empty()) { _types.push_back(DataType::AUDIO); } + return meter_expose_ticks(ev, MeterPeak, _types, &meter_ticks2_area); } + return meter_expose_ticks(ev, _route->meter_type(), _types, &meter_ticks2_area); +} - cairo_move_to (cr, 0, 0); - cairo_set_source (cr, pattern); - - gint width, height; - win->get_size (width, height); - - cairo_rectangle (cr, 0, 0, width, height); - cairo_fill (cr); - - style_changed = false; - dpi_changed = false; - - cairo_destroy (cr); - - return true; +void +GainMeter::on_style_changed (const Glib::RefPtr&) +{ + gain_display.queue_draw(); + peak_display.queue_draw(); } boost::shared_ptr @@ -1156,7 +1122,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 @@ -1182,18 +1148,21 @@ GainMeter::meter_configuration_changed (ChanCount c) set_meter_strip_name ("AudioBusMetricsInactive"); } } - else if (type == (1 << DataType::AUDIO)) { + else if ( + (type == (1 << DataType::MIDI)) + || (_route && boost::dynamic_pointer_cast(_route)) + ) { if (!_route || _route->active()) { - set_meter_strip_name ("AudioTrackMetrics"); + set_meter_strip_name ("MidiTrackMetrics"); } else { - set_meter_strip_name ("AudioTrackMetricsInactive"); + set_meter_strip_name ("MidiTrackMetricsInactive"); } } - else if (type == (1 << DataType::MIDI)) { + else if (type == (1 << DataType::AUDIO)) { if (!_route || _route->active()) { - set_meter_strip_name ("MidiTrackMetrics"); + set_meter_strip_name ("AudioTrackMetrics"); } else { - set_meter_strip_name ("MidiTrackMetricsInactive"); + set_meter_strip_name ("AudioTrackMetricsInactive"); } } else { if (!_route || _route->active()) { @@ -1203,7 +1172,22 @@ GainMeter::meter_configuration_changed (ChanCount c) } } - style_changed = true; - meter_metric_area.queue_draw (); + setup_meters(); + meter_clear_pattern_cache(4); + on_style_changed(Glib::RefPtr()); } +void +GainMeter::route_active_changed () +{ + if (_meter) { + meter_configuration_changed (_meter->input_streams ()); + } +} + +void +GainMeter::meter_type_changed (MeterType t) +{ + _route->set_meter_type(t); + RedrawMetrics(); +}