Work around symbol clash with ERROR on Win32/mingw.

[libdcp.git] / src / asset.cc

diff --git a/src/asset.cc b/src/asset.cc
index 738fb0193d1636fd45f83e00766629bfd5b75204..80b010825b57eb95f72acf39d801bc2a9185fef2 100644 (file)
--- a/src/asset.cc
+++ b/src/asset.cc
@@ -21,16 +21,16 @@
  *  @brief Asset class.
  */
 
+#include "raw_convert.h"
 #include "asset.h"
 #include "util.h"
 #include "exceptions.h"
 #include "compose.hpp"
 #include <libxml++/libxml++.h>
-#include <boost/lexical_cast.hpp>
 
 using std::string;
-using boost::lexical_cast;
 using boost::function;
+using boost::optional;
 using namespace dcp;
 
 /** Create an Asset with a randomly-generated ID */
@@ -59,7 +59,7 @@ Asset::Asset (string id)
 }
 
 void
-Asset::write_to_pkl (xmlpp::Node* node) const
+Asset::write_to_pkl (xmlpp::Node* node, Standard standard) const
 {
        assert (!_file.empty ());
        
@@ -67,8 +67,8 @@ Asset::write_to_pkl (xmlpp::Node* node) const
        asset->add_child("Id")->add_child_text ("urn:uuid:" + _id);
        asset->add_child("AnnotationText")->add_child_text (_id);
        asset->add_child("Hash")->add_child_text (hash ());
-       asset->add_child("Size")->add_child_text (lexical_cast<string> (boost::filesystem::file_size (_file)));
-       asset->add_child("Type")->add_child_text (pkl_type ());
+       asset->add_child("Size")->add_child_text (raw_convert<string> (boost::filesystem::file_size (_file)));
+       asset->add_child("Type")->add_child_text (pkl_type (standard));
 }
 
 void
@@ -80,23 +80,23 @@ Asset::write_to_assetmap (xmlpp::Node* node, boost::filesystem::path root) const
        asset->add_child("Id")->add_child_text ("urn:uuid:" + _id);
        xmlpp::Node* chunk_list = asset->add_child ("ChunkList");
        xmlpp::Node* chunk = chunk_list->add_child ("Chunk");
-       boost::optional<boost::filesystem::path> path = relative_to_root (root, _file);
+       optional<boost::filesystem::path> path = relative_to_root (root, _file);
        if (!path) {
                throw MiscError (String::compose ("Asset %1 is not within the directory %2", _file, root));
        }
        chunk->add_child("Path")->add_child_text (path.get().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> (boost::filesystem::file_size (_file)));
+       chunk->add_child("Length")->add_child_text (raw_convert<string> (boost::filesystem::file_size (_file)));
 }
 
 string
-Asset::hash () const
+Asset::hash (function<void (float)> progress) const
 {
        assert (!_file.empty ());
                
        if (_hash.empty ()) {
-               _hash = make_digest (_file, 0);
+               _hash = make_digest (_file, progress);
        }
 
        return _hash;
@@ -106,7 +106,7 @@ bool
 Asset::equals (boost::shared_ptr<const Asset> other, EqualityOptions, function<void (NoteType, string)> note) const
 {
        if (_hash != other->_hash) {
-               note (ERROR, "Asset hashes differ");
+               note (DCP_ERROR, "Asset hashes differ");
                return false;
        }