merge 3.0 from 2.0-ongoing@3243

git-svn-id: svn://localhost/ardour2/branches/3.0@3248 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 5 insertions, 5 deletions

diff --git a/gtk2_ardour/level_meter.h b/gtk2_ardour/level_meter.h
index 240cc4b785..ce0aa125cb 100644
--- a/gtk2_ardour/level_meter.h
+++ b/gtk2_ardour/level_meter.h
@@ -61,11 +61,11 @@ class LevelMeter : public Gtk::HBox
 
 	void update_gain_sensitive ();
 
-	void update_meters ();
+	float update_meters ();
 	void update_meters_falloff ();
 	void clear_meters ();
 	void hide_meters ();
-	void setup_meters (int len=0);
+	void setup_meters (int len=0, int width=3);
 
   private:
 
@@ -89,13 +89,13 @@ class LevelMeter : public Gtk::HBox
 	    }
 	};
 
-	static const guint16 regular_meter_width = 3;
+	guint16 regular_meter_width;
 	static const guint16 thin_meter_width = 2;
 	vector<MeterInfo>    meters;
-
-	//Gtk::HBox   meter_packer;
+	float       max_peak;
 	
 	void hide_all_meters ();
+	gint meter_button_release (GdkEventButton*, uint32_t);
 
 	void parameter_changed (const char*);