PKL -> PKLFile.

diff --git a/src/dcp.cc b/src/dcp.cc
index f7ded2c44ea6e2a91e0bd5fe1257dcc6234f7682..907f7dd5105fcb34d31278bf9000d8345dd687a3 100644 (file)
--- a/src/dcp.cc
+++ b/src/dcp.cc
@@ -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.cc
deleted file mode 100644 (file)
index 41c4473..0000000
--- a/src/pkl.cc
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-/** @file  src/cpl.cc
- *  @brief Classes used to parse a PKL.
- */
-
-#include <iostream>
-#include "pkl.h"
-
-using namespace std;
-using namespace boost;
-using namespace libdcp;
-
-PKL::PKL (string file)
-       : XMLFile (file, "PackingList")
-{
-       id = string_node ("Id");
-       annotation_text = string_node ("AnnotationText");
-       issue_date = string_node ("IssueDate");
-       issuer = string_node ("Issuer");
-       creator = string_node ("Creator");
-       assets = sub_nodes<PKLAsset> ("AssetList", "Asset");
-}
-
-PKLAsset::PKLAsset (xmlpp::Node const * node)
-       : XMLNode (node)
-{
-       id = string_node ("Id");
-       annotation_text = optional_string_node ("AnnotationText");
-       hash = string_node ("Hash");
-       size = int64_node ("Size");
-       type = string_node ("Type");
-       original_file_name = optional_string_node ("OriginalFileName");
-}

diff --git a/src/pkl.h b/src/pkl.h
deleted file mode 100644 (file)
index a0a8cb7..0000000
--- a/src/pkl.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-/** @file  src/pkl.h
- *  @brief Classes used to parse a PKL
- */
-
-#include <boost/shared_ptr.hpp>
-#include "xml.h"
-
-namespace libdcp {
-
-class PKLAsset : public XMLNode
-{
-public:
-       PKLAsset () {}
-       PKLAsset (xmlpp::Node const * node);
-
-       std::string id;
-       std::string annotation_text;
-       std::string hash;
-       int64_t size;
-       std::string type;
-       std::string original_file_name;
-};
-
-class PKL : public XMLFile
-{
-public:
-       PKL (std::string file);
-
-       std::string id;
-       std::string annotation_text;
-       std::string issue_date;
-       std::string issuer;
-       std::string creator;
-       std::list<boost::shared_ptr<PKLAsset> > assets;
-};
-       
-}

diff --git a/src/pkl_file.cc b/src/pkl_file.cc
new file mode 100644 (file)
index 0000000..d823e58
--- /dev/null
+++ b/src/pkl_file.cc
@@ -0,0 +1,51 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file  src/pkl_file.cc
+ *  @brief Classes used to parse a PKL.
+ */
+
+#include <iostream>
+#include "pkl_file.h"
+
+using namespace std;
+using namespace boost;
+using namespace libdcp;
+
+PKLFile::PKLFile (string file)
+       : XMLFile (file, "PackingList")
+{
+       id = string_node ("Id");
+       annotation_text = string_node ("AnnotationText");
+       issue_date = string_node ("IssueDate");
+       issuer = string_node ("Issuer");
+       creator = string_node ("Creator");
+       assets = sub_nodes<PKLAsset> ("AssetList", "Asset");
+}
+
+PKLAsset::PKLAsset (xmlpp::Node const * node)
+       : XMLNode (node)
+{
+       id = string_node ("Id");
+       annotation_text = optional_string_node ("AnnotationText");
+       hash = string_node ("Hash");
+       size = int64_node ("Size");
+       type = string_node ("Type");
+       original_file_name = optional_string_node ("OriginalFileName");
+}

diff --git a/src/pkl_file.h b/src/pkl_file.h
new file mode 100644 (file)
index 0000000..b64da5d
--- /dev/null
+++ b/src/pkl_file.h
@@ -0,0 +1,56 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file  src/pkl_file.h
+ *  @brief Classes used to parse a PKL
+ */
+
+#include <boost/shared_ptr.hpp>
+#include "xml.h"
+
+namespace libdcp {
+
+class PKLAsset : public XMLNode
+{
+public:
+       PKLAsset () {}
+       PKLAsset (xmlpp::Node const * node);
+
+       std::string id;
+       std::string annotation_text;
+       std::string hash;
+       int64_t size;
+       std::string type;
+       std::string original_file_name;
+};
+
+class PKLFile : public XMLFile
+{
+public:
+       PKLFile (std::string file);
+
+       std::string id;
+       std::string annotation_text;
+       std::string issue_date;
+       std::string issuer;
+       std::string creator;
+       std::list<boost::shared_ptr<PKLAsset> > assets;
+};
+       
+}

diff --git a/src/wscript b/src/wscript
index 75a161fdf2606a623d930fe466adcb61a40701c3..037695b80f5a5f8407b58fe1728932c277682e80 100644 (file)
--- 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