X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fgain_meter.cc;h=d4610da601833824a5b2fb3c2259659ba2887ada;hb=4df3666738607039445ebc9fa083bf5c23ac5539;hp=fc458cb66d795d836eb3e2550fe81b1acc900a8c;hpb=c38898f1a655901703a24be5ff7be2f2b0ad217e;p=ardour.git diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index fc458cb66d..d4610da601 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -32,7 +32,6 @@ #include #include #include -#include "midi++/manager.h" #include "pbd/fastlog.h" #include "pbd/stacktrace.h" @@ -44,6 +43,7 @@ #include "keyboard.h" #include "public_editor.h" #include "utils.h" +#include "meter_patterns.h" #include "ardour/session.h" #include "ardour/route.h" @@ -59,18 +59,12 @@ using namespace Gtkmm2ext; using namespace Gtk; using namespace std; using Gtkmm2ext::Keyboard; - -sigc::signal GainMeterBase::ResetAllPeakDisplays; -sigc::signal GainMeterBase::ResetGroupPeakDisplays; - -GainMeter::MetricPatterns GainMeter::metric_patterns; +using namespace ArdourMeter; 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) { @@ -89,7 +83,7 @@ GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int 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)); @@ -134,7 +128,9 @@ 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)); @@ -271,37 +267,58 @@ 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 (_width == Wide && _route && _route->shared_peak_meter()->input_streams().n_total() == 1) { - meter_width = 10; + + 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: + 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: + 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) { @@ -325,7 +342,7 @@ GainMeterBase::peak_button_release (GdkEventButton* ev) ResetGroupPeakDisplays (_route->route_group()); } } else { - reset_peak_display (); + ResetRoutePeakDisplays (_route.get()); } return true; @@ -341,6 +358,14 @@ GainMeterBase::reset_peak_display () 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) { @@ -501,7 +526,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 @@ -828,17 +858,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(); } @@ -857,7 +884,14 @@ 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 (); } GainMeter::GainMeter (Session* s, int fader_length) @@ -871,7 +905,7 @@ GainMeter::GainMeter (Session* s, int fader_length) gain_display_box.pack_start (gain_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(24, -1); gain_automation_style_button.set_name ("mixer strip button"); gain_automation_state_button.set_name ("mixer strip button"); @@ -904,15 +938,30 @@ 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 (gain_automation_state_button.get_parent()) { @@ -925,225 +974,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. */ - 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; + 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) { - - gint pos; - - float fraction = 0; - switch (*i) { - case DataType::AUDIO: - fraction = log_meter (*j); - pos = height - (gint) floor (height * fraction); - break; - case DataType::MIDI: - fraction = *j / 127.0; - pos = 1 + height - (gint) floor (height * fraction); - break; - } - - 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); } - - 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 @@ -1185,18 +1088,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()) { @@ -1206,7 +1112,21 @@ GainMeter::meter_configuration_changed (ChanCount c) } } - style_changed = true; - meter_metric_area.queue_draw (); + 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(); +}