X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Flevel_meter.cc;h=94b8d63d7f3290f7cf6c622815d684ac614209c0;hb=5399425f534e2d96d07cf29f427bfa0f39d904b7;hp=0736e387a6c33b660bbccf8d07985b98ea1a3af4;hpb=51d3fa09ca23dd5dcb246fb193be25a7ab67acb5;p=ardour.git diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc index 0736e387a6..94b8d63d7f 100644 --- a/gtk2_ardour/level_meter.cc +++ b/gtk2_ardour/level_meter.cc @@ -23,7 +23,6 @@ #include #include -#include "midi++/manager.h" #include "pbd/fastlog.h" #include "ardour_ui.h" @@ -43,15 +42,16 @@ using namespace Gtkmm2ext; using namespace Gtk; using namespace std; -LevelMeterBase::LevelMeterBase (Session* s, FastMeter::Orientation o) - : _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 (&LevelMeterBase::parameter_changed, this, _1), gui_context()); + 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(); @@ -78,15 +78,16 @@ LevelMeterBase::set_meter (PeakMeter* meter) _meter_type_connection.disconnect(); _meter = meter; + color_changed = true; if (_meter) { - _meter->ConfigurationChanged.connect (_configuration_connection, invalidator (*this), boost::bind (&LevelMeterBase::configuration_changed, this, _1, _2), gui_context()); - _meter->TypeChanged.connect (_meter_type_connection, invalidator (*this), boost::bind (&LevelMeterBase::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 +102,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()) { @@ -133,7 +138,7 @@ LevelMeterBase::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,11 +153,13 @@ LevelMeterBase::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) { (*i).meter->set (meter_deflect_vu (peak + vu_standard() + meter_lineup(0))); + } else if (meter_type == MeterK12) { + (*i).meter->set (meter_deflect_k (peak, 12), meter_deflect_k(_meter->meter_level(n, MeterPeak), 12)); } else if (meter_type == MeterK14) { (*i).meter->set (meter_deflect_k (peak, 14), meter_deflect_k(_meter->meter_level(n, MeterPeak), 14)); } else if (meter_type == MeterK20) { @@ -183,6 +190,10 @@ LevelMeterBase::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; @@ -257,9 +268,9 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width) uint32_t c[10]; uint32_t b[4]; float stp[4]; - int styleflags = 3; - b[0] = ARDOUR_UI::config()->canvasvar_MeterBackgroundBot.get(); - b[1] = ARDOUR_UI::config()->canvasvar_MeterBackgroundTop.get(); + int styleflags = Config->get_meter_style_led() ? 3 : 1; + b[0] = ARDOUR_UI::config()->get_canvasvar_MeterBackgroundBot(); + b[1] = ARDOUR_UI::config()->get_canvasvar_MeterBackgroundTop(); b[2] = 0x991122ff; // red highlight gradient Bot b[3] = 0x551111ff; // red highlight gradient Top if (n < nmidi) { @@ -312,26 +323,47 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width) c[6] = c[7] = 0xffff00ff; c[8] = c[9] = 0xff0000ff; break; + case MeterK12: + stp[0] = 115.0 * meter_deflect_k(-32, 12); //-20 + stp[1] = 115.0 * meter_deflect_k(-12, 12); // 0 + stp[2] = 115.0 * meter_deflect_k(-10, 12); // +2 + stp[3] = 115.0 * meter_deflect_k( -8, 12); // +4 + c[0] = c[1] = 0x008800ff; + c[2] = c[3] = 0x00ff00ff; + c[4] = c[5] = 0xffff00ff; + c[6] = c[7] = 0xffff00ff; + c[8] = c[9] = 0xff0000ff; + break; case MeterIEC2BBC: - c[0] = c[1] = c[2] = c[3] = c[4] = c[5] = c[6] = c[7] = c[8] = c[9] = 0xaaaaaaff; + 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(-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); + 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 @@ -340,7 +372,6 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width) stp[3] = 115.0 * meter_deflect_vu(-18); // +2 c[0] = c[1] = c[2] = c[3] = c[4] = c[5] = 0x00aa00ff; c[6] = c[7] = c[8] = c[9] = 0xff8800ff; - styleflags = 1; break; default: // PEAK, RMS stp[1] = 77.5; // 115 * log_meter(-10) @@ -365,6 +396,7 @@ LevelMeterBase::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, _meter_orientation, len, c[0], c[1], c[2], c[3], c[4], @@ -410,6 +442,7 @@ LevelMeterBase::meter_button_release (GdkEventButton* ev) if (ev->button == 1) { clear_meters (false); } + ButtonRelease(ev); return true; } @@ -435,10 +468,11 @@ void LevelMeterBase::color_handler () { color_changed = true; + setup_meters (meter_length, regular_meter_width, thin_meter_width); } LevelMeterHBox::LevelMeterHBox(Session* s) - : LevelMeterBase(s) + : LevelMeterBase(s, invalidator(*this)) { set_spacing(1); show(); @@ -459,7 +493,7 @@ LevelMeterHBox::mtr_remove(Gtk::Widget &w) { LevelMeterVBox::LevelMeterVBox(Session* s) - : LevelMeterBase(s, FastMeter::Horizontal) + : LevelMeterBase(s, invalidator(*this), FastMeter::Horizontal) { set_spacing(1); show();