Fix incorrect free and leak.

[libdcp.git] / src / asset.cc

diff --git a/src/asset.cc b/src/asset.cc
index 59d106b5fa8e5e8bebdf8116ad7e8769873b896d..c566a1e56b22d147da78eea129475fccad9c9187 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,61 +37,80 @@ using namespace std;
 using namespace boost;
 using namespace libdcp;
 
-Asset::Asset (string mxf_path, sigc::signal1<void, float>* progress, int fps, int length)
-       : _mxf_path (mxf_path)
-       , _progress (progress)
-       , _fps (fps)
-       , _length (length)
+Asset::Asset (string directory, string file_name, int edit_rate, int intrinsic_duration)
+       : _directory (directory)
+       , _file_name (file_name)
        , _uuid (make_uuid ())
+       , _edit_rate (edit_rate)
+       , _entry_point (0)
+       , _intrinsic_duration (intrinsic_duration)
+       , _duration (intrinsic_duration)
 {
-       
+       if (_file_name.empty ()) {
+               _file_name = _uuid + ".xml";
+       }
 }
 
 void
-Asset::write_to_pkl (ostream& s) const
+Asset::write_to_pkl (xmlpp::Node* node) const
 {
-       s << "    <Asset>\n"
-         << "      <Id>urn:uuid:" << _uuid << "</Id>\n"
-#if BOOST_FILESYSTEM_VERSION == 3
-         << "      <AnnotationText>" << filesystem::path(_mxf_path).filename().string() << "</AnnotationText>\n"
-#else          
-         << "      <AnnotationText>" << filesystem::path(_mxf_path).filename() << "</AnnotationText>\n"
-#endif         
-         << "      <Hash>" << _digest << "</Hash>\n"
-         << "      <Size>" << filesystem::file_size(_mxf_path) << "</Size>\n"
-         << "      <Type>application/mxf</Type>\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::write_to_assetmap (ostream& s) const
+Asset::write_to_assetmap (xmlpp::Node* node) const
 {
-       s << "    <Asset>\n"
-         << "      <Id>urn:uuid:" << _uuid << "</Id>\n"
-         << "      <ChunkList>\n"
-         << "        <Chunk>\n"
-#if BOOST_FILESYSTEM_VERSION == 3              
-         << "          <Path>" << filesystem::path(_mxf_path).filename().string() << "</Path>\n"
-#else          
-         << "          <Path>" << filesystem::path(_mxf_path).filename() << "</Path>\n"
-#endif         
-         << "          <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);
+       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())));
 }
 
-void
-Asset::fill_writer_info (ASDCP::WriterInfo* writer_info) const
+filesystem::path
+Asset::path () const
+{
+       filesystem::path p;
+       p /= _directory;
+       p /= _file_name;
+       return p;
+}
+
+string
+Asset::digest () const
+{
+       if (_digest.empty ()) {
+               _digest = make_digest (path().string());
+       }
+
+       return _digest;
+}
+
+bool
+Asset::equals (shared_ptr<const Asset> other, EqualityOptions, boost::function<void (NoteType, string)> note) 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);
+       if (_edit_rate != other->_edit_rate) {
+               note (ERROR, "MXF edit rates differ");
+               return false;
+       }
+       
+       if (_intrinsic_duration != other->_intrinsic_duration) {
+               note (ERROR, "MXF intrinsic durations differ");
+               return false;
+       }
+
+       if (_duration != other->_duration) {
+               note (ERROR, "MXF durations differ");
+               return false;
+       }
+
+       return true;
 }