fix verbose plugin scan

[ardour.git] / gtk2_ardour / level_meter.cc

diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc
index 7bb61a7cbc33af9517a3d1bdae17b265610dce44..75cd5e60eb2635caf3939b08c34e12d41b00c7e1 100644 (file)
--- a/gtk2_ardour/level_meter.cc
+++ b/gtk2_ardour/level_meter.cc
@@ -51,6 +51,8 @@ LevelMeterBase::LevelMeterBase (Session* s, PBD::EventLoop::InvalidationRecord*
        , thin_meter_width(2)
        , max_peak (minus_infinity())
        , meter_type (MeterPeak)
+       , visible_meter_type (MeterType(0))
+       , visible_meter_count (0)
        , color_changed (false)
 {
        set_session (s);
@@ -78,7 +80,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());
@@ -209,7 +211,6 @@ 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);
 }
 
@@ -217,7 +218,6 @@ void
 LevelMeterBase::meter_type_changed (MeterType t)
 {
        meter_type = t;
-       color_changed = true;
        setup_meters (meter_length, regular_meter_width, thin_meter_width);
        MeterTypeChanged(t);
 }
@@ -236,9 +236,9 @@ LevelMeterBase::hide_all_meters ()
 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 */
        }
 
@@ -251,6 +251,7 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width)
        guint16 width;
 
        if (nmeters == 0) {
+               hide_all_meters ();
                return;
        }
 
@@ -262,6 +263,27 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width)
 
        width = rint (width * ARDOUR_UI::ui_scale);
 
+       if (   meters.size() > 0
+           && nmeters == visible_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 == visible_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());
        }
@@ -377,9 +399,9 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width)
                                        c[7] = c[8] = c[9] = c[6];
                                        break;
                                case MeterPeak0dB:
-                                        stp[1] = 115.0 * log_meter0dB(-10);
-                                        stp[2] = 115.0 * log_meter0dB(-3);
-                                        stp[3] = 115.0 * log_meter0dB(0);
+                                        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 (ARDOUR_UI::config()->get_meter_line_up_level()) {
                                        case MeteringLineUp24:
                                                stp[0] = 115.0 * log_meter0dB(-24);
@@ -396,7 +418,7 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width)
                                        }
                                        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 (ARDOUR_UI::config()->get_meter_line_up_level()) {
@@ -443,6 +465,7 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width)
        //show();
        color_changed = false;
        visible_meter_type = meter_type;
+       visible_meter_count = nmeters;
 }
 
 void
@@ -455,7 +478,7 @@ LevelMeterBase::set_type(MeterType t)
 bool
 LevelMeterBase::meter_button_press (GdkEventButton* ev)
 {
-       return !!ButtonPress (ev); /* EMIT SIGNAL */
+       return static_cast<bool>(ButtonPress (ev)); /* EMIT SIGNAL */
 }
 
 bool