diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-09-09 11:07:46 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-09-09 11:07:46 +0100 |
| commit | 8925dbc6d45a6aacc2828a4f58102caa51179286 (patch) | |
| tree | 79617df3eb36efcb930fb00def87dd84dcca7af9 /src | |
| parent | 807de454f03e3f0265817c336338afcf9a2a5382 (diff) | |
Rename CPL -> CPLFile
Diffstat (limited to 'src')
| -rw-r--r-- | src/cpl_file.cc (renamed from src/cpl.cc) | 6 | ||||
| -rw-r--r-- | src/cpl_file.h (renamed from src/cpl.h) | 8 | ||||
| -rw-r--r-- | src/dcp.cc | 6 | ||||
| -rw-r--r-- | src/wscript | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/src/cpl.cc b/src/cpl_file.cc index c135db3c..c23536a5 100644 --- a/src/cpl.cc +++ b/src/cpl_file.cc @@ -17,17 +17,17 @@ */ -/** @file src/cpl.cc +/** @file src/cpl_file.cc * @brief Classes used to parse a CPL. */ #include <iostream> -#include "cpl.h" +#include "cpl_file.h" using namespace std; using namespace libdcp; -CPL::CPL (string file) +CPLFile::CPLFile (string file) : XMLFile (file, "CompositionPlaylist") { id = string_node ("Id"); diff --git a/src/cpl.h b/src/cpl_file.h index 8f5682da..14bcafd0 100644 --- a/src/cpl.h +++ b/src/cpl_file.h @@ -17,7 +17,7 @@ */ -/** @file src/cpl.h +/** @file src/cpl_file.h * @brief Classes used to parse a CPL. */ @@ -125,17 +125,17 @@ public: std::string label_text; }; -/** @class CPL +/** @class CPLFile * @brief Class to parse a CPL * * This class is used to parse XML CPL files. It is rarely necessary * for the caller to use it outside libdcp. */ -class CPL : public XMLFile +class CPLFile : public XMLFile { public: /** Parse a CPL XML file into our member variables */ - CPL (std::string file); + CPLFile (std::string file); std::string id; std::string annotation_text; @@ -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); } diff --git a/src/wscript b/src/wscript index 1ca88bc6..75a161fd 100644 --- a/src/wscript +++ b/src/wscript @@ -8,7 +8,7 @@ def build(bld): obj.source = """ asset.cc asset_map.cc - cpl.cc + cpl_file.cc dcp.cc dcp_time.cc lut.cc |