slimming diet for the narrow-mixer strip

[ardour.git] / gtk2_ardour / level_meter.cc

diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc
index d0f46f0597fdffe494b6acf457790c8baad2344b..6a120fdb802235680d4788951ad3ac28ed9a7318 100644 (file)
--- a/gtk2_ardour/level_meter.cc
+++ b/gtk2_ardour/level_meter.cc
@@ -44,10 +44,6 @@ using namespace Gtkmm2ext;
 using namespace Gtk;
 using namespace std;
 
-//sigc::signal<void> LevelMeter::ResetAllPeakDisplays;
-//sigc::signal<void,RouteGroup*> LevelMeter::ResetGroupPeakDisplays;
-
-
 LevelMeter::LevelMeter (Session* s)
        : _meter (0)
        , meter_length (0)
@@ -59,6 +55,7 @@ LevelMeter::LevelMeter (Session* s)
        UI::instance()->theme_changed.connect (sigc::mem_fun(*this, &LevelMeter::on_theme_changed));
        ColorsChanged.connect (sigc::mem_fun (*this, &LevelMeter::color_handler));
        max_peak = minus_infinity();
+       meter_type = MeterPeak;
 }
 
 void
@@ -78,10 +75,13 @@ void
 LevelMeter::set_meter (PeakMeter* meter)
 {
        _configuration_connection.disconnect();
+       _meter_type_connection.disconnect();
+
        _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());
        }
 }
 
@@ -90,7 +90,6 @@ LevelMeter::update_meters ()
 {
        vector<MeterInfo>::iterator i;
        uint32_t n;
-       float peak, mpeak;
 
        if (!_meter) {
                return 0.0f;
@@ -100,7 +99,7 @@ LevelMeter::update_meters ()
 
        for (n = 0, i = meters.begin(); i != meters.end(); ++i, ++n) {
                if ((*i).packed) {
-                       mpeak = _meter->max_peak_power(n);
+                       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());
@@ -109,11 +108,15 @@ LevelMeter::update_meters ()
                                max_peak = mpeak;
                        }
 
-                       peak = _meter->peak_power (n);
                        if (n < nmidi) {
-                               (*i).meter->set (peak);
+                               (*i).meter->set (_meter->meter_level (n, MeterPeak));
                        } else {
-                               (*i).meter->set (log_meter (peak));
+                               const float peak = _meter->meter_level (n, meter_type);
+                               if (meter_type == MeterPeak) {
+                                       (*i).meter->set (log_meter (peak));
+                               } else {
+                                       (*i).meter->set (log_meter (peak), log_meter(_meter->meter_level(n, MeterPeak)));
+                               }
                        }
                }
        }
@@ -126,12 +129,10 @@ LevelMeter::parameter_changed (string p)
        ENSURE_GUI_THREAD (*this, &LevelMeter::parameter_changed, p)
 
        if (p == "meter-hold") {
-
                vector<MeterInfo>::iterator i;
                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()));
                }
        }
@@ -139,6 +140,14 @@ LevelMeter::parameter_changed (string p)
                color_changed = true;
                setup_meters (meter_length, regular_meter_width, thin_meter_width);
        }
+       else if (p == "meter-peak") {
+               vector<MeterInfo>::iterator i;
+               uint32_t n;
+
+               for (n = 0, i = meters.begin(); i != meters.end(); ++i, ++n) {
+                       (*i).max_peak = minus_infinity();
+               }
+       }
 }
 
 void
@@ -148,6 +157,13 @@ LevelMeter::configuration_changed (ChanCount /*in*/, ChanCount /*out*/)
        setup_meters (meter_length, regular_meter_width, thin_meter_width);
 }
 
+void
+LevelMeter::meter_type_changed (MeterType t)
+{
+       meter_type = t;
+       MeterTypeChanged(t);
+}
+
 void
 LevelMeter::hide_all_meters ()
 {
@@ -274,6 +290,13 @@ LevelMeter::setup_meters (int len, int initial_width, int thin_width)
        color_changed = false;
 }
 
+void
+LevelMeter::set_type(MeterType t)
+{
+       meter_type = t;
+       _meter->set_type(t);
+}
+
 bool
 LevelMeter::meter_button_press (GdkEventButton* ev)
 {
@@ -284,19 +307,20 @@ bool
 LevelMeter::meter_button_release (GdkEventButton* ev)
 {
        if (ev->button == 1) {
-               clear_meters ();
+               clear_meters (false);
        }
 
        return true;
 }
 
 
-void LevelMeter::clear_meters ()
+void LevelMeter::clear_meters (bool reset_highlight)
 {
        for (vector<MeterInfo>::iterator i = meters.begin(); i < meters.end(); i++) {
                (*i).meter->clear();
                (*i).max_peak = minus_infinity();
-               (*i).meter->set_highlight(false);
+               if (reset_highlight)
+                       (*i).meter->set_highlight(false);
        }
        max_peak = minus_infinity();
 }