summaryrefslogtreecommitdiff
path: root/src/dcp.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2012-09-09 11:07:46 +0100
committerCarl Hetherington <cth@carlh.net>2012-09-09 11:07:46 +0100
commit8925dbc6d45a6aacc2828a4f58102caa51179286 (patch)
tree79617df3eb36efcb930fb00def87dd84dcca7af9 /src/dcp.cc
parent807de454f03e3f0265817c336338afcf9a2a5382 (diff)
Rename CPL -> CPLFile
Diffstat (limited to 'src/dcp.cc')
-rw-r--r--src/dcp.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/dcp.cc b/src/dcp.cc
index 29479481..f7ded2c4 100644
--- a/src/dcp.cc
+++ b/src/dcp.cc
@@ -36,7 +36,7 @@
#include "util.h"
#include "metadata.h"
#include "exceptions.h"
-#include "cpl.h"
+#include "cpl_file.h"
#include "pkl.h"
#include "asset_map.h"
#include "reel.h"
@@ -288,9 +288,9 @@ DCP::DCP (string directory, bool require_mxfs)
}
/* Read the XML */
- shared_ptr<CPL> cpl;
+ shared_ptr<CPLFile> cpl;
try {
- cpl.reset (new CPL (files.cpl));
+ cpl.reset (new CPLFile (files.cpl));
} catch (FileError& e) {
throw FileError ("could not load CPL file", files.cpl);
}