X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Flevel_meter.cc;h=3b73f4c37c0f6f5dcb8a8b8216c925870ea56dae;hb=HEAD;hp=94b8d63d7f3290f7cf6c622815d684ac614209c0;hpb=86343b6c15a3a43f082802484d2bc813d34db821;p=ardour.git diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc index 94b8d63d7f..3b73f4c37c 100644 --- a/gtk2_ardour/level_meter.cc +++ b/gtk2_ardour/level_meter.cc @@ -20,25 +20,24 @@ #include #include "ardour/meter.h" +#include "ardour/logmeter.h" #include -#include #include "pbd/fastlog.h" -#include "ardour_ui.h" -#include "global_signals.h" #include "level_meter.h" #include "utils.h" -#include "logmeter.h" #include "gui_thread.h" #include "keyboard.h" #include "public_editor.h" +#include "ui_config.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; +using namespace ARDOUR_UI_UTILS; using namespace PBD; -using namespace Gtkmm2ext; +using namespace ArdourWidgets; using namespace Gtk; using namespace std; @@ -49,26 +48,30 @@ 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) + , visible_meter_type (MeterType(0)) + , midi_count (0) + , meter_count (0) + , max_visible_meters (0) + , 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)); - ColorsChanged.connect (sigc::mem_fun (*this, &LevelMeterBase::color_handler)); - max_peak = minus_infinity(); - meter_type = MeterPeak; -} -void -LevelMeterBase::on_theme_changed() -{ - style_changed = true; + Config->ParameterChanged.connect (_parameter_connection, parent_invalidator, boost::bind (&LevelMeterBase::parameter_changed, this, _1), gui_context()); + UIConfiguration::instance().ParameterChanged.connect (sigc::mem_fun(*this, &LevelMeterBase::parameter_changed)); + UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &LevelMeterBase::color_handler)); } 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,7 +81,7 @@ LevelMeterBase::set_meter (PeakMeter* meter) _meter_type_connection.disconnect(); _meter = meter; - color_changed = true; + color_changed = true; // force update if (_meter) { _meter->ConfigurationChanged.connect (_configuration_connection, parent_invalidator, boost::bind (&LevelMeterBase::configuration_changed, this, _1, _2), gui_context()); @@ -103,12 +106,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 (UIConfiguration::instance().get_meter_line_up_level(), offset); } static float vu_standard() { // note - default meter config is +2dB (france) - switch (Config->get_meter_vu_standard()) { + switch (UIConfiguration::instance().get_meter_vu_standard()) { default: case MeteringVUfrench: // 0VU = -2dBu return 0; @@ -138,7 +141,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 >= UIConfiguration::instance().get_meter_peak()); } if (mpeak > max_peak) { max_peak = mpeak; @@ -147,22 +150,24 @@ LevelMeterBase::update_meters () if (n < nmidi) { (*i).meter->set (_meter->meter_level (n, MeterPeak)); } else { - const float peak = _meter->meter_level (n, meter_type); - if (meter_type == MeterPeak) { + const float peak = _meter->meter_level (n, _meter_type); + if (_meter_type == MeterPeak) { (*i).meter->set (log_meter (peak)); - } else if (meter_type == MeterIEC1NOR) { + } else if (_meter_type == MeterPeak0dB) { + (*i).meter->set (log_meter0dB (peak)); + } 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))); - } else if (meter_type == MeterIEC2BBC || meter_type == MeterIEC2EBU) { + } else if (_meter_type == MeterIEC1DIN) { + (*i).meter->set (meter_deflect_din (peak + meter_lineup_cfg(UIConfiguration::instance().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) { + } else if (_meter_type == MeterVU) { (*i).meter->set (meter_deflect_vu (peak + vu_standard() + meter_lineup(0))); - } else if (meter_type == MeterK12) { + } 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) { + } 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) { + } else if (_meter_type == MeterK20) { (*i).meter->set (meter_deflect_k (peak, 20), meter_deflect_k(_meter->meter_level(n, MeterPeak), 20)); } else { // RMS (*i).meter->set (log_meter (peak), log_meter(_meter->meter_level(n, MeterPeak))); @@ -183,7 +188,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(UIConfiguration::instance().get_meter_hold())); } } else if (p == "meter-line-up-level") { @@ -207,15 +212,13 @@ LevelMeterBase::parameter_changed (string p) void LevelMeterBase::configuration_changed (ChanCount /*in*/, ChanCount /*out*/) { - color_changed = true; setup_meters (meter_length, regular_meter_width, thin_meter_width); } void LevelMeterBase::meter_type_changed (MeterType t) { - meter_type = t; - color_changed = true; + _meter_type = t; setup_meters (meter_length, regular_meter_width, thin_meter_width); MeterTypeChanged(t); } @@ -229,18 +232,30 @@ LevelMeterBase::hide_all_meters () (*i).packed = false; } } + meter_count = 0; +} + +void +LevelMeterBase::set_max_audio_meter_count (uint32_t cnt) +{ + if (cnt == max_visible_meters) { + return; + } + color_changed = true; // force re-setup + max_visible_meters = cnt; + setup_meters (meter_length, regular_meter_width, thin_meter_width); } void LevelMeterBase::setup_meters (int len, int initial_width, int thin_width) { - hide_all_meters (); if (!_meter) { + hide_all_meters (); return; /* do it later or never */ } - int32_t nmidi = _meter->input_streams().n_midi(); + uint32_t nmidi = _meter->input_streams().n_midi(); uint32_t nmeters = _meter->input_streams().n_total(); regular_meter_width = initial_width; thin_meter_width = thin_width; @@ -249,6 +264,7 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width) guint16 width; if (nmeters == 0) { + hide_all_meters (); return; } @@ -258,6 +274,30 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width) width = thin_meter_width; } + width = rint (width * UIConfiguration::instance().get_ui_scale()); + + if ( meters.size() > 0 + && nmidi == midi_count + && nmeters == meter_count + && meters[0].width == width + && meters[0].length == len + && !color_changed + && _meter_type == visible_meter_type) { + return; + } + +#if 0 + printf("Meter redraw: %s %s %s %s %s %s\n", + (meters.size() > 0) ? "yes" : "no", + (meters.size() > 0 && meters[0].width == width) ? "yes" : "no", + (meters.size() > 0 && meters[0].length == len) ? "yes" : "no", + (nmeters == meter_count) ? "yes" : "no", + (_meter_type == visible_meter_type) ? "yes" : "no", + !color_changed ? "yes" : "no" + ); +#endif + + hide_all_meters (); while (meters.size() < nmeters) { meters.push_back (MeterInfo()); } @@ -268,39 +308,39 @@ 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 = UIConfiguration::instance().get_meter_style_led() ? 3 : 1; + b[0] = UIConfiguration::instance().color ("meter background bottom"); + b[1] = UIConfiguration::instance().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(); + if ((uint32_t) n < nmidi) { + c[0] = UIConfiguration::instance().color ("midi meter color0"); + c[1] = UIConfiguration::instance().color ("midi meter color1"); + c[2] = UIConfiguration::instance().color ("midi meter color2"); + c[3] = UIConfiguration::instance().color ("midi meter color3"); + c[4] = UIConfiguration::instance().color ("midi meter color4"); + c[5] = UIConfiguration::instance().color ("midi meter color5"); + c[6] = UIConfiguration::instance().color ("midi meter color6"); + c[7] = UIConfiguration::instance().color ("midi meter color7"); + c[8] = UIConfiguration::instance().color ("midi meter color8"); + c[9] = UIConfiguration::instance().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(); - - switch (meter_type) { + c[0] = UIConfiguration::instance().color ("meter color0"); + c[1] = UIConfiguration::instance().color ("meter color1"); + c[2] = UIConfiguration::instance().color ("meter color2"); + c[3] = UIConfiguration::instance().color ("meter color3"); + c[4] = UIConfiguration::instance().color ("meter color4"); + c[5] = UIConfiguration::instance().color ("meter color5"); + c[6] = UIConfiguration::instance().color ("meter color6"); + c[7] = UIConfiguration::instance().color ("meter color7"); + c[8] = UIConfiguration::instance().color ("meter color8"); + c[9] = UIConfiguration::instance().color ("meter color9"); + + switch (_meter_type) { case MeterK20: stp[0] = 115.0 * meter_deflect_k(-40, 20); //-20 stp[1] = 115.0 * meter_deflect_k(-20, 20); // 0 @@ -336,7 +376,7 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width) 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"); + UIConfiguration::instance().color ("meter color BBC"); stp[0] = stp[1] = stp[2] = stp[3] = 115.0; break; case MeterIEC2EBU: @@ -352,7 +392,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; @@ -361,7 +400,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; @@ -370,14 +409,33 @@ 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; + case MeterPeak0dB: + stp[1] = 89.125; // 115.0 * log_meter0dB(-9); + stp[2] = 106.375; // 115.0 * log_meter0dB(-3); + stp[3] = 115.0; // 115.0 * log_meter0dB(0); + switch (UIConfiguration::instance().get_meter_line_up_level()) { + case MeteringLineUp24: + stp[0] = 115.0 * log_meter0dB(-24); + break; + case MeteringLineUp20: + stp[0] = 115.0 * log_meter0dB(-20); + break; + default: + case MeteringLineUp18: + stp[0] = 115.0 * log_meter0dB(-18); + break; + case MeteringLineUp15: + stp[0] = 115.0 * log_meter0dB(-15); + } break; default: // PEAK, RMS - stp[1] = 77.5; // 115 * log_meter(-10) + stp[1] = 77.5; // 115 * log_meter(-9) stp[2] = 92.5; // 115 * log_meter(-3) stp[3] = 100.0; // 115 * log_meter(0) - switch (Config->get_meter_line_up_level()) { + switch (UIConfiguration::instance().get_meter_line_up_level()) { case MeteringLineUp24: stp[0] = 42.0; break; @@ -394,11 +452,11 @@ 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) { + if (meters[n].width != width || meters[n].length != len || color_changed || _meter_type != visible_meter_type || nmidi != midi_count) { 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 (UIConfiguration::instance().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], @@ -409,31 +467,37 @@ 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); mtr_pack (*meters[n].meter); - meters[n].meter->show_all (); meters[n].packed = true; + if (max_visible_meters == 0 || (uint32_t) n < max_visible_meters + nmidi) { + meters[n].meter->show_all (); + } else { + meters[n].meter->hide (); + } } //show(); color_changed = false; - visible_meter_type = meter_type; + visible_meter_type = _meter_type; + midi_count = nmidi; + meter_count = nmeters; } void -LevelMeterBase::set_type(MeterType t) +LevelMeterBase::set_meter_type(MeterType t) { - meter_type = t; + _meter_type = t; _meter->set_type(t); } bool LevelMeterBase::meter_button_press (GdkEventButton* ev) { - return ButtonPress (ev); /* EMIT SIGNAL */ + return static_cast(ButtonPress (ev)); /* EMIT SIGNAL */ } bool