From 41fc6e366ad3de85704c35961beaf539ab9ceb8b Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 17 Jan 2014 17:11:32 +0000 Subject: namespace libdcp -> dcp. --- src/dcp.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/dcp.cc') diff --git a/src/dcp.cc b/src/dcp.cc index f80726fc..653dc87a 100644 --- a/src/dcp.cc +++ b/src/dcp.cc @@ -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 >::const_iterator i = asset_map->assets.begin(); i != asset_map->assets.end(); ++i) { + for (list >::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")); } -- cgit v1.2.3