Fixed overflow issue. Code originally meant to truncate the 64 bit integer did not...

[ardour.git] / gtk2_ardour / level_meter.cc

diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc
index 6ef920235d582d9bb013e95848b791200e0478df..601f4c45dcfb16f0b669bf38fbe03b3933101833 100644 (file)
--- a/gtk2_ardour/level_meter.cc
+++ b/gtk2_ardour/level_meter.cc
@@ -66,6 +66,7 @@ LevelMeter::LevelMeter (boost::shared_ptr<IO> io, Session& s)
        Config->ParameterChanged.connect (mem_fun (*this, &LevelMeter::parameter_changed));
        UI::instance()->theme_changed.connect (mem_fun(*this, &LevelMeter::on_theme_changed));
        ColorsChanged.connect (mem_fun (*this, &LevelMeter::color_handler));
+       max_peak = minus_infinity();
 }
 
 void
@@ -83,7 +84,7 @@ LevelMeter::~LevelMeter ()
        }
 }
 
-void
+float
 LevelMeter::update_meters ()
 {
        vector<MeterInfo>::iterator i;
@@ -95,8 +96,12 @@ LevelMeter::update_meters ()
                        peak = _io->peak_input_power (n);
                        (*i).meter->set (log_meter (peak));
                        mpeak = _io->max_peak_power(n);
+                       if (mpeak > max_peak) {
+                               max_peak = mpeak;
+                       }
                }
        }
+       return max_peak;
 }
 
 void
@@ -133,8 +138,9 @@ LevelMeter::hide_all_meters ()
 }
 
 void
-LevelMeter::setup_meters (int len)
+LevelMeter::setup_meters (int len, int initial_width)
 {
+       regular_meter_width = initial_width;
        uint32_t nmeters = _io->n_outputs();
        guint16 width;
 
@@ -190,6 +196,7 @@ LevelMeter::setup_meters (int len)
                        meters[n].width = width;
                        meters[n].length = len;
                        meters[n].meter->add_events (Gdk::BUTTON_RELEASE_MASK);
+                       meters[n].meter->signal_button_release_event().connect (bind (mem_fun(*this, &LevelMeter::meter_button_release), n));
                }
 
                pack_end (*meters[n].meter, false, false);
@@ -198,13 +205,24 @@ LevelMeter::setup_meters (int len)
        }
        show();
        color_changed = false;
-}      
+}
+
+gint
+LevelMeter::meter_button_release (GdkEventButton* ev, uint32_t which)
+{
+       if (ev->button == 1) {
+               clear_meters();
+       }
+       return true;
+}
+       
 
 void LevelMeter::clear_meters ()
 {
        for (vector<MeterInfo>::iterator i = meters.begin(); i < meters.end(); i++) {
                (*i).meter->clear();
        }
+       max_peak = minus_infinity();
 }
 
 void LevelMeter::hide_meters ()