diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-08-29 20:21:26 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-08-29 20:21:26 +0100 |
| commit | cb92077b0a6730f1d71931300ad293e29185c47d (patch) | |
| tree | 5a6d540b09d5ee177300e61994db26bc9cb5061a /src | |
| parent | b2c879b0ef98958bb706d5c519ed4dbf0dd23619 (diff) | |
Change to libcxml API.
Diffstat (limited to 'src')
| -rw-r--r-- | src/kdm.cc | 3 | ||||
| -rw-r--r-- | src/parse/asset_map.cc | 3 | ||||
| -rw-r--r-- | src/parse/cpl.cc | 3 | ||||
| -rw-r--r-- | src/parse/pkl.cc | 3 | ||||
| -rw-r--r-- | src/subtitle_asset.cc | 3 |
5 files changed, 10 insertions, 5 deletions
@@ -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 aedc931e..484c2710 100644 --- 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 e7ed4497..f6ce434c 100644 --- 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 d790cfe4..bbf070ae 100644 --- 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 d7cb94a5..866a6d25 100644 --- 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"); |