X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmeterbridge.h;h=1709455ae4cf735f0d418d85875d732552d31165;hb=ad4fe5125563c185d3bce8f63d841c21e9324e44;hp=e8ab97d93bbec10f984fd2ea91fa87bd5c94322f;hpb=a181009caefd5fe9efb73fff7c0c663dc8415e0a;p=ardour.git

diff --git a/gtk2_ardour/meterbridge.h b/gtk2_ardour/meterbridge.h
index e8ab97d93b..1709455ae4 100644
--- a/gtk2_ardour/meterbridge.h
+++ b/gtk2_ardour/meterbridge.h
@@ -20,6 +20,8 @@
 #ifndef __ardour_meterbridge_h__
 #define __ardour_meterbridge_h__
 
+#include <glibmm/thread.h>
+
 #include <gtkmm/box.h>
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/label.h>
@@ -76,11 +78,11 @@ 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;
 
 	struct MeterBridgeStrip {
 		MeterStrip *s;
@@ -105,7 +107,7 @@ class Meterbridge :
 				/* everything comes before b */
 				return true;
 			}
-			return a->order_key (ARDOUR::MixerSort) < b->order_key (ARDOUR::MixerSort);
+			return a->order_key () < b->order_key ();
 		}
 	};
 
@@ -113,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;
@@ -144,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