Change to libcxml API.

diff --git a/src/kdm.cc b/src/kdm.cc
index 6936bc1e594fe750877182d4ee2d205bf26bb8db..09935ca3c022308cac26fcdb2d54c7b71074b89c 100644 (file)
--- a/src/kdm.cc
+++ b/src/kdm.cc
@@ -56,7 +56,8 @@ KDM::KDM (boost::filesystem::path kdm, boost::filesystem::path private_key)
        
        /* Read the KDM, decrypting it */
 
-       cxml::File f (kdm.string (), "DCinemaSecurityMessage");
+       cxml::Document f ("DCinemaSecurityMessage");
+       f.read_file (kdm.string ());
 
        shared_ptr<cxml::Node> authenticated_private = f.node_child ("AuthenticatedPrivate");
        list<shared_ptr<cxml::Node> > encrypted_keys = authenticated_private->node_children ("EncryptedKey");

diff --git a/src/parse/asset_map.cc b/src/parse/asset_map.cc
index aedc931eb61e03d78029f8c4ec3f96b81224ed1a..484c271074c4fa3686d5502f5dd58940274e1b89 100644 (file)
--- a/src/parse/asset_map.cc
+++ b/src/parse/asset_map.cc
@@ -33,7 +33,8 @@ using namespace libdcp::parse;
 
 AssetMap::AssetMap (string file)
 {
-       cxml::File f (file, "AssetMap");
+       cxml::Document f ("AssetMap");
+       f.read_file (file);
 
        id = f.string_child ("Id");
        creator = f.string_child ("Creator");

diff --git a/src/parse/cpl.cc b/src/parse/cpl.cc
index e7ed44978186dbe0b0dd138b6aa2d17a98af88af..f6ce434c044a4a730e2faa610b03c4d2506e54b1 100644 (file)
--- a/src/parse/cpl.cc
+++ b/src/parse/cpl.cc
@@ -33,7 +33,8 @@ using namespace libdcp::parse;
 
 CPL::CPL (string file)
 {
-       cxml::File f (file, "CompositionPlaylist");
+       cxml::Document f ("CompositionPlaylist");
+       f.read_file (file);
        
        id = f.string_child ("Id");
        annotation_text = f.optional_string_child ("AnnotationText").get_value_or ("");

diff --git a/src/parse/pkl.cc b/src/parse/pkl.cc
index d790cfe4f0b678687420059655d140cbd998976e..bbf070aeb46e56fe78e43fba6dd5d89216b3b13a 100644 (file)
--- a/src/parse/pkl.cc
+++ b/src/parse/pkl.cc
@@ -30,7 +30,8 @@ using namespace libdcp::parse;
 
 PKL::PKL (string file)
 {
-       cxml::File f (file, "PackingList");
+       cxml::Document f ("PackingList");
+       f.read_file (file);
        
        id = f.string_child ("Id");
        annotation_text = f.optional_string_child ("AnnotationText").get_value_or ("");

diff --git a/src/subtitle_asset.cc b/src/subtitle_asset.cc
index d7cb94a501c33597d1f445b586386cc1cfa26425..866a6d253706401f96746527bf9eec329782ccc0 100644 (file)
--- a/src/subtitle_asset.cc
+++ b/src/subtitle_asset.cc
@@ -56,7 +56,8 @@ SubtitleAsset::SubtitleAsset (string directory, string movie_title, string langu
 void
 SubtitleAsset::read_xml (string xml_file)
 {
-       shared_ptr<cxml::File> xml (new cxml::File (xml_file, "DCSubtitle"));
+       shared_ptr<cxml::Document> xml (new cxml::Document ("DCSubtitle"));
+       xml->read_file (xml_file);
        
        _uuid = xml->string_child ("SubtitleID");
        _movie_title = xml->string_child ("MovieTitle");