Add Subtitle::set_text()

[libdcp.git] / src / asset.cc

diff --git a/src/asset.cc b/src/asset.cc
index fb21580e32651ce4be73e5b3947dd68cb8d3367e..00ad67bc5a17dfc46e8a8bc495552eb78a40a4c7 100644 (file)
--- a/src/asset.cc
+++ b/src/asset.cc
@@ -22,9 +22,7 @@
  */
 
 #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"
@@ -32,19 +30,21 @@
 #include "asset.h"
 #include "util.h"
 #include "metadata.h"
+#include "compose.hpp"
+#include "raw_convert.h"
 
-using namespace std;
-using namespace boost;
+using std::string;
+using boost::shared_ptr;
 using namespace libdcp;
 
-Asset::Asset (string directory, string file_name, int edit_rate, int intrinsic_duration)
+Asset::Asset (boost::filesystem::path directory, boost::filesystem::path file_name)
        : _directory (directory)
        , _file_name (file_name)
        , _uuid (make_uuid ())
-       , _edit_rate (edit_rate)
+       , _edit_rate (0)
        , _entry_point (0)
-       , _intrinsic_duration (intrinsic_duration)
-       , _duration (intrinsic_duration)
+       , _intrinsic_duration (0)
+       , _duration (0)
 {
        if (_file_name.empty ()) {
                _file_name = _uuid + ".xml";
@@ -52,14 +52,18 @@ Asset::Asset (string directory, string file_name, int edit_rate, int intrinsic_d
 }
 
 void
-Asset::write_to_pkl (xmlpp::Node* node) const
+Asset::write_to_pkl (xmlpp::Node* node, bool interop) const
 {
        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("AnnotationText")->add_child_text (_file_name.string ());
        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");
+       asset->add_child("Size")->add_child_text (raw_convert<string> (boost::filesystem::file_size(path())));
+       if (interop) {
+               asset->add_child("Type")->add_child_text (String::compose ("application/x-smpte-mxf;asdcpKind=%1", asdcp_kind ()));
+       } else {
+               asset->add_child("Type")->add_child_text ("application/mxf");
+       }
 }
 
 void
@@ -69,16 +73,16 @@ Asset::write_to_assetmap (xmlpp::Node* node) const
        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("Path")->add_child_text (_file_name.string ());
        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())));
+       chunk->add_child("Length")->add_child_text (raw_convert<string> (boost::filesystem::file_size(path())));
 }
 
-filesystem::path
+boost::filesystem::path
 Asset::path () const
 {
-       filesystem::path p;
+       boost::filesystem::path p;
        p /= _directory;
        p /= _file_name;
        return p;
@@ -88,12 +92,22 @@ string
 Asset::digest () const
 {
        if (_digest.empty ()) {
-               _digest = make_digest (path().string());
+               _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
 {