X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fgain_meter.cc;h=53dd0062245bfae345a98da944f1afdafa41fc2c;hb=249ee47296fdaf000c2820e9922d8b429020759e;hp=166d29ef2cca2b26031d921e496f4eb78bd78118;hpb=e39a8fc9681a35b95e6d0f9b4e1a9b31d932f262;p=ardour.git diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index 166d29ef2c..53dd006224 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -25,13 +25,13 @@ #include "ardour/dB.h" #include "ardour/utils.h" +#include #include #include #include #include #include #include -#include "midi++/manager.h" #include "pbd/fastlog.h" #include "pbd/stacktrace.h" @@ -43,10 +43,13 @@ #include "keyboard.h" #include "public_editor.h" #include "utils.h" +#include "meter_patterns.h" #include "ardour/session.h" #include "ardour/route.h" #include "ardour/meter.h" +#include "ardour/audio_track.h" +#include "ardour/midi_track.h" #include "i18n.h" @@ -56,37 +59,12 @@ using namespace Gtkmm2ext; using namespace Gtk; using namespace std; using Gtkmm2ext::Keyboard; +using namespace ArdourMeter; -sigc::signal GainMeterBase::ResetAllPeakDisplays; -sigc::signal GainMeterBase::ResetGroupPeakDisplays; - -GainMeter::MetricPatterns GainMeter::metric_patterns; -Glib::RefPtr GainMeter::slider; -Glib::RefPtr GainMeter::slider_desensitised; - - -void -GainMeter::setup_slider_pix () -{ - if ((slider = ::get_icon ("fader_belt")) == 0) { - throw failed_constructor(); - } - - if ((slider_desensitised = ::get_icon ("fader_belt_desensitised")) == 0) { - throw failed_constructor(); - } -} - -GainMeterBase::GainMeterBase (Session* s, - const Glib::RefPtr& pix, - const Glib::RefPtr& pix_desensitised, - bool horizontal, - int fader_length) +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_automation_style_button ("") , gain_automation_state_button ("") - , style_changed (false) - , dpi_changed (false) , _data_type (DataType::AUDIO) { @@ -100,27 +78,19 @@ GainMeterBase::GainMeterBase (Session* s, _width = Wide; if (horizontal) { - gain_slider = manage (new HSliderController (pix, - pix_desensitised, - &gain_adjustment, - fader_length, - false)); + gain_slider = manage (new HSliderController (&gain_adjustment, fader_length, fader_girth, false)); } else { - gain_slider = manage (new VSliderController (pix, - pix_desensitised, - &gain_adjustment, - fader_length, - false)); + gain_slider = manage (new VSliderController (&gain_adjustment, fader_length, fader_girth, false)); } - 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)); - gain_slider->signal_button_release_event().connect (sigc::mem_fun(*this, &GainMeter::gain_slider_button_release)); + 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_name ("GainFader"); gain_display.set_name ("MixerStripGainDisplay"); @@ -128,6 +98,7 @@ GainMeterBase::GainMeterBase (Session* s, 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); peak_display.set_name ("MixerStripPeakDisplay"); set_size_request_to_display_given_text (peak_display, "-80.g", 2, 6); /* note the descender */ @@ -135,8 +106,8 @@ GainMeterBase::GainMeterBase (Session* s, peak_display.set_label (_("-inf")); peak_display.unset_flags (Gtk::CAN_FOCUS); - gain_automation_style_button.set_name ("MixerAutomationModeButton"); - gain_automation_state_button.set_name ("MixerAutomationPlaybackButton"); + 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")); @@ -158,11 +129,22 @@ GainMeterBase::GainMeterBase (Session* s, 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 () +{ +// gain_slider->set_flat_buttons( ARDOUR_UI::config()->flat_buttons.get() ); } GainMeterBase::~GainMeterBase () @@ -203,7 +185,7 @@ GainMeterBase::set_controls (boost::shared_ptr r, setup_gain_adjustment (); - if (!_route || !_route->is_hidden()) { + if (!_route || !_route->is_auditioner()) { using namespace Menu_Helpers; @@ -253,7 +235,7 @@ GainMeterBase::setup_gain_adjustment () ignore_toggle = true; - if (_amp->output_streams().n_midi() == 0) { + 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); @@ -264,9 +246,9 @@ GainMeterBase::setup_gain_adjustment () _data_type = DataType::MIDI; gain_adjustment.set_lower (0.0); gain_adjustment.set_upper (2.0); - gain_adjustment.set_step_increment (0.05); - gain_adjustment.set_page_increment (0.1); - gain_slider->set_default_value (1); + gain_adjustment.set_step_increment (1.0/128.0); + gain_adjustment.set_page_increment (10.0/128.0); + gain_slider->set_default_value (1.0); } ignore_toggle = false; @@ -285,33 +267,61 @@ 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; + + switch (_width) { + case Wide: + //meter_ticks1_area.show(); + //meter_ticks2_area.show(); + meter_metric_area.show(); + if (_route && _route->shared_peak_meter()->input_streams().n_total() == 1) { + meter_width = 10; + } + break; + case Narrow: + if (_route && _route->shared_peak_meter()->input_streams().n_total() > 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::setup_meters (int len) +GainMeterBase::set_type (MeterType t) { - level_meter->setup_meters(len, 5); + 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: + hbox.set_homogeneous(true); + 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) { @@ -335,7 +345,7 @@ GainMeterBase::peak_button_release (GdkEventButton* ev) ResetGroupPeakDisplays (_route->route_group()); } } else { - reset_peak_display (); + ResetRoutePeakDisplays (_route.get()); } return true; @@ -347,10 +357,18 @@ GainMeterBase::reset_peak_display () _meter->reset_max(); level_meter->clear_meters(); max_peak = -INFINITY; - peak_display.set_label (_("-Inf")); + peak_display.set_label (_("-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) { @@ -396,16 +414,40 @@ GainMeterBase::gain_activated () { float f; - if (sscanf (gain_display.get_text().c_str(), "%f", &f) == 1) { + { + // Switch to user's preferred locale so that + // if they use different LC_NUMERIC conventions, + // we will honor them. - /* clamp to displayable values */ + PBD::LocaleGuard lg (""); + if (sscanf (gain_display.get_text().c_str(), "%f", &f) != 1) { + return; + } + } + /* clamp to displayable values */ + if (_data_type == DataType::AUDIO) { f = min (f, 6.0f); - _amp->set_gain (dB_to_coefficient(f), this); + } else { + f = min (fabs (f), 2.0f); + _amp->set_gain (f, this); + } + + if (gain_display.has_focus()) { + Gtk::Widget* w = gain_display.get_toplevel(); + if (w) { + Gtk::Window* win = dynamic_cast (w); + + /* sigh. gtkmm doesn't wrap get_default_widget() */ - if (gain_display.has_focus()) { - PublicEditor::instance().reset_focus(); + if (win) { + GtkWidget* f = gtk_window_get_default_widget (win->gobj()); + if (f) { + gtk_widget_grab_focus (f); + return; + } + } } } } @@ -436,15 +478,14 @@ GainMeterBase::show_gain () void GainMeterBase::gain_adjusted () { - gain_t value = 0; + gain_t value; - switch (_data_type) { - case DataType::AUDIO: + /* 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()); - break; - case DataType::MIDI: - value = gain_adjustment.get_value (); - break; + } else { + value = gain_adjustment.get_value(); } if (!ignore_toggle) { @@ -488,16 +529,18 @@ 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 GainMeterBase::set_fader_name (const char * name) { - uint32_t rgb_active = rgba_from_style (name, 0xff, 0, 0xff, 0, "bg", STATE_ACTIVE, false); - uint32_t rgb_normal = rgba_from_style (name, 0xff, 0xff, 0, 0, "bg", STATE_NORMAL, false); - - gain_slider->set_border_colors (rgb_normal, rgb_active); + gain_slider->set_name (name); } void @@ -652,14 +695,14 @@ GainMeterBase::gain_slider_button_press (GdkEventButton* ev) return false; } - return true; + return false; } bool GainMeterBase::gain_slider_button_release (GdkEventButton*) { _amp->gain_control()->stop_touch (false, _amp->session().transport_frame()); - return true; + return false; } gint @@ -761,10 +804,10 @@ GainMeterBase::gain_automation_style_changed () { switch (_width) { case Wide: - gain_automation_style_button.set_label (astyle_string(_amp->gain_control()->alist()->automation_style())); + gain_automation_style_button.set_text (astyle_string(_amp->gain_control()->alist()->automation_style())); break; case Narrow: - gain_automation_style_button.set_label (short_astyle_string(_amp->gain_control()->alist()->automation_style())); + gain_automation_style_button.set_text (short_astyle_string(_amp->gain_control()->alist()->automation_style())); break; } } @@ -778,10 +821,10 @@ GainMeterBase::gain_automation_state_changed () switch (_width) { case Wide: - gain_automation_state_button.set_label (astate_string(_amp->gain_control()->alist()->automation_state())); + gain_automation_state_button.set_text (astate_string(_amp->gain_control()->alist()->automation_state())); break; case Narrow: - gain_automation_state_button.set_label (short_astate_string(_amp->gain_control()->alist()->automation_state())); + gain_automation_state_button.set_text (short_astate_string(_amp->gain_control()->alist()->automation_state())); break; } @@ -818,17 +861,14 @@ GainMeterBase::update_meters() snprintf (buf, sizeof(buf), "%.1f", mpeak); peak_display.set_label (buf); } - - if (mpeak >= 0.0f) { - peak_display.set_name ("MixerStripPeakDisplayPeak"); - } + } + if (mpeak >= Config->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(); } @@ -836,28 +876,47 @@ void GainMeterBase::set_width (Width w, int len) { _width = w; - level_meter->setup_meters (len); + int meter_width = 5; + if (_width == Wide && _route && _route->shared_peak_meter()->input_streams().n_total() == 1) { + meter_width = 10; + } + level_meter->setup_meters(len, meter_width); } 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 (); } GainMeter::GainMeter (Session* s, int fader_length) - : GainMeterBase (s, slider, slider_desensitised, false, fader_length) + : GainMeterBase (s, false, fader_length, 24) , gain_display_box(true, 0) , hbox(true, 2) { + if (gain_display.get_parent()) { + gain_display.get_parent()->remove (gain_display); + } 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", 0, 0); + meter_metric_area.set_size_request(24, -1); - gain_automation_style_button.set_name ("MixerAutomationModeButton"); - gain_automation_state_button.set_name ("MixerAutomationPlaybackButton"); + 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")); @@ -887,24 +946,35 @@ 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.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); } +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 (peak_display.get_parent()) { - gain_display_box.remove (peak_display); - } - - if (gain_automation_state_button.get_parent()) { - fader_vbox->remove (gain_automation_state_button); - } +// if (gain_automation_state_button.get_parent()) { +// fader_vbox->remove (gain_automation_state_button); +// } GainMeterBase::set_controls (r, meter, amp); @@ -912,196 +982,79 @@ 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. */ - gain_display_box.pack_end (peak_display, true, true); - hbox.pack_start (meter_alignment, true, true); + hbox.pack_start (meter_hbox, true, true); - if (r && !r->is_hidden()) { - fader_vbox->pack_start (gain_automation_state_button, false, false, 0); - } +// 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; + 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); - PangoLayout* layout = gtk_widget_create_pango_layout (w.gobj(), ""); - - 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: - 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: - 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); - - cairo_set_line_width (cr, 1.0); - cairo_move_to (cr, 0, pos); - cairo_line_to (cr, 4, pos); - cairo_stroke (cr); - - snprintf (buf, sizeof (buf), "%d", abs (*j)); - pango_layout_set_text (layout, buf, strlen (buf)); - - /* we want logical extents, not ink extents here */ - - int tw, th; - pango_layout_get_pixel_size (layout, &tw, &th); - - int p = pos - (th / 2); - p = min (p, height - th); - p = max (p, 0); - - cairo_move_to (cr, 6, p); - pango_cairo_show_layout (cr, layout); - } + 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); - g_object_unref (layout); - - 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); } - - 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; + return meter_expose_ticks(ev, _route->meter_type(), _types, &meter_ticks2_area); } boost::shared_ptr @@ -1123,15 +1076,65 @@ GainMeterBase::level_meter_button_press (GdkEventButton* ev) void GainMeter::meter_configuration_changed (ChanCount c) { + int type = 0; _types.clear (); for (DataType::iterator i = DataType::begin(); i != DataType::end(); ++i) { if (c.get (*i) > 0) { _types.push_back (*i); + type |= 1 << (*i); } } - style_changed = true; - meter_metric_area.queue_draw (); + if (_route + && boost::dynamic_pointer_cast(_route) == 0 + && boost::dynamic_pointer_cast(_route) == 0 + ) { + if (_route->active()) { + set_meter_strip_name ("AudioBusMetrics"); + } else { + set_meter_strip_name ("AudioBusMetricsInactive"); + } + } + else if ( + (type == (1 << DataType::MIDI)) + || (_route && boost::dynamic_pointer_cast(_route)) + ) { + if (!_route || _route->active()) { + set_meter_strip_name ("MidiTrackMetrics"); + } else { + set_meter_strip_name ("MidiTrackMetricsInactive"); + } + } + else if (type == (1 << DataType::AUDIO)) { + if (!_route || _route->active()) { + set_meter_strip_name ("AudioTrackMetrics"); + } else { + set_meter_strip_name ("AudioTrackMetricsInactive"); + } + } else { + if (!_route || _route->active()) { + set_meter_strip_name ("AudioMidiTrackMetrics"); + } else { + set_meter_strip_name ("AudioMidiTrackMetricsInactive"); + } + } + + setup_meters(); + meter_clear_pattern_cache(4); } +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(); +}