#include "ardour/midi_track.h"
#include <gtkmm2ext/gtk_ui.h>
+#include <gtkmm2ext/keyboard.h>
#include <gtkmm2ext/utils.h>
+#include <gtkmm2ext/rgb_macros.h>
#include "ardour_ui.h"
#include "global_signals.h"
#include "logmeter.h"
#include "gui_thread.h"
#include "ardour_window.h"
+#include "utils.h"
#include "meterbridge.h"
#include "meter_strip.h"
+#include "meter_patterns.h"
#include "i18n.h"
using namespace std;
PBD::Signal1<void,MeterStrip*> MeterStrip::CatchDeletion;
-
-MeterStrip::MetricPatterns MeterStrip::metric_patterns;
-MeterStrip::TickPatterns MeterStrip::ticks_patterns;
+PBD::Signal0<void> MeterStrip::MetricChanged;
MeterStrip::MeterStrip (int metricmode)
: AxisView(0)
{
level_meter = 0;
set_spacing(2);
- peakbx.set_size_request(-1, 16);
+ peakbx.set_size_request(-1, 14);
btnbox.set_size_request(-1, 16);
+ namebx.set_size_request(18, 52);
- _types.clear ();
- switch(metricmode) {
- case 1:
- meter_metric_area.set_name ("AudioBusMetrics");
- _types.push_back (DataType::AUDIO);
- break;
- case 2:
- meter_metric_area.set_name ("AudioTrackMetrics");
- _types.push_back (DataType::AUDIO);
- break;
- case 3:
- meter_metric_area.set_name ("MidiTrackMetrics");
- _types.push_back (DataType::MIDI);
- break;
- default:
- meter_metric_area.set_name ("AudioMidiTrackMetrics");
- _types.push_back (DataType::AUDIO);
- _types.push_back (DataType::MIDI);
- break;
- }
- //meter_metric_area.queue_draw ();
+ set_metric_mode(metricmode);
- set_size_request_to_display_given_text (meter_metric_area, "8888", 1, 0);
+ set_size_request_to_display_given_text (meter_metric_area, "-8888", 1, 0);
meter_metric_area.signal_expose_event().connect (
sigc::mem_fun(*this, &MeterStrip::meter_metrics_expose));
meterbox.pack_start(meter_metric_area, true, false);
- label.set_text("");
- label.set_name("MeterbridgeLabel");
- label.set_angle(90.0);
- label.set_alignment(0.5, 1.0);
- label.set_size_request(12, 52);
-
pack_start (peakbx, false, false);
pack_start (meterbox, true, true);
pack_start (btnbox, false, false);
- pack_start (label, false, false, 2);
+ pack_start (namebx, false, false);
peakbx.show();
btnbox.show();
- label.show();
meter_metric_area.show();
meterbox.show();
+ namebx.show();
UI::instance()->theme_changed.connect (sigc::mem_fun(*this, &MeterStrip::on_theme_changed));
ColorsChanged.connect (sigc::mem_fun (*this, &MeterStrip::on_theme_changed));
: AxisView(sess)
, RouteUI(sess)
, _route(rt)
+ , peak_display()
{
set_spacing(2);
RouteUI::set_route (rt);
+ _has_midi = false;
+
int meter_width = 6;
if (_route->shared_peak_meter()->input_streams().n_total() == 1) {
meter_width = 12;
level_meter = new LevelMeter(sess);
level_meter->set_meter (_route->shared_peak_meter().get());
level_meter->clear_meters();
- level_meter->setup_meters (400, meter_width, 6);
+ level_meter->setup_meters (220, meter_width, 6);
- Gtk::Alignment *meter_align = Gtk::manage (new Gtk::Alignment());
- meter_align->set(0.5, 0.5, 0.0, 1.0);
- meter_align->add(*level_meter);
+ meter_align.set(0.5, 0.5, 0.0, 1.0);
+ meter_align.add(*level_meter);
meterbox.pack_start(meter_ticks1_area, true, false);
- meterbox.pack_start(*meter_align, true, true);
+ meterbox.pack_start(meter_align, true, true);
meterbox.pack_start(meter_ticks2_area, true, false);
// peak display
- peak_display.set_name ("MixerStripPeakDisplay");
- set_size_request_to_display_given_text (peak_display, "-80.g", 2, 6);
+ peak_display.set_name ("meterbridge peakindicator");
+ peak_display.set_elements((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body));
max_peak = minus_infinity();
- peak_display.set_label (_("-inf"));
peak_display.unset_flags (Gtk::CAN_FOCUS);
-
- peakbx.pack_start(peak_display, true, true);
- peakbx.set_size_request(-1, 16);
-
- // add track-name label -- TODO ellipsize
- label.set_text(_route->name().c_str());
- label.set_name("MeterbridgeLabel");
- label.set_angle(90.0);
- label.set_alignment(0.5, 1.0);
- label.set_size_request(12, 52);
+ peak_display.set_size_request(12, 8);
+ peak_display.set_corner_radius(2);
+
+ peak_align.set(0.5, 1.0, 1.0, 0.8);
+ peak_align.add(peak_display);
+ peakbx.pack_start(peak_align, true, true, 3);
+ peakbx.set_size_request(-1, 14);
+
+ // add track-name label
+ name_label.set_text(_route->name().c_str());
+ name_label.set_corner_radius(2);
+ name_label.set_name("meterbridge label");
+ name_label.set_angle(-90.0);
+ name_label.layout()->set_ellipsize (Pango::ELLIPSIZE_END);
+ name_label.layout()->set_width(48 * PANGO_SCALE);
+ name_label.set_size_request(18, 50);
+ name_label.set_alignment(-1.0, .5);
+
+ namebx.set_size_request(18, 52);
+ namebx.pack_start(name_label, true, false, 3);
// rec-enable button
btnbox.pack_start(*rec_enable_button, true, false);
+ rec_enable_button->set_corner_radius(2);
btnbox.set_size_request(-1, 16);
pack_start (peakbx, false, false);
pack_start (meterbox, true, true);
pack_start (btnbox, false, false);
- pack_start (label, false, false, 2);
+ pack_start (namebx, false, false);
peak_display.show();
peakbx.show();
meter_ticks2_area.show();
meterbox.show();
level_meter->show();
- meter_align->show();
+ meter_align.show();
+ peak_align.show();
btnbox.show();
- label.show();
+ name_label.show();
+ namebx.show();
_route->shared_peak_meter()->ConfigurationChanged.connect (
route_connections, invalidator (*this), boost::bind (&MeterStrip::meter_configuration_changed, this, _1), gui_context()
);
+
+ ResetAllPeakDisplays.connect (sigc::mem_fun(*this, &MeterStrip::reset_peak_display));
+ ResetGroupPeakDisplays.connect (sigc::mem_fun(*this, &MeterStrip::reset_group_peak_display));
+
meter_configuration_changed (_route->shared_peak_meter()->input_streams ());
- meter_ticks1_area.set_size_request(4,-1);
- meter_ticks2_area.set_size_request(4,-1);
+ 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, &MeterStrip::meter_ticks1_expose));
meter_ticks2_area.signal_expose_event().connect (sigc::mem_fun(*this, &MeterStrip::meter_ticks2_expose));
void
MeterStrip::set_button_names()
{
- rec_enable_button->set_text (_("R"));
+ rec_enable_button->set_text ("");
+ rec_enable_button->set_image (::get_icon (X_("record_normal_red")));
}
void
return;
}
ENSURE_GUI_THREAD (*this, &MeterStrip::strip_name_changed, what_changed)
- label.set_text(_route->name());
+ name_label.set_text(_route->name());
}
void
MeterStrip::fast_update ()
{
- char buf[32];
float mpeak = level_meter->update_meters();
if (mpeak > max_peak) {
max_peak = mpeak;
- if (mpeak <= -200.0f) {
- peak_display.set_label (_("-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_name ("meterbridge peakindicator on");
+ peak_display.set_elements((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body));
}
}
}
-void
-MeterStrip::display_metrics (bool show)
-{
-#if 0
- if (show) {
- meter_metric_area.show();
- } else {
- meter_metric_area.hide();
- }
-#endif
-}
-
void
MeterStrip::on_theme_changed()
{
- metric_patterns.clear();
- ticks_patterns.clear();
+ meter_clear_pattern_cache();
if (level_meter && _route) {
int meter_width = 6;
if (_route->shared_peak_meter()->input_streams().n_total() == 1) {
meter_width = 12;
}
- level_meter->setup_meters (400, meter_width, 6);
+ level_meter->setup_meters (220, meter_width, 6);
}
+ meter_metric_area.queue_draw();
+ meter_ticks1_area.queue_draw();
+ meter_ticks2_area.queue_draw();
}
void
{
int type = 0;
_types.clear ();
+ bool old_has_midi = _has_midi;
for (DataType::iterator i = DataType::begin(); i != DataType::end(); ++i) {
if (c.get (*i) > 0) {
if (boost::dynamic_pointer_cast<AudioTrack>(_route) == 0
&& boost::dynamic_pointer_cast<MidiTrack>(_route) == 0
) {
- meter_ticks1_area.set_name ("AudioBusMetrics");
- meter_ticks2_area.set_name ("AudioBusMetrics");
+ meter_ticks1_area.set_name ("AudioBusMetricsLeft");
+ meter_ticks2_area.set_name ("AudioBusMetricsRight");
+ _has_midi = false;
}
else if (type == (1 << DataType::AUDIO)) {
- meter_ticks1_area.set_name ("AudioTrackMetrics");
- meter_ticks2_area.set_name ("AudioTrackMetrics");
+ meter_ticks1_area.set_name ("AudioTrackMetricsLeft");
+ meter_ticks2_area.set_name ("AudioTrackMetricsRight");
+ _has_midi = false;
}
else if (type == (1 << DataType::MIDI)) {
- meter_ticks1_area.set_name ("MidiTrackMetrics");
- meter_ticks2_area.set_name ("MidiTrackMetrics");
+ meter_ticks1_area.set_name ("MidiTrackMetricsLeft");
+ meter_ticks2_area.set_name ("MidiTrackMetricsRight");
+ _has_midi = true;
} else {
- meter_ticks1_area.set_name ("AudioMidiTrackMetrics");
- meter_ticks2_area.set_name ("AudioMidiTrackMetrics");
+ meter_ticks1_area.set_name ("AudioMidiTrackMetricsLeft");
+ meter_ticks2_area.set_name ("AudioMidiTrackMetricsRight");
+ _has_midi = true;
}
- meter_ticks1_area.queue_draw();
- meter_ticks2_area.queue_draw();
- metric_patterns.clear();
- ticks_patterns.clear();
+
+ if (old_has_midi != _has_midi) MetricChanged();
+ on_theme_changed();
}
void
MeterStrip::on_size_request (Gtk::Requisition* r)
{
- metric_patterns.clear();
- ticks_patterns.clear();
+ meter_clear_pattern_cache();
VBox::on_size_request(r);
}
void
MeterStrip::on_size_allocate (Gtk::Allocation& a)
{
- metric_patterns.clear();
- ticks_patterns.clear();
- VBox::on_size_allocate(a);
-}
-
-/* XXX code-copy from gain_meter.cc -- TODO consolidate
- *
- * slightly different:
- * - ticks & label positions are swapped
- * - more ticks for audio (longer meter by default)
- * - right-aligned lables, unit-legend
- * - height limitation of FastMeter::max_pattern_metric_size is included here
- */
-cairo_pattern_t*
-MeterStrip::render_metrics (Gtk::Widget& w, vector<DataType> types)
-{
- Glib::RefPtr<Gdk::Window> 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<Pango::Layout> layout = Pango::Layout::create(w.get_pango_context());
-
-
- Pango::AttrList audio_font_attributes;
- Pango::AttrList midi_font_attributes;
- Pango::AttrList unit_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;
-
- font.set_size (7.0 * PANGO_SCALE);
- font_attr = new Pango::AttrFontDesc (Pango::Attribute::create_attr_font_desc (font));
- unit_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);
-
- height = min(1024, height); // XXX see FastMeter::max_pattern_metric_size
-
- for (vector<DataType>::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<int> 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 (-25);
- points.push_back (-20);
- points.push_back (-18);
- points.push_back (-15);
- points.push_back (-10);
- points.push_back (-5);
- points.push_back (-3);
- points.push_back (0);
- points.push_back (3);
- 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);
- }
- if (types.size() == 1) {
- points.push_back (64); // very close to -18dB
- points.push_back (96); // overlays with -6dB mark
- } else {
- points.push_back (72);
- points.push_back (88);
- }
- points.push_back (127);
- break;
- }
-
- char buf[32];
-
- for (vector<int>::const_iterator j = points.begin(); j != points.end(); ++j) {
-
- float fraction = 0;
- switch (*i) {
- case DataType::AUDIO:
- fraction = log_meter (*j);
- snprintf (buf, sizeof (buf), "%+2d", *j);
- break;
- case DataType::MIDI:
- fraction = *j / 127.0;
- snprintf (buf, sizeof (buf), "%3d", *j);
- break;
- }
-
- gint const pos = height - (gint) floor (height * fraction);
- 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, width-1-tw, p + .5);
- pango_cairo_show_layout (cr, layout->gobj());
- }
+ meter_clear_pattern_cache();
+ const int wh = a.get_height();
+ int nh = ceilf(wh * .11f);
+ if (nh < 52) nh = 52;
+ if (nh > 148) nh = 148;
+ namebx.set_size_request(18, nh);
+ if (_route) {
+ name_label.set_size_request(18, nh-2);
+ name_label.layout()->set_width((nh-4) * PANGO_SCALE);
}
-
- if (types.size() == 1) {
- int tw, th;
- layout->set_attributes (unit_font_attributes);
- switch (types.at(0)) {
- case DataType::AUDIO:
- layout->set_text("dBFS");
- layout->get_pixel_size(tw, th);
- break;
- case DataType::MIDI:
- layout->set_text("vel");
- layout->get_pixel_size(tw, th);
- break;
- }
- Gdk::Color 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());
- cairo_move_to (cr, 1, height - th);
- pango_cairo_show_layout (cr, layout->gobj());
- }
-
- 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);
- }
-
- metric_patterns[w.get_name()] = pattern;
-
- cairo_destroy (cr);
- cairo_surface_destroy (surface);
-
- return pattern;
+ VBox::on_size_allocate(a);
}
-/* XXX code-copy from gain_meter.cc -- TODO consolidate */
gint
MeterStrip::meter_metrics_expose (GdkEventExpose *ev)
{
- Glib::RefPtr<Gdk::Window> 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()) {
- pattern = render_metrics (meter_metric_area, _types);
- } else {
- pattern = i->second;
- }
-
- 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);
-
- cairo_destroy (cr);
-
- return true;
+ return meter_expose_metrics(ev, _types, &meter_metric_area);
}
-cairo_pattern_t*
-MeterStrip::render_ticks (Gtk::Widget& w, vector<DataType> types)
+void
+MeterStrip::set_metric_mode (int metricmode)
{
- Glib::RefPtr<Gdk::Window> 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);
-
- 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);
-
- height = min(1024, height); // XXX see FastMeter::max_pattern_metric_size
-
- for (vector<DataType>::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());
- }
-
- std::map<int,float> points;
-
- switch (*i) {
- case DataType::AUDIO:
- points.insert (std::pair<int,float>(-60, 0.5));
- points.insert (std::pair<int,float>(-50, 0.5));
- points.insert (std::pair<int,float>(-40, 0.5));
- points.insert (std::pair<int,float>(-30, 0.5));
- points.insert (std::pair<int,float>(-25, 0.5));
- points.insert (std::pair<int,float>(-20, 1.0));
-
- points.insert (std::pair<int,float>(-19, 0.5));
- points.insert (std::pair<int,float>(-18, 1.0));
- points.insert (std::pair<int,float>(-17, 0.5));
- points.insert (std::pair<int,float>(-16, 0.5));
- points.insert (std::pair<int,float>(-15, 1.0));
-
- points.insert (std::pair<int,float>(-14, 0.5));
- points.insert (std::pair<int,float>(-13, 0.5));
- points.insert (std::pair<int,float>(-12, 0.5));
- points.insert (std::pair<int,float>(-11, 0.5));
- points.insert (std::pair<int,float>(-10, 1.0));
-
- points.insert (std::pair<int,float>( -9, 0.5));
- points.insert (std::pair<int,float>( -8, 0.5));
- points.insert (std::pair<int,float>( -7, 0.5));
- points.insert (std::pair<int,float>( -6, 0.5));
- points.insert (std::pair<int,float>( -5, 1.0));
- points.insert (std::pair<int,float>( -4, 0.5));
- points.insert (std::pair<int,float>( -3, 0.5));
- points.insert (std::pair<int,float>( -2, 0.5));
- points.insert (std::pair<int,float>( -1, 0.5));
-
- points.insert (std::pair<int,float>( 0, 1.0));
- points.insert (std::pair<int,float>( 1, 0.5));
- points.insert (std::pair<int,float>( 2, 0.5));
- points.insert (std::pair<int,float>( 3, 0.5));
- points.insert (std::pair<int,float>( 4, 0.5));
- points.insert (std::pair<int,float>( 5, 0.5));
- points.insert (std::pair<int,float>( 6, 0.5));
+ _types.clear ();
+ switch(metricmode) {
+ case 0:
+ meter_metric_area.set_name ("MidiTrackMetricsLeft");
+ _types.push_back (DataType::MIDI);
break;
-
- case DataType::MIDI:
- points.insert (std::pair<int,float>( 0, 1.0));
- points.insert (std::pair<int,float>( 16, 0.5));
- points.insert (std::pair<int,float>( 32, 0.5));
- points.insert (std::pair<int,float>( 48, 0.5));
- points.insert (std::pair<int,float>( 64, 1.0));
- points.insert (std::pair<int,float>( 72, 0.5));
- points.insert (std::pair<int,float>( 96, 0.5));
- points.insert (std::pair<int,float>(100, 1.0));
- points.insert (std::pair<int,float>(112, 0.5));
- points.insert (std::pair<int,float>(127, 1.0));
+ case 1:
+ meter_metric_area.set_name ("AudioTrackMetricsLeft");
+ _types.push_back (DataType::AUDIO);
+ break;
+ case 2:
+ meter_metric_area.set_name ("MidiTrackMetricsRight");
+ _types.push_back (DataType::MIDI);
+ break;
+ case 3:
+ default:
+ meter_metric_area.set_name ("AudioTrackMetricsRight");
+ _types.push_back (DataType::AUDIO);
break;
- }
-
- for (std::map<int,float>::const_iterator j = points.begin(); j != points.end(); ++j) {
- cairo_set_line_width (cr, (j->second));
-
- float fraction = 0;
- gint pos;
-
- switch (*i) {
- case DataType::AUDIO:
- if (j->first >= 0) {
- cairo_set_source_rgb (cr, 1.0, 0.0, 0.0);
- }
- fraction = log_meter (j->first);
- pos = height - (gint) floor (height * fraction);
- cairo_move_to(cr, 0, pos + .5);
- cairo_line_to(cr, 4, pos + .5);
- cairo_stroke (cr);
- break;
- case DataType::MIDI:
- fraction = (j->first) / 127.0;
- pos = height - (gint) floor (height * fraction);
- cairo_arc(cr, 2, pos, (j->second), 0, 2 * M_PI);
- cairo_fill_preserve(cr);
- cairo_stroke (cr);
- break;
- }
- }
- }
-
- cairo_pattern_t* pattern = cairo_pattern_create_for_surface (surface);
- TickPatterns::iterator p;
-
- if ((p = ticks_patterns.find (w.get_name())) != metric_patterns.end()) {
- cairo_pattern_destroy (p->second);
}
- ticks_patterns[w.get_name()] = pattern;
-
- cairo_destroy (cr);
- cairo_surface_destroy (surface);
-
- return pattern;
+ meter_metric_area.queue_draw ();
}
gint
MeterStrip::meter_ticks1_expose (GdkEventExpose *ev)
{
- return meter_ticks_expose(ev, &meter_ticks1_area);
+ return meter_expose_ticks(ev, _types, &meter_ticks1_area);
}
gint
MeterStrip::meter_ticks2_expose (GdkEventExpose *ev)
{
- return meter_ticks_expose(ev, &meter_ticks2_area);
-}
-
-gint
-MeterStrip::meter_ticks_expose (GdkEventExpose *ev, Gtk::DrawingArea *mta)
-{
- Glib::RefPtr<Gdk::Window> win (mta->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;
- TickPatterns::iterator i = ticks_patterns.find (mta->get_name());
-
- if (i == ticks_patterns.end()) {
- pattern = render_ticks (*mta, _types);
- } else {
- pattern = i->second;
- }
-
- 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);
-
- cairo_destroy (cr);
-
- return true;
+ return meter_expose_ticks(ev, _types, &meter_ticks2_area);
}
void
_route->shared_peak_meter()->reset_max();
level_meter->clear_meters();
max_peak = -INFINITY;
- peak_display.set_label (_("-inf"));
- peak_display.set_name ("MixerStripPeakDisplay");
+ peak_display.set_name ("meterbridge peakindicator");
+ peak_display.set_elements((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body));
}
bool
MeterStrip::peak_button_release (GdkEventButton* ev)
{
- reset_peak_display ();
+ if (ev->button == 1 && Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier|Keyboard::TertiaryModifier)) {
+ ResetAllPeakDisplays ();
+ } else if (ev->button == 1 && Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
+ if (_route) {
+ ResetGroupPeakDisplays (_route->route_group());
+ }
+ } else {
+ reset_peak_display ();
+ }
return true;
}
projects / ardour.git / blobdiff