X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmeterbridge.h;h=b741f6fd74f9f67c31cc9c55fb503ee25ecdfd72;hb=e82e30992dc0f2440eac77c2b1b4a308ba929ebe;hp=1709455ae4cf735f0d418d85875d732552d31165;hpb=d135c4dc3a307d0be606f3afbbc8fd8c3ec56438;p=ardour.git diff --git a/gtk2_ardour/meterbridge.h b/gtk2_ardour/meterbridge.h index 1709455ae4..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; @@ -94,7 +94,8 @@ class Meterbridge : } }; - struct MeterOrderRouteSorter { + struct MeterOrderRouteSorter + { bool operator() (struct MeterBridgeStrip ma, struct MeterBridgeStrip mb) { boost::shared_ptr a = ma.s->route(); boost::shared_ptr b = mb.s->route(); @@ -107,7 +108,7 @@ class Meterbridge : /* everything comes before b */ return true; } - return a->order_key () < b->order_key (); + return ARDOUR::Stripable::Sorter (true) (a, b); } };