X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Flevel_meter.cc;h=bf9823518b7264a893d806f19d384903306419c8;hb=f4cf283f2683f7883f799a8ef6cd58084e610bb7;hp=05f75699253a2f3d46a1371f8c91271d1ad9e25c;hpb=6981e4d68e6f0bcb49a5f1d1518257283dbbaaeb;p=ardour.git diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc index 05f7569925..bf9823518b 100644 --- a/gtk2_ardour/level_meter.cc +++ b/gtk2_ardour/level_meter.cc @@ -22,9 +22,7 @@ #include "ardour/meter.h" #include -#include #include -#include "midi++/manager.h" #include "pbd/fastlog.h" #include "ardour_ui.h" @@ -44,27 +42,29 @@ using namespace Gtkmm2ext; using namespace Gtk; using namespace std; -LevelMeter::LevelMeter (Session* s) - : _meter (0) +LevelMeterBase::LevelMeterBase (Session* s, PBD::EventLoop::InvalidationRecord* ir, FastMeter::Orientation o) + : parent_invalidator(ir) + , _meter (0) + , _meter_orientation(o) + , regular_meter_width (6) , meter_length (0) , thin_meter_width(2) { set_session (s); - set_spacing (1); - Config->ParameterChanged.connect (_parameter_connection, invalidator (*this), boost::bind (&LevelMeter::parameter_changed, this, _1), gui_context()); - UI::instance()->theme_changed.connect (sigc::mem_fun(*this, &LevelMeter::on_theme_changed)); - ColorsChanged.connect (sigc::mem_fun (*this, &LevelMeter::color_handler)); + Config->ParameterChanged.connect (_parameter_connection, parent_invalidator, boost::bind (&LevelMeterBase::parameter_changed, this, _1), gui_context()); + UI::instance()->theme_changed.connect (sigc::mem_fun(*this, &LevelMeterBase::on_theme_changed)); + ColorsChanged.connect (sigc::mem_fun (*this, &LevelMeterBase::color_handler)); max_peak = minus_infinity(); meter_type = MeterPeak; } void -LevelMeter::on_theme_changed() +LevelMeterBase::on_theme_changed() { style_changed = true; } -LevelMeter::~LevelMeter () +LevelMeterBase::~LevelMeterBase () { for (vector::iterator i = meters.begin(); i != meters.end(); i++) { delete (*i).meter; @@ -72,7 +72,7 @@ LevelMeter::~LevelMeter () } void -LevelMeter::set_meter (PeakMeter* meter) +LevelMeterBase::set_meter (PeakMeter* meter) { _configuration_connection.disconnect(); _meter_type_connection.disconnect(); @@ -80,13 +80,13 @@ LevelMeter::set_meter (PeakMeter* meter) _meter = meter; if (_meter) { - _meter->ConfigurationChanged.connect (_configuration_connection, invalidator (*this), boost::bind (&LevelMeter::configuration_changed, this, _1, _2), gui_context()); - _meter->TypeChanged.connect (_meter_type_connection, invalidator (*this), boost::bind (&LevelMeter::meter_type_changed, this, _1), gui_context()); + _meter->ConfigurationChanged.connect (_configuration_connection, parent_invalidator, boost::bind (&LevelMeterBase::configuration_changed, this, _1, _2), gui_context()); + _meter->TypeChanged.connect (_meter_type_connection, parent_invalidator, boost::bind (&LevelMeterBase::meter_type_changed, this, _1), gui_context()); } } -static float meter_lineup(float offset) { - switch (Config->get_meter_line_up_level()) { +static float meter_lineup_cfg(MeterLineUp lul, float offset) { + switch (lul) { case MeteringLineUp24: return offset + 6.0; case MeteringLineUp20: @@ -101,6 +101,10 @@ static float meter_lineup(float offset) { return offset; } +static float meter_lineup(float offset) { + return meter_lineup_cfg(Config->get_meter_line_up_level(), offset); +} + static float vu_standard() { // note - default meter config is +2dB (france) switch (Config->get_meter_vu_standard()) { @@ -117,7 +121,7 @@ static float vu_standard() { } float -LevelMeter::update_meters () +LevelMeterBase::update_meters () { vector::iterator i; uint32_t n; @@ -133,7 +137,7 @@ LevelMeter::update_meters () const float mpeak = _meter->meter_level(n, MeterMaxPeak); if (mpeak > (*i).max_peak) { (*i).max_peak = mpeak; - (*i).meter->set_highlight(mpeak > Config->get_meter_peak()); + (*i).meter->set_highlight(mpeak >= Config->get_meter_peak()); } if (mpeak > max_peak) { max_peak = mpeak; @@ -148,7 +152,7 @@ LevelMeter::update_meters () } else if (meter_type == MeterIEC1NOR) { (*i).meter->set (meter_deflect_nordic (peak + meter_lineup(0))); } else if (meter_type == MeterIEC1DIN) { - (*i).meter->set (meter_deflect_din (peak + meter_lineup(3.0))); + (*i).meter->set (meter_deflect_din (peak + meter_lineup_cfg(Config->get_meter_line_up_din(), 3.0))); } else if (meter_type == MeterIEC2BBC || meter_type == MeterIEC2EBU) { (*i).meter->set (meter_deflect_ppm (peak + meter_lineup(0))); } else if (meter_type == MeterVU) { @@ -167,9 +171,9 @@ LevelMeter::update_meters () } void -LevelMeter::parameter_changed (string p) +LevelMeterBase::parameter_changed (string p) { - ENSURE_GUI_THREAD (*this, &LevelMeter::parameter_changed, p) + ENSURE_GUI_THREAD (*this, &LevelMeterBase::parameter_changed, p) if (p == "meter-hold") { vector::iterator i; @@ -183,6 +187,10 @@ LevelMeter::parameter_changed (string p) color_changed = true; setup_meters (meter_length, regular_meter_width, thin_meter_width); } + else if (p == "meter-style-led") { + color_changed = true; + setup_meters (meter_length, regular_meter_width, thin_meter_width); + } else if (p == "meter-peak") { vector::iterator i; uint32_t n; @@ -194,14 +202,14 @@ LevelMeter::parameter_changed (string p) } void -LevelMeter::configuration_changed (ChanCount /*in*/, ChanCount /*out*/) +LevelMeterBase::configuration_changed (ChanCount /*in*/, ChanCount /*out*/) { color_changed = true; setup_meters (meter_length, regular_meter_width, thin_meter_width); } void -LevelMeter::meter_type_changed (MeterType t) +LevelMeterBase::meter_type_changed (MeterType t) { meter_type = t; color_changed = true; @@ -210,18 +218,18 @@ LevelMeter::meter_type_changed (MeterType t) } void -LevelMeter::hide_all_meters () +LevelMeterBase::hide_all_meters () { for (vector::iterator i = meters.begin(); i != meters.end(); ++i) { if ((*i).packed) { - remove (*((*i).meter)); + mtr_remove (*((*i).meter)); (*i).packed = false; } } } void -LevelMeter::setup_meters (int len, int initial_width, int thin_width) +LevelMeterBase::setup_meters (int len, int initial_width, int thin_width) { hide_all_meters (); @@ -251,13 +259,13 @@ LevelMeter::setup_meters (int len, int initial_width, int thin_width) meters.push_back (MeterInfo()); } - //cerr << "LevelMeter::setup_meters() called color_changed = " << color_changed << " colors: " << endl;//DEBUG + //cerr << "LevelMeterBase::setup_meters() called color_changed = " << color_changed << " colors: " << endl;//DEBUG for (int32_t n = nmeters-1; nmeters && n >= 0 ; --n) { uint32_t c[10]; uint32_t b[4]; float stp[4]; - int styleflags = 3; + int styleflags = Config->get_meter_style_led() ? 3 : 1; b[0] = ARDOUR_UI::config()->canvasvar_MeterBackgroundBot.get(); b[1] = ARDOUR_UI::config()->canvasvar_MeterBackgroundTop.get(); b[2] = 0x991122ff; // red highlight gradient Bot @@ -312,31 +320,44 @@ LevelMeter::setup_meters (int len, int initial_width, int thin_width) c[6] = c[7] = 0xffff00ff; c[8] = c[9] = 0xff0000ff; break; - case MeterIEC2EBU: case MeterIEC2BBC: - stp[0] = 115.0 * meter_deflect_ppm(-18); - stp[1] = 115.0 * meter_deflect_ppm(-14); - stp[2] = 115.0 * meter_deflect_ppm(-10); - stp[3] = 115.0 * meter_deflect_ppm( -8); + c[0] = c[1] = c[2] = c[3] = c[4] = c[5] = c[6] = c[7] = c[8] = c[9] = + ARDOUR_UI::config()->color_by_name ("meter color BBC"); + stp[0] = stp[1] = stp[2] = stp[3] = 115.0; + break; + case MeterIEC2EBU: + stp[0] = 115.0 * meter_deflect_ppm(-24); // ignored + stp[1] = 115.0 * meter_deflect_ppm(-18); + stp[2] = 115.0 * meter_deflect_ppm( -9); + stp[3] = 115.0 * meter_deflect_ppm( 0); // ignored + c[3] = c[2] = c[1]; + c[6] = c[7] = c[8] = c[9]; break; case MeterIEC1NOR: - stp[0] = 115.0 * meter_deflect_nordic(-18); - stp[1] = 115.0 * meter_deflect_nordic(-15); + stp[0] = 115.0 * meter_deflect_nordic(-30); // ignored + stp[1] = 115.0 * meter_deflect_nordic(-18); stp[2] = 115.0 * meter_deflect_nordic(-12); - stp[3] = 115.0 * meter_deflect_nordic( -9); + stp[3] = 115.0 * meter_deflect_nordic( -9); // ignored + //c[2] = c[3] = c[1]; // dark-green + c[0] = c[1] = c[2]; // bright-green + c[6] = c[7] = c[8] = c[9]; break; case MeterIEC1DIN: - stp[0] = 115.0 * meter_deflect_din(-29); + stp[0] = 115.0 * meter_deflect_din(-29); // ignored stp[1] = 115.0 * meter_deflect_din(-18); - stp[2] = 115.0 * meter_deflect_din(-15); + stp[2] = 115.0 * meter_deflect_din(-15); // ignored stp[3] = 115.0 * meter_deflect_din( -9); + c[0] = c[1] = c[2] = c[3] = 0x00aa00ff; + c[4] = c[6]; + c[5] = c[7]; break; case MeterVU: stp[0] = 115.0 * meter_deflect_vu(-26); // -6 stp[1] = 115.0 * meter_deflect_vu(-23); // -3 stp[2] = 115.0 * meter_deflect_vu(-20); // 0 stp[3] = 115.0 * meter_deflect_vu(-18); // +2 - styleflags = 1; + c[0] = c[1] = c[2] = c[3] = c[4] = c[5] = 0x00aa00ff; + c[6] = c[7] = c[8] = c[9] = 0xff8800ff; break; default: // PEAK, RMS stp[1] = 77.5; // 115 * log_meter(-10) @@ -360,55 +381,60 @@ LevelMeter::setup_meters (int len, int initial_width, int thin_width) } } if (meters[n].width != width || meters[n].length != len || color_changed || meter_type != visible_meter_type) { + bool hl = meters[n].meter ? meters[n].meter->get_highlight() : false; + meters[n].packed = false; delete meters[n].meter; - meters[n].meter = new FastMeter ((uint32_t) floor (Config->get_meter_hold()), width, FastMeter::Vertical, len, + meters[n].meter = new FastMeter ((uint32_t) floor (Config->get_meter_hold()), width, _meter_orientation, len, c[0], c[1], c[2], c[3], c[4], c[5], c[6], c[7], c[8], c[9], b[0], b[1], b[2], b[3], stp[0], stp[1], stp[2], stp[3], styleflags ); + meters[n].meter->set_highlight(hl); meters[n].width = width; meters[n].length = len; meters[n].meter->add_events (Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK); - meters[n].meter->signal_button_press_event().connect (sigc::mem_fun (*this, &LevelMeter::meter_button_press)); - meters[n].meter->signal_button_release_event().connect (sigc::mem_fun (*this, &LevelMeter::meter_button_release)); + meters[n].meter->signal_button_press_event().connect (sigc::mem_fun (*this, &LevelMeterBase::meter_button_press)); + meters[n].meter->signal_button_release_event().connect (sigc::mem_fun (*this, &LevelMeterBase::meter_button_release)); } - pack_end (*meters[n].meter, false, false); + //pack_end (*meters[n].meter, false, false); + mtr_pack (*meters[n].meter); meters[n].meter->show_all (); meters[n].packed = true; } - show(); + //show(); color_changed = false; visible_meter_type = meter_type; } void -LevelMeter::set_type(MeterType t) +LevelMeterBase::set_type(MeterType t) { meter_type = t; _meter->set_type(t); } bool -LevelMeter::meter_button_press (GdkEventButton* ev) +LevelMeterBase::meter_button_press (GdkEventButton* ev) { return ButtonPress (ev); /* EMIT SIGNAL */ } bool -LevelMeter::meter_button_release (GdkEventButton* ev) +LevelMeterBase::meter_button_release (GdkEventButton* ev) { if (ev->button == 1) { clear_meters (false); } + ButtonRelease(ev); return true; } -void LevelMeter::clear_meters (bool reset_highlight) +void LevelMeterBase::clear_meters (bool reset_highlight) { for (vector::iterator i = meters.begin(); i < meters.end(); i++) { (*i).meter->clear(); @@ -419,14 +445,53 @@ void LevelMeter::clear_meters (bool reset_highlight) max_peak = minus_infinity(); } -void LevelMeter::hide_meters () +void LevelMeterBase::hide_meters () { hide_all_meters(); } void -LevelMeter::color_handler () +LevelMeterBase::color_handler () { color_changed = true; + setup_meters (meter_length, regular_meter_width, thin_meter_width); +} + +LevelMeterHBox::LevelMeterHBox(Session* s) + : LevelMeterBase(s, invalidator(*this)) +{ + set_spacing(1); + show(); +} + + +LevelMeterHBox::~LevelMeterHBox() {} + +void +LevelMeterHBox::mtr_pack(Gtk::Widget &w) { + pack_end (w, false, false); } +void +LevelMeterHBox::mtr_remove(Gtk::Widget &w) { + remove (w); +} + + +LevelMeterVBox::LevelMeterVBox(Session* s) + : LevelMeterBase(s, invalidator(*this), FastMeter::Horizontal) +{ + set_spacing(1); + show(); +} +LevelMeterVBox::~LevelMeterVBox() {} + +void +LevelMeterVBox::mtr_pack(Gtk::Widget &w) { + pack_end (w, false, false); +} + +void +LevelMeterVBox::mtr_remove(Gtk::Widget &w) { + remove (w); +}