X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmeter_strip.h;h=0e7232537de172bb733a237d307787c2b9e95555;hb=d2c8d357dabb1f58bc5992e82232cdbbe99fb774;hp=d8370b45f01693b6eb3174e938a16ff2e7ba8303;hpb=74f313dd6b52c5bd36536d90e7b9e62b0679087b;p=ardour.git

diff --git a/gtk2_ardour/meter_strip.h b/gtk2_ardour/meter_strip.h
index d8370b45f0..0e7232537d 100644
--- a/gtk2_ardour/meter_strip.h
+++ b/gtk2_ardour/meter_strip.h
@@ -43,13 +43,18 @@ namespace Gtk {
 	class Style;
 }
 
-class MeterStrip : public Gtk::VBox, public RouteUI
+class MeterStrip : public Gtk::VBox, public AxisView, public RouteUI
 {
   public:
 	MeterStrip (ARDOUR::Session*, boost::shared_ptr<ARDOUR::Route>);
 	MeterStrip (int, ARDOUR::MeterType);
 	~MeterStrip ();
 
+	std::string name() const;
+	Gdk::Color color () const;
+
+	boost::shared_ptr<ARDOUR::Stripable> stripable() const { return RouteUI::stripable(); }
+
 	void set_session (ARDOUR::Session* s);
 	void fast_update ();
 	boost::shared_ptr<ARDOUR::Route> route() { return _route; }
@@ -72,6 +77,8 @@ class MeterStrip : public Gtk::VBox, public RouteUI
 	bool is_metric_display() { return _strip_type == 0; }
 	ARDOUR::MeterType meter_type();
 
+	bool selected() const { return false; }
+
   protected:
 	boost::shared_ptr<ARDOUR::Route> _route;
 	PBD::ScopedConnectionList meter_route_connections;
@@ -130,7 +137,7 @@ class MeterStrip : public Gtk::VBox, public RouteUI
 
 	LevelMeterHBox *level_meter;
 
-	void strip_property_changed (const PBD::PropertyChange&);
+	void route_property_changed (const PBD::PropertyChange&);
 	void meter_configuration_changed (ARDOUR::ChanCount);
 	void meter_type_changed (ARDOUR::MeterType);
 	void update_background (ARDOUR::MeterType);
@@ -142,11 +149,11 @@ class MeterStrip : public Gtk::VBox, public RouteUI
 	void update_button_box ();
 	void update_name_box ();
 	void name_changed ();
-	
+
 	void route_color_changed ();
 
 	bool _suspend_menu_callbacks;
-	bool level_meter_button_release (GdkEventButton* ev);
+	bool level_meter_button_press (GdkEventButton* ev);
 	void popup_level_meter_menu (GdkEventButton* ev);
 	void add_level_meter_type_item (Gtk::Menu_Helpers::MenuList&, Gtk::RadioMenuItem::Group&, std::string const &, ARDOUR::MeterType);