X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmeterbridge.h;h=b741f6fd74f9f67c31cc9c55fb503ee25ecdfd72;hb=9bfe404b4e9f5bc1bbe11b4ef6fd9778a362d04c;hp=2fac91cd0af5d6c170257151325cc678f8f0eae5;hpb=6a436fd826d1c9d88b60287696cc0836ccce35aa;p=ardour.git

diff --git a/gtk2_ardour/meterbridge.h b/gtk2_ardour/meterbridge.h
index 2fac91cd0a..b741f6fd74 100644
--- a/gtk2_ardour/meterbridge.h
+++ b/gtk2_ardour/meterbridge.h
@@ -44,7 +44,7 @@ class Meterbridge :
 	public ARDOUR::SessionHandlePtr,
 	public Gtkmm2ext::VisibilityTracker
 {
-  public:
+public:
 	static Meterbridge* instance();
 	~Meterbridge();
 
@@ -56,7 +56,7 @@ class Meterbridge :
 	void show_window ();
 	bool hide_window (GdkEventAny *ev);
 
-  private:
+private:
 	Meterbridge ();
 	static Meterbridge* _instance;
 
@@ -80,7 +80,7 @@ class Meterbridge :
 	void remove_strip (MeterStrip *);
 
 	void session_going_away ();
-	void sync_order_keys (ARDOUR::RouteSortOrderKey src);
+	void sync_order_keys ();
 	void resync_order ();
 	mutable Glib::Threads::Mutex _resync_mutex;
 
@@ -94,7 +94,8 @@ class Meterbridge :
 		}
 	};
 
-	struct MeterOrderRouteSorter {
+	struct MeterOrderRouteSorter
+	{
 		bool operator() (struct MeterBridgeStrip ma, struct MeterBridgeStrip mb) {
 			boost::shared_ptr<ARDOUR::Route> a = ma.s->route();
 			boost::shared_ptr<ARDOUR::Route> b = mb.s->route();
@@ -107,7 +108,7 @@ class Meterbridge :
 				/* everything comes before b */
 				return true;
 			}
-			return a->order_key (ARDOUR::MixerSort) < b->order_key (ARDOUR::MixerSort);
+			return ARDOUR::Stripable::Sorter (true) (a, b);
 		}
 	};