diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-10-10 16:07:44 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-10-10 16:07:44 +0100 |
| commit | e30c30ef7bbd8413ac0c8390abe574d5dd1cf5f7 (patch) | |
| tree | f67b4a9364264d433535dbc24a19b6df6ac59049 /src/reel.cc | |
| parent | 863ff8cced5b7d1d36ad6761fa1f6e2dbeafcad6 (diff) | |
Adapt to new libcxml ARI. Compiles but does not pass tests.1.0-new-cxml
Diffstat (limited to 'src/reel.cc')
| -rw-r--r-- | src/reel.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/reel.cc b/src/reel.cc index 0071de86..607a01eb 100644 --- a/src/reel.cc +++ b/src/reel.cc @@ -39,27 +39,27 @@ using boost::shared_ptr; using boost::dynamic_pointer_cast; using namespace dcp; -Reel::Reel (boost::shared_ptr<const cxml::Node> node) +Reel::Reel (cxml::ConstNodePtr node) : Object (node->string_child ("Id")) { - shared_ptr<cxml::Node> asset_list = node->node_child ("AssetList"); + cxml::NodePtr asset_list = node->child ("AssetList"); - shared_ptr<cxml::Node> main_picture = asset_list->optional_node_child ("MainPicture"); + cxml::NodePtr main_picture = asset_list->optional_child ("MainPicture"); if (main_picture) { _main_picture.reset (new ReelMonoPictureAsset (main_picture)); } - shared_ptr<cxml::Node> main_stereoscopic_picture = asset_list->optional_node_child ("MainStereoscopicPicture"); + cxml::NodePtr main_stereoscopic_picture = asset_list->optional_child ("MainStereoscopicPicture"); if (main_stereoscopic_picture) { _main_picture.reset (new ReelStereoPictureAsset (main_stereoscopic_picture)); } - shared_ptr<cxml::Node> main_sound = asset_list->optional_node_child ("MainSound"); + cxml::NodePtr main_sound = asset_list->optional_child ("MainSound"); if (main_sound) { _main_sound.reset (new ReelSoundAsset (main_sound)); } - shared_ptr<cxml::Node> main_subtitle = asset_list->optional_node_child ("MainSubtitle"); + cxml::NodePtr main_subtitle = asset_list->optional_child ("MainSubtitle"); if (main_subtitle) { _main_subtitle.reset (new ReelSubtitleAsset (main_subtitle)); } @@ -69,11 +69,11 @@ Reel::Reel (boost::shared_ptr<const cxml::Node> node) } void -Reel::write_to_cpl (xmlpp::Element* node, Standard standard) const +Reel::write_to_cpl (cxml::NodePtr node, Standard standard) const { - xmlpp::Element* reel = node->add_child ("Reel"); - reel->add_child("Id")->add_child_text ("urn:uuid:" + make_uuid()); - xmlpp::Element* asset_list = reel->add_child ("AssetList"); + cxml::NodePtr reel = node->add_child ("Reel"); + reel->add_child("Id")->set_content ("urn:uuid:" + make_uuid()); + cxml::NodePtr asset_list = reel->add_child ("AssetList"); if (_main_picture && dynamic_pointer_cast<ReelMonoPictureAsset> (_main_picture)) { /* Mono pictures come before other stuff... */ |