A few tweaks to dcpdiff.

[libdcp.git] / src / mxf_asset.cc

diff --git a/src/mxf_asset.cc b/src/mxf_asset.cc
index 7e40f0e070090e68e855fa95167a4f6da879aaef..229c332f5230a42fc7c8e95e07a7e2dd4b880eb9 100644 (file)
--- a/src/mxf_asset.cc
+++ b/src/mxf_asset.cc
@@ -36,24 +36,21 @@ using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using namespace libdcp;
 
-MXFAsset::MXFAsset (string directory, string file_name, boost::signals2::signal<void (float)>* progress, int fps, int length)
+MXFAsset::MXFAsset (string directory, string file_name)
        : Asset (directory, file_name)
-       , _progress (progress)
-       , _fps (fps)
-       , _entry_point (0)
-       , _length (length)
+       , _progress (0)
 {
-       
+
 }
 
-void
-MXFAsset::set_entry_point (int e)
+MXFAsset::MXFAsset (string directory, string file_name, boost::signals2::signal<void (float)>* progress, int edit_rate, int intrinsic_duration)
+       : Asset (directory, file_name, edit_rate, intrinsic_duration)
+       , _progress (progress)
 {
-       _entry_point = e;
+       
 }
-
 void
-MXFAsset::fill_writer_info (ASDCP::WriterInfo* writer_info) const
+MXFAsset::fill_writer_info (ASDCP::WriterInfo* writer_info, string uuid)
 {
        writer_info->ProductVersion = Metadata::instance()->product_version;
        writer_info->CompanyName = Metadata::instance()->company_name;
@@ -61,39 +58,29 @@ MXFAsset::fill_writer_info (ASDCP::WriterInfo* writer_info) const
 
        writer_info->LabelSetType = ASDCP::LS_MXF_SMPTE;
        unsigned int c;
-       Kumu::hex2bin (_uuid.c_str(), writer_info->AssetUUID, Kumu::UUID_Length, &c);
+       Kumu::hex2bin (uuid.c_str(), writer_info->AssetUUID, Kumu::UUID_Length, &c);
        assert (c == Kumu::UUID_Length);
 }
 
 bool
-MXFAsset::equals (shared_ptr<const Asset> other, EqualityOptions, list<string>& notes) const
+MXFAsset::equals (shared_ptr<const Asset> other, EqualityOptions opt, boost::function<void (NoteType, string)> note) const
 {
+       if (!Asset::equals (other, opt, note)) {
+               return false;
+       }
+       
        shared_ptr<const MXFAsset> other_mxf = dynamic_pointer_cast<const MXFAsset> (other);
        if (!other_mxf) {
-               notes.push_back ("comparing an MXF asset with a non-MXF asset");
+               note (ERROR, "comparing an MXF asset with a non-MXF asset");
                return false;
        }
        
        if (_file_name != other_mxf->_file_name) {
-               notes.push_back ("MXF names differ");
-               return false;
-       }
-
-       if (_fps != other_mxf->_fps) {
-               notes.push_back ("MXF frames per second differ");
-               return false;
+               note (ERROR, "MXF names differ");
+               if (!opt.mxf_names_can_differ) {
+                       return false;
+               }
        }
        
-       if (_length != other_mxf->_length) {
-               notes.push_back ("MXF lengths differ");
-               return false;
-       }
-
        return true;
 }
-
-int
-MXFAsset::length () const
-{
-       return _length;
-}