Remove unused CrossfadeComparePtr. Make Crossfade operator== private.

git-svn-id: svn://localhost/ardour2/branches/3.0@8524 d708f5d6-7413-0410-9779-e7cbd77b26cf

3 files changed, 8 insertions, 46 deletions

diff --git a/libs/ardour/ardour/crossfade.h b/libs/ardour/ardour/crossfade.h
index d527b6abfa..98c92e20f4 100644
--- a/libs/ardour/ardour/crossfade.h
+++ b/libs/ardour/ardour/crossfade.h
@@ -30,7 +30,6 @@
 
 #include "ardour/ardour.h"
 #include "ardour/audioregion.h"
-#include "ardour/crossfade_compare.h"
 #include "evoral/Curve.hpp"
 
 namespace ARDOUR {
@@ -40,6 +39,12 @@ namespace ARDOUR {
 		extern PBD::PropertyDescriptor<bool> follow_overlap;
 	}
 
+enum AnchorPoint {
+	StartOfIn,
+	EndOfIn,
+	EndOfOut
+};
+	
 class Playlist;
 
 class Crossfade : public ARDOUR::AudioRegion
@@ -77,8 +82,6 @@ class Crossfade : public ARDOUR::AudioRegion
 
 	static void make_property_quarks ();
 
-	bool operator== (const ARDOUR::Crossfade&);
-
 	XMLNode& get_state (void);
 	int set_state (const XMLNode&, int version);
 
@@ -171,6 +174,8 @@ class Crossfade : public ARDOUR::AudioRegion
 	int  compute (boost::shared_ptr<ARDOUR::AudioRegion>, boost::shared_ptr<ARDOUR::AudioRegion>, CrossfadeModel);
 	bool update ();
 
+	bool operator== (const ARDOUR::Crossfade&);
+	
   protected:
 	framecnt_t read_raw_internal (Sample*, framepos_t, framecnt_t, int) const;
 };
diff --git a/libs/ardour/ardour/crossfade_compare.h b/libs/ardour/ardour/crossfade_compare.h
deleted file mode 100644
index ee934a2220..0000000000
--- a/libs/ardour/ardour/crossfade_compare.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-    Copyright (C) 2003 Paul Davis
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#ifndef __ardour_crossfade_compare_h__
-#define __ardour_crossfade_compare_h__
-
-/* this exists so that playlist.h doesn't have to include crossfade.h
- */
-
-namespace ARDOUR {
-
-class Crossfade;
-
-struct CrossfadeComparePtr {
-    bool operator() (const Crossfade *a, const Crossfade *b) const;
-};
-
-enum AnchorPoint {
-	StartOfIn,
-	EndOfIn,
-	EndOfOut
-};
-
-}
-
-#endif /* __ardour_crossfade_compare_h__ */
diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h
index 352384b695..a141e7ca96 100644
--- a/libs/ardour/ardour/playlist.h
+++ b/libs/ardour/ardour/playlist.h
@@ -42,7 +42,6 @@
 
 #include "ardour/ardour.h"
 #include "ardour/session_object.h"
-#include "ardour/crossfade_compare.h"
 #include "ardour/data_type.h"
 
 namespace ARDOUR  {