X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fasset.cc;h=fb21580e32651ce4be73e5b3947dd68cb8d3367e;hb=ad3d9f8bbe623f87e440bd6a5a12520361a7661f;hp=78686a17bf16ffe6ec59ef62c464f64a26042f0b;hpb=8d94e57248b7957d62350083a93aa479457f9385;p=libdcp.git

diff --git a/src/asset.cc b/src/asset.cc
index 78686a17..fb21580e 100644
--- a/src/asset.cc
+++ b/src/asset.cc
@@ -24,6 +24,9 @@
 #include <iostream>
 #include <fstream>
 #include <boost/filesystem.hpp>
+#include <boost/lexical_cast.hpp>
+#include <boost/function.hpp>
+#include <libxml++/nodes/element.h>
 #include "AS_DCP.h"
 #include "KM_util.h"
 #include "asset.h"
@@ -34,131 +37,78 @@ using namespace std;
 using namespace boost;
 using namespace libdcp;
 
-Asset::Asset (string directory, string mxf_name, sigc::signal1<void, float>* progress, int fps, int length)
+Asset::Asset (string directory, string file_name, int edit_rate, int intrinsic_duration)
 	: _directory (directory)
-	, _mxf_name (mxf_name)
-	, _progress (progress)
-	, _fps (fps)
-	, _length (length)
+	, _file_name (file_name)
 	, _uuid (make_uuid ())
+	, _edit_rate (edit_rate)
+	, _entry_point (0)
+	, _intrinsic_duration (intrinsic_duration)
+	, _duration (intrinsic_duration)
 {
-	
-}
-
-void
-Asset::write_to_pkl (ostream& s) const
-{
-	s << "    <Asset>\n"
-	  << "      <Id>urn:uuid:" << _uuid << "</Id>\n"
-	  << "      <AnnotationText>" << _mxf_name << "</AnnotationText>\n"
-	  << "      <Hash>" << digest() << "</Hash>\n"
-	  << "      <Size>" << filesystem::file_size(mxf_path()) << "</Size>\n"
-	  << "      <Type>application/mxf</Type>\n"
-	  << "    </Asset>\n";
+	if (_file_name.empty ()) {
+		_file_name = _uuid + ".xml";
+	}
 }
 
 void
-Asset::write_to_assetmap (ostream& s) const
+Asset::write_to_pkl (xmlpp::Node* node) const
 {
-	s << "    <Asset>\n"
-	  << "      <Id>urn:uuid:" << _uuid << "</Id>\n"
-	  << "      <ChunkList>\n"
-	  << "        <Chunk>\n"
-	  << "          <Path>" << _mxf_name << "</Path>\n"
-	  << "          <VolumeIndex>1</VolumeIndex>\n"
-	  << "          <Offset>0</Offset>\n"
-	  << "          <Length>" << filesystem::file_size(mxf_path()) << "</Length>\n"
-	  << "        </Chunk>\n"
-	  << "      </ChunkList>\n"
-	  << "    </Asset>\n";
+	xmlpp::Node* asset = node->add_child ("Asset");
+	asset->add_child("Id")->add_child_text ("urn:uuid:" + _uuid);
+	asset->add_child("AnnotationText")->add_child_text (_file_name);
+	asset->add_child("Hash")->add_child_text (digest ());
+	asset->add_child("Size")->add_child_text (lexical_cast<string> (filesystem::file_size(path())));
+	asset->add_child("Type")->add_child_text ("application/mxf");
 }
 
 void
-Asset::fill_writer_info (ASDCP::WriterInfo* writer_info) const
+Asset::write_to_assetmap (xmlpp::Node* node) const
 {
-	writer_info->ProductVersion = Metadata::instance()->product_version;
-	writer_info->CompanyName = Metadata::instance()->company_name;
-	writer_info->ProductName = Metadata::instance()->product_name.c_str();
-
-	writer_info->LabelSetType = ASDCP::LS_MXF_SMPTE;
-	unsigned int c;
-	Kumu::hex2bin (_uuid.c_str(), writer_info->AssetUUID, Kumu::UUID_Length, &c);
-	assert (c == Kumu::UUID_Length);
+	xmlpp::Node* asset = node->add_child ("Asset");
+	asset->add_child("Id")->add_child_text ("urn:uuid:" + _uuid);
+	xmlpp::Node* chunk_list = asset->add_child ("ChunkList");
+	xmlpp::Node* chunk = chunk_list->add_child ("Chunk");
+	chunk->add_child("Path")->add_child_text (_file_name);
+	chunk->add_child("VolumeIndex")->add_child_text ("1");
+	chunk->add_child("Offset")->add_child_text ("0");
+	chunk->add_child("Length")->add_child_text (lexical_cast<string> (filesystem::file_size(path())));
 }
 
 filesystem::path
-Asset::mxf_path () const
+Asset::path () const
 {
 	filesystem::path p;
 	p /= _directory;
-	p /= _mxf_name;
+	p /= _file_name;
 	return p;
 }
 
-list<string>
-Asset::equals (shared_ptr<const Asset> other, EqualityOptions opt) const
-{
-	list<string> notes;
-	
-	if (opt.flags & LIBDCP_METADATA) {
-		if (_mxf_name != other->_mxf_name) {
-			notes.push_back ("MXF names differ");
-		}
-		if (_fps != other->_fps) {
-			notes.push_back ("MXF frames per second differ");
-		}
-		if (_length != other->_length) {
-			notes.push_back ("MXF lengths differ");
-		}
-	}
-	
-	if (opt.flags & MXF_BITWISE) {
-
-		if (digest() != other->digest()) {
-			notes.push_back ("MXF digests differ");
-		}
-		
-		if (filesystem::file_size (mxf_path()) != filesystem::file_size (other->mxf_path())) {
-			notes.push_back (mxf_path().string() + " and " + other->mxf_path().string() + " sizes differ");
-			return notes;
-		}
-		
-		ifstream a (mxf_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 (mxf_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 (mxf_path().string() + " and " + other->mxf_path().string() + " content differs");
-				return notes;
-			}
-
-			n -= t;
-		}
-	}
-
-	return notes;
-}
-
 string
 Asset::digest () const
 {
 	if (_digest.empty ()) {
-		_digest = make_digest (mxf_path().string(), 0);
+		_digest = make_digest (path().string());
 	}
 
 	return _digest;
 }
 
-		
-		
-       
+bool
+Asset::equals (shared_ptr<const Asset> other, EqualityOptions, boost::function<void (NoteType, string)> note) const
+{
+	if (_edit_rate != other->_edit_rate) {
+		note (ERROR, "asset edit rates differ");
+		return false;
+	}
+	
+	if (_intrinsic_duration != other->_intrinsic_duration) {
+		note (ERROR, "asset intrinsic durations differ");
+	}
+
+	if (_duration != other->_duration) {
+		note (ERROR, "asset durations differ");
+	}
+
+	return true;
+}