Various changes to PresentationInfo and a small consolidation of sorters.

The semantics for sorting PresentationInfo are up to the caller, not the
PresentationInfo object, so operator<() was removed and callers specifically
invoke ::order() for sorting.

1 files changed, 6 insertions, 7 deletions

diff --git a/libs/ardour/ardour/stripable.h b/libs/ardour/ardour/stripable.h
index 5447d8322b..8ad02c98b3 100644
--- a/libs/ardour/ardour/stripable.h
+++ b/libs/ardour/ardour/stripable.h
@@ -79,6 +79,12 @@ class LIBARDOUR_API Stripable : public SessionObject {
 	void  set_presentation_order (PresentationInfo::order_t, bool notify_class_listeners = true);
 	void  set_presentation_order_explicit (PresentationInfo::order_t);
 
+	struct PresentationOrderSorter {
+		bool operator() (boost::shared_ptr<Stripable> a, boost::shared_ptr<Stripable> b) {
+			return a->presentation_info().order() < b->presentation_info().order();
+		}
+	};
+
 	/* gui's call this for their own purposes. */
 
 	PBD::Signal2<void,std::string,void*> gui_changed;
@@ -179,13 +185,6 @@ class LIBARDOUR_API Stripable : public SessionObject {
 	PresentationInfo _presentation_info;
 };
 
-struct PresentationInfoSorter {
-	bool operator() (boost::shared_ptr<Stripable> a, boost::shared_ptr<Stripable> b) {
-		return a->presentation_info() < b->presentation_info();
-	}
-};
-
-
 }
 
 #endif /* __libardour_stripable_h__ */