diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-01-17 17:11:32 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-01-17 17:11:32 +0000 |
| commit | 41fc6e366ad3de85704c35961beaf539ab9ceb8b (patch) | |
| tree | 22c68206025af06f3915650d5feece76e57cbfc0 /src/dcp.cc | |
| parent | 394abae7986abf4438184a712f16dfbe3c2734da (diff) | |
namespace libdcp -> dcp.
Diffstat (limited to 'src/dcp.cc')
| -rw-r--r-- | src/dcp.cc | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -56,7 +56,7 @@ using std::back_inserter; using std::make_pair; using boost::shared_ptr; using boost::lexical_cast; -using namespace libdcp; +using namespace dcp; DCP::DCP (boost::filesystem::path directory) : _directory (directory) @@ -216,12 +216,12 @@ DCP::read_assets () boost::filesystem::path p = _directory; p /= "ASSETMAP"; if (boost::filesystem::exists (p)) { - asset_map.reset (new libdcp::parse::AssetMap (p.string ())); + asset_map.reset (new dcp::parse::AssetMap (p.string ())); } else { p = _directory; p /= "ASSETMAP.xml"; if (boost::filesystem::exists (p)) { - asset_map.reset (new libdcp::parse::AssetMap (p.string ())); + asset_map.reset (new dcp::parse::AssetMap (p.string ())); } else { boost::throw_exception (DCPReadError ("could not find AssetMap file")); } @@ -231,7 +231,7 @@ DCP::read_assets () boost::throw_exception (FileError ("could not load AssetMap file", _files.asset_map, e.number ())); } - for (list<shared_ptr<libdcp::parse::AssetMapAsset> >::const_iterator i = asset_map->assets.begin(); i != asset_map->assets.end(); ++i) { + for (list<shared_ptr<dcp::parse::AssetMapAsset> >::const_iterator i = asset_map->assets.begin(); i != asset_map->assets.end(); ++i) { if ((*i)->chunks.size() != 1) { boost::throw_exception (XMLError ("unsupported asset chunk count")); } |
