diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-03-15 17:49:40 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-03-15 17:49:40 +0000 |
| commit | 6e72e1d36f23a4236c4677f22792a6a4590943a3 (patch) | |
| tree | 7a205cfb00d3c9bd0f74cd8003aaef19bdd558fc /src/asset.cc | |
| parent | 57d6bed6141838329b1039ab52c66cc98273af91 (diff) | |
Clean up OS X build slightly. Better error on failure of xmlSecDSigCtxSign.
Diffstat (limited to 'src/asset.cc')
| -rw-r--r-- | src/asset.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/asset.cc b/src/asset.cc index d51b78fd..4ad29dde 100644 --- a/src/asset.cc +++ b/src/asset.cc @@ -33,8 +33,9 @@ #include "metadata.h" #include "compose.hpp" -using namespace std; -using namespace boost; +using std::string; +using boost::shared_ptr; +using boost::lexical_cast; using namespace libdcp; Asset::Asset (boost::filesystem::path directory, boost::filesystem::path file_name) @@ -58,7 +59,7 @@ Asset::write_to_pkl (xmlpp::Node* node, bool interop) const asset->add_child("Id")->add_child_text ("urn:uuid:" + _uuid); 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("Size")->add_child_text (lexical_cast<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 { @@ -76,13 +77,13 @@ Asset::write_to_assetmap (xmlpp::Node* node) const 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 (lexical_cast<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; |