X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Flevel_meter.cc;h=f7b44d1b0861778bb57a9834f45a086200486900;hb=bed58e9f372a6c2671e9f072c19a4c77d06c4292;hp=f4f8e8952fca5aaa320acf0233bf9d75fa64df3d;hpb=b42213bb04031b954eda4f9b39c5f183bfb96ede;p=ardour.git

diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc
index f4f8e8952f..f7b44d1b08 100644
--- a/gtk2_ardour/level_meter.cc
+++ b/gtk2_ardour/level_meter.cc
@@ -25,6 +25,7 @@
 #include <ardour/session.h>
 #include <ardour/session_route.h>
 #include <ardour/dB.h>
+#include <ardour/meter.h>
 
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/fastmeter.h>
@@ -43,7 +44,6 @@
 
 #include <ardour/session.h>
 #include <ardour/route.h>
-#include <ardour/meter.h>
 
 #include "i18n.h"
 
@@ -58,15 +58,15 @@ using namespace std;
 //sigc::signal<void,RouteGroup*> LevelMeter::ResetGroupPeakDisplays;
 
 
-LevelMeter::LevelMeter (boost::shared_ptr<IO> io, Session& s)
-	: _io (io),
-	  _session (s)
+LevelMeter::LevelMeter (Session& s)
+	: _session (s)
 	
 {
 	set_spacing (1);
 	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
@@ -78,13 +78,17 @@ LevelMeter::on_theme_changed()
 LevelMeter::~LevelMeter ()
 {
 	for (vector<MeterInfo>::iterator i = meters.begin(); i != meters.end(); i++) {
-		if ((*i).meter) {
-			delete (*i).meter;
-		}
+		delete (*i).meter;
 	}
 }
 
 void
+LevelMeter::set_io (boost::shared_ptr<IO> io)
+{
+	_io = io;
+}
+
+float
 LevelMeter::update_meters ()
 {
 	vector<MeterInfo>::iterator i;
@@ -96,8 +100,15 @@ LevelMeter::update_meters ()
 			peak = _io->peak_meter().peak_power (n);
 			(*i).meter->set (log_meter (peak));
 			mpeak = _io->peak_meter().max_peak_power(n);
+			if (mpeak > max_peak) {
+				max_peak = mpeak;
+			}
+			if (mpeak > max_peak) {
+				max_peak = mpeak;
+			}
 		}
 	}
+	return max_peak;
 }
 
 void
@@ -134,9 +145,15 @@ LevelMeter::hide_all_meters ()
 }
 
 void
-LevelMeter::setup_meters (int len)
+LevelMeter::setup_meters (int len, int initial_width)
 {
+ 	if (!_io) {
+ 		return; /* do it later */
+ 	}
+ 
 	uint32_t nmeters = _io->n_outputs().n_total();
+	regular_meter_width = initial_width;
+
 	guint16 width;
 
 	hide_all_meters ();
@@ -146,12 +163,10 @@ LevelMeter::setup_meters (int len)
 	if ((r = dynamic_cast<Route*> (_io.get())) != 0) {
 
 		switch (r->meter_point()) {
+		case MeterPreFader:
 		case MeterInput:
 			nmeters = r->n_inputs().n_total();
 			break;
-		case MeterPreFader:
-			nmeters = r->pre_fader_streams().n_total();
-			break;
 		case MeterPostFader:
 			nmeters = r->n_outputs().n_total();
 			break;
@@ -193,6 +208,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);
@@ -201,13 +217,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 ()