1 files changed, 18 insertions, 17 deletions

diff --git a/src/cpl_file.h b/src/cpl_file.h
index 44115401..b17f47cd 100644
--- a/src/cpl_file.h
+++ b/src/cpl_file.h
@@ -23,16 +23,17 @@
 
 #include <stdint.h>
 #include <boost/shared_ptr.hpp>
-#include "xml.h"
+#include <libcxml/cxml.h>
+#include "types.h"
 
 namespace libdcp {
 
-/** @brief A simple parser for and representation of a CPL \<Picture\> node */
-class Picture : public XMLNode
+/** @brief A simple representation of a CPL \<Picture\> node */
+class Picture
 {
 public:
 	Picture () {}
-	Picture (xmlpp::Node const * node);
+	Picture (boost::shared_ptr<const cxml::Node> node);
 
 	std::string id;
 	std::string annotation_text;
@@ -53,7 +54,7 @@ class MainPicture : public Picture
 {
 public:
 	MainPicture () {}
-	MainPicture (xmlpp::Node const * node);
+	MainPicture (boost::shared_ptr<const cxml::Node> node);
 };
 
 /** @brief A simple parser for and representation of a CPL \<MainStereoscopicPicture\> node */
@@ -61,15 +62,15 @@ class MainStereoscopicPicture : public Picture
 {
 public:
 	MainStereoscopicPicture () {}
-	MainStereoscopicPicture (xmlpp::Node const * node);
+	MainStereoscopicPicture (boost::shared_ptr<const cxml::Node> node);
 };
 
 /** @brief A simple parser for and representation of a CPL \<MainSound\> node */
-class MainSound : public XMLNode
+class MainSound
 {
 public:
 	MainSound () {}
-	MainSound (xmlpp::Node const * node);
+	MainSound (boost::shared_ptr<const cxml::Node> node);
 
 	std::string id;
 	std::string annotation_text;
@@ -80,11 +81,11 @@ public:
 };
 
 /** @brief A simple parser for and representation of a CPL \<MainSubtitle\> node */
-class MainSubtitle : public XMLNode
+class MainSubtitle
 {
 public:
 	MainSubtitle () {}
-	MainSubtitle (xmlpp::Node const * node);
+	MainSubtitle (boost::shared_ptr<const cxml::Node> node);
 
 	std::string id;
 	std::string annotation_text;
@@ -95,11 +96,11 @@ public:
 };
 
 /** @brief A simple parser for and representation of a CPL \<AssetList\> node */
-class CPLAssetList : public XMLNode
+class CPLAssetList
 {
 public:
 	CPLAssetList () {}
-	CPLAssetList (xmlpp::Node const * node);
+	CPLAssetList (boost::shared_ptr<const cxml::Node> node);
 
 	boost::shared_ptr<MainPicture> main_picture;
 	boost::shared_ptr<MainStereoscopicPicture> main_stereoscopic_picture;
@@ -108,11 +109,11 @@ public:
 };
 
 /** @brief A simple parser for and representation of a CPL \<Reel\> node */
-class CPLReel : public XMLNode
+class CPLReel
 {
 public:
 	CPLReel () {}
-	CPLReel (xmlpp::Node const * node);
+	CPLReel (boost::shared_ptr<const cxml::Node> node);
 
 	std::string id;
 	boost::shared_ptr<CPLAssetList> asset_list;
@@ -120,11 +121,11 @@ public:
 
 
 /** @brief A simple parser for and representation of a CPL \<ContentVersion\> node */
-class ContentVersion : public XMLNode
+class ContentVersion
 {
 public:
 	ContentVersion () {}
-	ContentVersion (xmlpp::Node const * node);
+	ContentVersion (boost::shared_ptr<const cxml::Node> node);
 
 	std::string id;
 	std::string label_text;
@@ -136,7 +137,7 @@ public:
  *  This class is used to parse XML CPL files.  It is rarely necessary
  *  for the caller to use it outside libdcp.
  */
-class CPLFile : public XMLFile
+class CPLFile
 {
 public:
 	/** Parse a CPL XML file into our member variables */