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/parse | |
| parent | b2c879b0ef98958bb706d5c519ed4dbf0dd23619 (diff) | |
Change to libcxml API.
Diffstat (limited to 'src/parse')
| -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 |
3 files changed, 6 insertions, 3 deletions
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 (""); |