A few tweaks to dcpdiff.

[libdcp.git] / src / mxf_asset.cc

diff --git a/src/mxf_asset.cc b/src/mxf_asset.cc
index b5560b268d698510403fee994a0fdec665448dcf..229c332f5230a42fc7c8e95e07a7e2dd4b880eb9 100644 (file)
--- a/src/mxf_asset.cc
+++ b/src/mxf_asset.cc
@@ -30,21 +30,27 @@
 #include "util.h"
 #include "metadata.h"
 
-using namespace std;
-using namespace boost;
+using std::string;
+using std::list;
+using boost::shared_ptr;
+using boost::dynamic_pointer_cast;
 using namespace libdcp;
 
-MXFAsset::MXFAsset (string directory, string file_name, sigc::signal1<void, float>* progress, int fps, int length)
+MXFAsset::MXFAsset (string directory, string file_name)
        : Asset (directory, file_name)
+       , _progress (0)
+{
+
+}
+
+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)
-       , _fps (fps)
-       , _length (length)
 {
        
 }
-
 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;
@@ -52,73 +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);
 }
 
-list<string>
-MXFAsset::equals (shared_ptr<const Asset> other, EqualityOptions opt) const
+bool
+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) {
-               return list<string> ();
+               note (ERROR, "comparing an MXF asset with a non-MXF asset");
+               return false;
        }
        
-       list<string> notes;
-       
-       if (opt.flags & LIBDCP_METADATA) {
-               if (_file_name != other_mxf->_file_name) {
-                       notes.push_back ("MXF names differ");
-               }
-               if (_fps != other_mxf->_fps) {
-                       notes.push_back ("MXF frames per second differ");
-               }
-               if (_length != other_mxf->_length) {
-                       notes.push_back ("MXF lengths differ");
+       if (_file_name != other_mxf->_file_name) {
+               note (ERROR, "MXF names differ");
+               if (!opt.mxf_names_can_differ) {
+                       return false;
                }
        }
        
-       if (opt.flags & MXF_BITWISE) {
-
-               if (digest() != other_mxf->digest()) {
-                       notes.push_back ("MXF digests differ");
-               }
-               
-               if (filesystem::file_size (path()) != filesystem::file_size (other_mxf->path())) {
-                       notes.push_back (path().string() + " and " + other_mxf->path().string() + " sizes differ");
-                       return notes;
-               }
-               
-               ifstream a (path().string().c_str(), ios::binary);
-               ifstream b (other_mxf->path().string().c_str(), ios::binary);
-
-               int buffer_size = 65536;
-               char abuffer[buffer_size];
-               char bbuffer[buffer_size];
-
-               int n = filesystem::file_size (path ());
-
-               while (n) {
-                       int const t = min (n, buffer_size);
-                       a.read (abuffer, t);
-                       b.read (bbuffer, t);
-
-                       if (memcmp (abuffer, bbuffer, t) != 0) {
-                               notes.push_back (path().string() + " and " + other_mxf->path().string() + " content differs");
-                               return notes;
-                       }
-
-                       n -= t;
-               }
-       }
-
-       return notes;
-}
-
-int
-MXFAsset::length () const
-{
-       return _length;
+       return true;
 }
-
-