Cleanup: move EqualityOptions into its own file.

[libdcp.git] / src / reel_asset.cc

diff --git a/src/reel_asset.cc b/src/reel_asset.cc
index f9742628843446ee28668ac2c68e1b7bcf38ae87..3a3ae7312fd131b070085b41577ca1db8349d0db 100644 (file)
--- a/src/reel_asset.cc
+++ b/src/reel_asset.cc
@@ -40,6 +40,7 @@
 #include "asset.h"
 #include "compose.hpp"
 #include "dcp_assert.h"
+#include "equality_options.h"
 #include "raw_convert.h"
 #include "reel_asset.h"
 #include "warnings.h"
@@ -49,22 +50,25 @@ LIBDCP_DISABLE_WARNINGS
 LIBDCP_ENABLE_WARNINGS
 
 
-using std::pair;
-using std::string;
 using std::make_pair;
+using std::pair;
 using std::shared_ptr;
+using std::string;
 using boost::optional;
 using namespace dcp;
 
 
-ReelAsset::ReelAsset (string id, Fraction edit_rate, int64_t intrinsic_duration, int64_t entry_point)
+ReelAsset::ReelAsset (string id, Fraction edit_rate, int64_t intrinsic_duration, optional<int64_t> entry_point)
        : Object (id)
        , _intrinsic_duration (intrinsic_duration)
-       , _duration (intrinsic_duration - entry_point)
        , _edit_rate (edit_rate)
        , _entry_point (entry_point)
 {
-       DCP_ASSERT (_entry_point <= _intrinsic_duration);
+       if (_entry_point) {
+               _duration = intrinsic_duration - *_entry_point;
+       }
+
+       DCP_ASSERT (!_entry_point || *_entry_point <= _intrinsic_duration);
 }
 
 
@@ -123,11 +127,21 @@ ReelAsset::cpl_node_namespace () const
 }
 
 
+template <class T>
+string
+optional_to_string (optional<T> o)
+{
+       return o ? raw_convert<string>(*o) : "[none]";
+}
+
+
 bool
-ReelAsset::asset_equals (shared_ptr<const ReelAsset> other, EqualityOptions opt, NoteHandler note) const
+ReelAsset::asset_equals(shared_ptr<const ReelAsset> other, EqualityOptions const& opt, NoteHandler note) const
 {
+       auto const node = cpl_node_name(Standard::SMPTE);
+
        if (_annotation_text != other->_annotation_text) {
-               string const s = "Reel: annotation texts differ (" + _annotation_text.get_value_or("") + " vs " + other->_annotation_text.get_value_or("") + ")\n";
+               string const s = String::compose("Reel %1: annotation texts differ (%2 vs %3)", node, optional_to_string(_annotation_text), optional_to_string(other->_annotation_text));
                if (!opt.reel_annotation_texts_can_differ) {
                        note (NoteType::ERROR, s);
                        return false;
@@ -137,22 +151,34 @@ ReelAsset::asset_equals (shared_ptr<const ReelAsset> other, EqualityOptions opt,
        }
 
        if (_edit_rate != other->_edit_rate) {
-               note (NoteType::ERROR, "Reel: edit rates differ");
+               note (
+                       NoteType::ERROR,
+                       String::compose("Reel %1: edit rates differ (%2 vs %3)", node, _edit_rate.as_string(), other->_edit_rate.as_string())
+                    );
                return false;
        }
 
        if (_intrinsic_duration != other->_intrinsic_duration) {
-               note (NoteType::ERROR, String::compose ("Reel: intrinsic durations differ (%1 vs %2)", _intrinsic_duration, other->_intrinsic_duration));
+               note (
+                       NoteType::ERROR,
+                       String::compose("Reel %1: intrinsic durations differ (%2 vs %3)", node, _intrinsic_duration, other->_intrinsic_duration)
+                    );
                return false;
        }
 
        if (_entry_point != other->_entry_point) {
-               note (NoteType::ERROR, "Reel: entry points differ");
+               note (
+                       NoteType::ERROR,
+                       String::compose("Reel %1: entry points differ (%2 vs %3)", node, optional_to_string(_entry_point), optional_to_string(other->_entry_point))
+                    );
                return false;
        }
 
        if (_duration != other->_duration) {
-               note (NoteType::ERROR, "Reel: durations differ");
+               note (
+                       NoteType::ERROR,
+                       String::compose("Reel %1: durations differ (%2 vs %3)", node, optional_to_string(_duration), optional_to_string(other->_duration))
+                    );
                return false;
        }