diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-09-09 11:09:34 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-09-09 11:09:34 +0100 |
| commit | 403c1e43d7e12af9ae72291f4bdff78fd242f9f6 (patch) | |
| tree | 7a0e25694681624138191af93ac155c221c67646 /src | |
| parent | 8925dbc6d45a6aacc2828a4f58102caa51179286 (diff) | |
PKL -> PKLFile.
Diffstat (limited to 'src')
| -rw-r--r-- | src/dcp.cc | 6 | ||||
| -rw-r--r-- | src/pkl_file.cc (renamed from src/pkl.cc) | 6 | ||||
| -rw-r--r-- | src/pkl_file.h (renamed from src/pkl.h) | 6 | ||||
| -rw-r--r-- | src/wscript | 2 |
4 files changed, 10 insertions, 10 deletions
@@ -37,7 +37,7 @@ #include "metadata.h" #include "exceptions.h" #include "cpl_file.h" -#include "pkl.h" +#include "pkl_file.h" #include "asset_map.h" #include "reel.h" @@ -295,9 +295,9 @@ DCP::DCP (string directory, bool require_mxfs) throw FileError ("could not load CPL file", files.cpl); } - shared_ptr<PKL> pkl; + shared_ptr<PKLFile> pkl; try { - pkl.reset (new PKL (files.pkl)); + pkl.reset (new PKLFile (files.pkl)); } catch (FileError& e) { throw FileError ("could not load PKL file", files.pkl); } diff --git a/src/pkl.cc b/src/pkl_file.cc index 41c44734..d823e585 100644 --- a/src/pkl.cc +++ b/src/pkl_file.cc @@ -17,18 +17,18 @@ */ -/** @file src/cpl.cc +/** @file src/pkl_file.cc * @brief Classes used to parse a PKL. */ #include <iostream> -#include "pkl.h" +#include "pkl_file.h" using namespace std; using namespace boost; using namespace libdcp; -PKL::PKL (string file) +PKLFile::PKLFile (string file) : XMLFile (file, "PackingList") { id = string_node ("Id"); diff --git a/src/pkl.h b/src/pkl_file.h index a0a8cb75..b64da5da 100644 --- a/src/pkl.h +++ b/src/pkl_file.h @@ -17,7 +17,7 @@ */ -/** @file src/pkl.h +/** @file src/pkl_file.h * @brief Classes used to parse a PKL */ @@ -40,10 +40,10 @@ public: std::string original_file_name; }; -class PKL : public XMLFile +class PKLFile : public XMLFile { public: - PKL (std::string file); + PKLFile (std::string file); std::string id; std::string annotation_text; diff --git a/src/wscript b/src/wscript index 75a161fd..037695b8 100644 --- a/src/wscript +++ b/src/wscript @@ -16,7 +16,7 @@ def build(bld): mxf_asset.cc picture_asset.cc picture_frame.cc - pkl.cc + pkl_file.cc reel.cc argb_frame.cc sound_asset.cc |
