X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Flevel_meter.cc;h=efa98bb43427c7b065943637be3749889b806349;hb=e3dd226ffa562d28758555d67961d95723e2a2f0;hp=194e4461154748a316bf44d9fa19f0a921960e70;hpb=1676789907b95aa8d5bf6cc2ce62aa66a80b9aae;p=ardour.git diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc index 194e446115..efa98bb434 100644 --- a/gtk2_ardour/level_meter.cc +++ b/gtk2_ardour/level_meter.cc @@ -22,7 +22,6 @@ #include "ardour/meter.h" #include -#include #include "pbd/fastlog.h" #include "ardour_ui.h" @@ -37,6 +36,7 @@ #include "i18n.h" using namespace ARDOUR; +using namespace ARDOUR_UI_UTILS; using namespace PBD; using namespace Gtkmm2ext; using namespace Gtk; @@ -49,26 +49,26 @@ LevelMeterBase::LevelMeterBase (Session* s, PBD::EventLoop::InvalidationRecord* , regular_meter_width (6) , meter_length (0) , thin_meter_width(2) + , max_peak (minus_infinity()) + , meter_type (MeterPeak) + , color_changed (false) { set_session (s); + 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)); + ARDOUR_UI::config()->ParameterChanged.connect (sigc::mem_fun(*this, &LevelMeterBase::parameter_changed)); ColorsChanged.connect (sigc::mem_fun (*this, &LevelMeterBase::color_handler)); - max_peak = minus_infinity(); - meter_type = MeterPeak; -} - -void -LevelMeterBase::on_theme_changed() -{ - style_changed = true; } LevelMeterBase::~LevelMeterBase () { + _configuration_connection.disconnect(); + _meter_type_connection.disconnect(); + _parameter_connection.disconnect(); for (vector::iterator i = meters.begin(); i != meters.end(); i++) { delete (*i).meter; } + meters.clear(); } void @@ -78,6 +78,7 @@ LevelMeterBase::set_meter (PeakMeter* meter) _meter_type_connection.disconnect(); _meter = meter; + color_changed = true; if (_meter) { _meter->ConfigurationChanged.connect (_configuration_connection, parent_invalidator, boost::bind (&LevelMeterBase::configuration_changed, this, _1, _2), gui_context()); @@ -102,12 +103,12 @@ static float meter_lineup_cfg(MeterLineUp lul, float offset) { } static float meter_lineup(float offset) { - return meter_lineup_cfg(Config->get_meter_line_up_level(), offset); + return meter_lineup_cfg (ARDOUR_UI::config()->get_meter_line_up_level(), offset); } static float vu_standard() { // note - default meter config is +2dB (france) - switch (Config->get_meter_vu_standard()) { + switch (ARDOUR_UI::config()->get_meter_vu_standard()) { default: case MeteringVUfrench: // 0VU = -2dBu return 0; @@ -137,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 >= ARDOUR_UI::config()->get_meter_peak()); } if (mpeak > max_peak) { max_peak = mpeak; @@ -152,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_cfg(Config->get_meter_line_up_din(), 3.0))); + (*i).meter->set (meter_deflect_din (peak + meter_lineup_cfg(ARDOUR_UI::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) { @@ -180,7 +183,7 @@ LevelMeterBase::parameter_changed (string p) uint32_t n; for (n = 0, i = meters.begin(); i != meters.end(); ++i, ++n) { - (*i).meter->set_hold_count ((uint32_t) floor(Config->get_meter_hold())); + (*i).meter->set_hold_count ((uint32_t) floor(ARDOUR_UI::config()->get_meter_hold())); } } else if (p == "meter-line-up-level") { @@ -265,37 +268,37 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width) uint32_t c[10]; uint32_t b[4]; float stp[4]; - 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(); + int styleflags = ARDOUR_UI::config()->get_meter_style_led() ? 3 : 1; + b[0] = ARDOUR_UI::config()->color ("meter background bottom"); + b[1] = ARDOUR_UI::config()->color ("meter background top"); b[2] = 0x991122ff; // red highlight gradient Bot b[3] = 0x551111ff; // red highlight gradient Top if (n < nmidi) { - c[0] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor0(); - c[1] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor1(); - c[2] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor2(); - c[3] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor3(); - c[4] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor4(); - c[5] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor5(); - c[6] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor6(); - c[7] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor7(); - c[8] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor8(); - c[9] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor9(); + c[0] = ARDOUR_UI::config()->color ("midi meter color0"); + c[1] = ARDOUR_UI::config()->color ("midi meter color1"); + c[2] = ARDOUR_UI::config()->color ("midi meter color2"); + c[3] = ARDOUR_UI::config()->color ("midi meter color3"); + c[4] = ARDOUR_UI::config()->color ("midi meter color4"); + c[5] = ARDOUR_UI::config()->color ("midi meter color5"); + c[6] = ARDOUR_UI::config()->color ("midi meter color6"); + c[7] = ARDOUR_UI::config()->color ("midi meter color7"); + c[8] = ARDOUR_UI::config()->color ("midi meter color8"); + c[9] = ARDOUR_UI::config()->color ("midi meter color9"); stp[0] = 115.0 * 32.0 / 128.0; stp[1] = 115.0 * 64.0 / 128.0; stp[2] = 115.0 * 100.0 / 128.0; stp[3] = 115.0 * 112.0 / 128.0; } else { - c[0] = ARDOUR_UI::config()->get_canvasvar_MeterColor0(); - c[1] = ARDOUR_UI::config()->get_canvasvar_MeterColor1(); - c[2] = ARDOUR_UI::config()->get_canvasvar_MeterColor2(); - c[3] = ARDOUR_UI::config()->get_canvasvar_MeterColor3(); - c[4] = ARDOUR_UI::config()->get_canvasvar_MeterColor4(); - c[5] = ARDOUR_UI::config()->get_canvasvar_MeterColor5(); - c[6] = ARDOUR_UI::config()->get_canvasvar_MeterColor6(); - c[7] = ARDOUR_UI::config()->get_canvasvar_MeterColor7(); - c[8] = ARDOUR_UI::config()->get_canvasvar_MeterColor8(); - c[9] = ARDOUR_UI::config()->get_canvasvar_MeterColor9(); + c[0] = ARDOUR_UI::config()->color ("meter color0"); + c[1] = ARDOUR_UI::config()->color ("meter color1"); + c[2] = ARDOUR_UI::config()->color ("meter color2"); + c[3] = ARDOUR_UI::config()->color ("meter color3"); + c[4] = ARDOUR_UI::config()->color ("meter color4"); + c[5] = ARDOUR_UI::config()->color ("meter color5"); + c[6] = ARDOUR_UI::config()->color ("meter color6"); + c[7] = ARDOUR_UI::config()->color ("meter color7"); + c[8] = ARDOUR_UI::config()->color ("meter color8"); + c[9] = ARDOUR_UI::config()->color ("meter color9"); switch (meter_type) { case MeterK20: @@ -320,9 +323,20 @@ 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] = - ARDOUR_UI::config()->color_by_name ("meter color BBC"); + ARDOUR_UI::config()->color ("meter color BBC"); stp[0] = stp[1] = stp[2] = stp[3] = 115.0; break; case MeterIEC2EBU: @@ -338,7 +352,6 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width) stp[1] = 115.0 * meter_deflect_nordic(-18); stp[2] = 115.0 * meter_deflect_nordic(-12); 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; @@ -347,7 +360,7 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width) stp[1] = 115.0 * meter_deflect_din(-18); 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[0] = c[2] = c[3] = c[1]; c[4] = c[6]; c[5] = c[7]; break; @@ -356,14 +369,14 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width) 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 - c[0] = c[1] = c[2] = c[3] = c[4] = c[5] = 0x00aa00ff; - c[6] = c[7] = c[8] = c[9] = 0xff8800ff; + c[0] = c[2] = c[3] = c[4] = c[5] = c[1]; + c[7] = c[8] = c[9] = c[6]; break; default: // PEAK, RMS stp[1] = 77.5; // 115 * log_meter(-10) stp[2] = 92.5; // 115 * log_meter(-3) stp[3] = 100.0; // 115 * log_meter(0) - switch (Config->get_meter_line_up_level()) { + switch (ARDOUR_UI::config()->get_meter_line_up_level()) { case MeteringLineUp24: stp[0] = 42.0; break; @@ -384,7 +397,7 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width) 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, + meters[n].meter = new FastMeter ((uint32_t) floor (ARDOUR_UI::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], @@ -395,8 +408,8 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width) 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, &LevelMeterBase::meter_button_press)); - meters[n].meter->signal_button_release_event().connect (sigc::mem_fun (*this, &LevelMeterBase::meter_button_release)); + meters[n].meter->signal_button_press_event().connect (sigc::mem_fun (*this, &LevelMeterBase::meter_button_press), false); + meters[n].meter->signal_button_release_event().connect (sigc::mem_fun (*this, &LevelMeterBase::meter_button_release), false); } //pack_end (*meters[n].meter, false, false); @@ -419,7 +432,7 @@ LevelMeterBase::set_type(MeterType t) bool LevelMeterBase::meter_button_press (GdkEventButton* ev) { - return ButtonPress (ev); /* EMIT SIGNAL */ + return !!ButtonPress (ev); /* EMIT SIGNAL */ } bool