Fix up some equals() prototype confusion.

9 files changed, 21 insertions, 15 deletions

diff --git a/src/cpl.cc b/src/cpl.cc
index 35a305e5..9c8c865b 100644
--- a/src/cpl.cc
+++ b/src/cpl.cc
@@ -44,6 +44,7 @@ using std::pair;
 using std::make_pair;
 using boost::shared_ptr;
 using boost::optional;
+using boost::dynamic_pointer_cast;
 using namespace dcp;
 
 CPL::CPL (string annotation_text, ContentKind content_kind)
@@ -174,27 +175,32 @@ CPL::reel_assets () const
 }
 	
 bool
-CPL::equals (CPL const & other, EqualityOptions opt, boost::function<void (NoteType, string)> note) const
+CPL::equals (shared_ptr<const Asset> other, EqualityOptions opt, boost::function<void (NoteType, string)> note) const
 {
-	if (_annotation_text != other._annotation_text && !opt.cpl_annotation_texts_can_differ) {
+	shared_ptr<const CPL> other_cpl = dynamic_pointer_cast<const CPL> (other);
+	if (!other_cpl) {
+		return false;
+	}
+	
+	if (_annotation_text != other_cpl->_annotation_text && !opt.cpl_annotation_texts_can_differ) {
 		stringstream s;
-		s << "annotation texts differ: " << _annotation_text << " vs " << other._annotation_text << "\n";
+		s << "annotation texts differ: " << _annotation_text << " vs " << other_cpl->_annotation_text << "\n";
 		note (DCP_ERROR, s.str ());
 		return false;
 	}
 
-	if (_content_kind != other._content_kind) {
+	if (_content_kind != other_cpl->_content_kind) {
 		note (DCP_ERROR, "content kinds differ");
 		return false;
 	}
 
-	if (_reels.size() != other._reels.size()) {
-		note (DCP_ERROR, String::compose ("reel counts differ (%1 vs %2)", _reels.size(), other._reels.size()));
+	if (_reels.size() != other_cpl->_reels.size()) {
+		note (DCP_ERROR, String::compose ("reel counts differ (%1 vs %2)", _reels.size(), other_cpl->_reels.size()));
 		return false;
 	}
 	
 	list<shared_ptr<Reel> >::const_iterator a = _reels.begin ();
-	list<shared_ptr<Reel> >::const_iterator b = other._reels.begin ();
+	list<shared_ptr<Reel> >::const_iterator b = other_cpl->_reels.begin ();
 	
 	while (a != _reels.end ()) {
 		if (!(*a)->equals (*b, opt, note)) {
diff --git a/src/cpl.h b/src/cpl.h
index 73ca45bf..b85b0395 100644
--- a/src/cpl.h
+++ b/src/cpl.h
@@ -55,7 +55,7 @@ public:
 	CPL (boost::filesystem::path file);
 
 	bool equals (
-		CPL const & other,
+		boost::shared_ptr<const Asset> other,
 		EqualityOptions options,
 		boost::function<void (NoteType, std::string)> note
 		) const;
diff --git a/src/mono_picture_mxf.cc b/src/mono_picture_mxf.cc
index 815d8820..b2042fa5 100644
--- a/src/mono_picture_mxf.cc
+++ b/src/mono_picture_mxf.cc
@@ -68,7 +68,7 @@ MonoPictureMXF::get_frame (int n) const
 }
 
 bool
-MonoPictureMXF::equals (shared_ptr<const Content> other, EqualityOptions opt, boost::function<void (NoteType, string)> note) const
+MonoPictureMXF::equals (shared_ptr<const Asset> other, EqualityOptions opt, boost::function<void (NoteType, string)> note) const
 {
 	if (!MXF::equals (other, opt, note)) {
 		return false;
diff --git a/src/mono_picture_mxf.h b/src/mono_picture_mxf.h
index c02a63c1..01a6de3f 100644
--- a/src/mono_picture_mxf.h
+++ b/src/mono_picture_mxf.h
@@ -46,7 +46,7 @@ public:
 	boost::shared_ptr<PictureMXFWriter> start_write (boost::filesystem::path, Standard standard, bool);
 
 	bool equals (
-		boost::shared_ptr<const Content> other,
+		boost::shared_ptr<const Asset> other,
 		EqualityOptions opt,
 		boost::function<void (NoteType, std::string)> note
 		) const;
diff --git a/src/sound_mxf.cc b/src/sound_mxf.cc
index 89f1ee60..05dac418 100644
--- a/src/sound_mxf.cc
+++ b/src/sound_mxf.cc
@@ -82,7 +82,7 @@ SoundMXF::SoundMXF (Fraction edit_rate, int sampling_rate, int channels)
 }
 
 bool
-SoundMXF::equals (shared_ptr<const Content> other, EqualityOptions opt, boost::function<void (NoteType, string)> note) const
+SoundMXF::equals (shared_ptr<const Asset> other, EqualityOptions opt, boost::function<void (NoteType, string)> note) const
 {
 	if (!MXF::equals (other, opt, note)) {
 		return false;
diff --git a/src/sound_mxf.h b/src/sound_mxf.h
index d444ad28..d6978953 100644
--- a/src/sound_mxf.h
+++ b/src/sound_mxf.h
@@ -46,7 +46,7 @@ public:
 	boost::shared_ptr<SoundMXFWriter> start_write (boost::filesystem::path file, Standard standard);
 	
 	bool equals (
-		boost::shared_ptr<const Content> other,
+		boost::shared_ptr<const Asset> other,
 		EqualityOptions opt,
 		boost::function<void (NoteType, std::string)> note
 		) const;
diff --git a/src/stereo_picture_mxf.cc b/src/stereo_picture_mxf.cc
index 0188e4e7..726b0fee 100644
--- a/src/stereo_picture_mxf.cc
+++ b/src/stereo_picture_mxf.cc
@@ -74,7 +74,7 @@ StereoPictureMXF::start_write (boost::filesystem::path file, Standard standard,
 }
 
 bool
-StereoPictureMXF::equals (shared_ptr<const Content> other, EqualityOptions opt, boost::function<void (NoteType, string)> note) const
+StereoPictureMXF::equals (shared_ptr<const Asset> other, EqualityOptions opt, boost::function<void (NoteType, string)> note) const
 {
 	if (!MXF::equals (other, opt, note)) {
 		return false;
diff --git a/src/stereo_picture_mxf.h b/src/stereo_picture_mxf.h
index dc4605c7..9592653e 100644
--- a/src/stereo_picture_mxf.h
+++ b/src/stereo_picture_mxf.h
@@ -35,7 +35,7 @@ public:
 	boost::shared_ptr<PictureMXFWriter> start_write (boost::filesystem::path file, Standard, bool);
 
 	bool equals (
-		boost::shared_ptr<const Content> other,
+		boost::shared_ptr<const Asset> other,
 		EqualityOptions opt,
 		boost::function<void (NoteType, std::string)> note
 		) const;
diff --git a/src/subtitle_content.h b/src/subtitle_content.h
index b05fe59c..945eb4d0 100644
--- a/src/subtitle_content.h
+++ b/src/subtitle_content.h
@@ -51,7 +51,7 @@ public:
 	SubtitleContent (std::string movie_title, std::string language);
 
 	bool equals (
-		boost::shared_ptr<const Content>,
+		boost::shared_ptr<const Asset>,
 		EqualityOptions,
 		boost::function<void (NoteType, std::string)> note
 		) const {