X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmeterbridge.h;h=a1715b2633941499082b2850a72386d1fe05e1ec;hb=d0f594ffd01de8ba0e0dce1e211c6ee5485615b0;hp=32ab2c929d42b80caca24d1f04757622d4c0bd95;hpb=580520b12f90251e38d94a1a5d6a199b76142b0b;p=ardour.git

diff --git a/gtk2_ardour/meterbridge.h b/gtk2_ardour/meterbridge.h
index 32ab2c929d..a1715b2633 100644
--- a/gtk2_ardour/meterbridge.h
+++ b/gtk2_ardour/meterbridge.h
@@ -78,10 +78,9 @@ class Meterbridge :
 
 	void add_strips (ARDOUR::RouteList&);
 	void remove_strip (MeterStrip *);
-	void update_metrics ();
 
 	void session_going_away ();
-	void sync_order_keys (ARDOUR::RouteSortOrderKey src);
+	void sync_order_keys ();
 	void resync_order ();
 	mutable Glib::Threads::Mutex _resync_mutex;
 
@@ -108,7 +107,7 @@ class Meterbridge :
 				/* everything comes before b */
 				return true;
 			}
-			return a->order_key (ARDOUR::MixerSort) < b->order_key (ARDOUR::MixerSort);
+			return a->presentation_info().order() < b->presentation_info().order();
 		}
 	};
 
@@ -116,6 +115,7 @@ class Meterbridge :
 
 	MeterStrip metrics_left;
 	MeterStrip metrics_right;
+	std::vector<MeterStrip *> _metrics;
 
 	Gtk::VBox metrics_vpacker_left;
 	Gtk::VBox metrics_vpacker_right;
@@ -147,6 +147,12 @@ class Meterbridge :
 
 	void parameter_changed (std::string const & p);
 	void on_theme_changed ();
+
+	void on_scroll ();
+	sigc::connection scroll_connection;
+
+	int _mm_left, _mm_right;
+	ARDOUR::MeterType _mt_left, _mt_right;
 };
 
 #endif