const fixes.

[libdcp.git] / src / asset.cc

diff --git a/src/asset.cc b/src/asset.cc
index 740dc592335c6379f07824b6c896af8a1acd52b0..4e17f855b9176d4e8eb30bffdb71065508dd9e71 100644 (file)
--- a/src/asset.cc
+++ b/src/asset.cc
@@ -22,7 +22,11 @@
  */
 
 #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"
@@ -33,63 +37,88 @@ 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 (boost::filesystem::path directory, string file_name)
        : _directory (directory)
-       , _mxf_name (mxf_name)
-       , _progress (progress)
-       , _fps (fps)
-       , _length (length)
+       , _file_name (file_name)
        , _uuid (make_uuid ())
+       , _edit_rate (0)
+       , _entry_point (0)
+       , _intrinsic_duration (0)
+       , _duration (0)
 {
-       
-}
-
-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;
 }
+
+string
+Asset::digest () const
+{
+       if (_digest.empty ()) {
+               _digest = make_digest (path().string(), 0);
+       }
+
+       return _digest;
+}
+
+void
+Asset::compute_digest (boost::function<void (float)> progress)
+{
+       if (!_digest.empty ()) {
+               return;
+       }
+
+       _digest = make_digest (path().string(), &progress);
+}
+
+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;
+}