From d324fc102df00d6dc62614938f78cf983a101dd4 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 20 Nov 2013 00:00:51 +0000 Subject: [PATCH] Use cxml::NodePtr. --- src/lib/audio_mapping.cc | 4 ++-- src/lib/cinema.cc | 4 ++-- src/lib/colour_conversion.cc | 8 ++++---- src/lib/colour_conversion.h | 9 +++------ src/lib/config.cc | 12 ++++++------ src/lib/content.cc | 2 +- src/lib/content_factory.cc | 2 +- src/lib/content_factory.h | 2 +- src/lib/ffmpeg_content.cc | 8 ++++---- src/lib/moving_image_content.cc | 4 ++-- src/lib/playlist.cc | 4 ++-- 11 files changed, 28 insertions(+), 31 deletions(-) diff --git a/src/lib/audio_mapping.cc b/src/lib/audio_mapping.cc index 7a5da7d2a..362000125 100644 --- a/src/lib/audio_mapping.cc +++ b/src/lib/audio_mapping.cc @@ -64,8 +64,8 @@ AudioMapping::AudioMapping (shared_ptr node) { _content_channels = node->number_child ("ContentChannels"); - list > const c = node->node_children ("Map"); - for (list >::const_iterator i = c.begin(); i != c.end(); ++i) { + list const c = node->node_children ("Map"); + for (list::const_iterator i = c.begin(); i != c.end(); ++i) { add ((*i)->number_child ("ContentIndex"), static_cast ((*i)->number_child ("DCP"))); } } diff --git a/src/lib/cinema.cc b/src/lib/cinema.cc index eccd46b84..fca6b6afd 100644 --- a/src/lib/cinema.cc +++ b/src/lib/cinema.cc @@ -37,8 +37,8 @@ Cinema::Cinema (shared_ptr node) void Cinema::read_screens (shared_ptr node) { - list > s = node->node_children ("Screen"); - for (list >::iterator i = s.begin(); i != s.end(); ++i) { + list s = node->node_children ("Screen"); + for (list::iterator i = s.begin(); i != s.end(); ++i) { add_screen (shared_ptr (new Screen (*i))); } } diff --git a/src/lib/colour_conversion.cc b/src/lib/colour_conversion.cc index 95d267a8c..c3fa05426 100644 --- a/src/lib/colour_conversion.cc +++ b/src/lib/colour_conversion.cc @@ -61,7 +61,7 @@ ColourConversion::ColourConversion (double i, bool il, double const m[3][3], dou } } -ColourConversion::ColourConversion (shared_ptr node) +ColourConversion::ColourConversion (cxml::NodePtr node) : matrix (3, 3) { LocaleGuard lg; @@ -75,8 +75,8 @@ ColourConversion::ColourConversion (shared_ptr node) } } - list > m = node->node_children ("Matrix"); - for (list >::iterator i = m.begin(); i != m.end(); ++i) { + list m = node->node_children ("Matrix"); + for (list::iterator i = m.begin(); i != m.end(); ++i) { int const ti = (*i)->number_attribute ("i"); int const tj = (*i)->number_attribute ("j"); matrix(ti, tj) = lexical_cast ((*i)->content ()); @@ -154,7 +154,7 @@ PresetColourConversion::PresetColourConversion (string n, double i, bool il, dou } -PresetColourConversion::PresetColourConversion (shared_ptr node) +PresetColourConversion::PresetColourConversion (cxml::NodePtr node) : conversion (node) { name = node->string_child ("Name"); diff --git a/src/lib/colour_conversion.h b/src/lib/colour_conversion.h index 893148466..fa1a955e1 100644 --- a/src/lib/colour_conversion.h +++ b/src/lib/colour_conversion.h @@ -28,10 +28,7 @@ #include #include #include - -namespace cxml { - class Node; -} +#include namespace xmlpp { class Node; @@ -42,7 +39,7 @@ class ColourConversion public: ColourConversion (); ColourConversion (double, bool, double const matrix[3][3], double); - ColourConversion (boost::shared_ptr); + ColourConversion (cxml::NodePtr); virtual void as_xml (xmlpp::Node *) const; std::string identifier () const; @@ -60,7 +57,7 @@ class PresetColourConversion public: PresetColourConversion (); PresetColourConversion (std::string, double, bool, double const matrix[3][3], double); - PresetColourConversion (boost::shared_ptr); + PresetColourConversion (cxml::NodePtr); void as_xml (xmlpp::Node *) const; diff --git a/src/lib/config.cc b/src/lib/config.cc index 777d4114d..4b6455f51 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -109,8 +109,8 @@ Config::read () boost::optional u = f.optional_bool_child ("UseAnyServers"); _use_any_servers = u.get_value_or (true); - list > servers = f.node_children ("Server"); - for (list >::iterator i = servers.begin(); i != servers.end(); ++i) { + list servers = f.node_children ("Server"); + for (list::iterator i = servers.begin(); i != servers.end(); ++i) { if ((*i)->node_children("HostName").size() == 1) { _servers.push_back ((*i)->string_child ("HostName")); } else { @@ -147,13 +147,13 @@ Config::read () _default_still_length = f.optional_number_child("DefaultStillLength").get_value_or (10); _default_j2k_bandwidth = f.optional_number_child("DefaultJ2KBandwidth").get_value_or (200000000); - list > cc = f.node_children ("ColourConversion"); + list cc = f.node_children ("ColourConversion"); if (!cc.empty ()) { _colour_conversions.clear (); } - for (list >::iterator i = cc.begin(); i != cc.end(); ++i) { + for (list::iterator i = cc.begin(); i != cc.end(); ++i) { _colour_conversions.push_back (PresetColourConversion (*i)); } @@ -164,8 +164,8 @@ Config::read () _colour_conversions.push_back (PresetColourConversion (_("Rec. 709"), 2.2, false, libdcp::colour_matrix::rec709_to_xyz, 2.6)); } - list > cin = f.node_children ("Cinema"); - for (list >::iterator i = cin.begin(); i != cin.end(); ++i) { + list cin = f.node_children ("Cinema"); + for (list::iterator i = cin.begin(); i != cin.end(); ++i) { /* Slightly grotty two-part construction of Cinema here so that we can use shared_from_this. */ diff --git a/src/lib/content.cc b/src/lib/content.cc index e3ad42560..a41261998 100644 --- a/src/lib/content.cc +++ b/src/lib/content.cc @@ -153,7 +153,7 @@ Content::clone () const xmlpp::Document doc; xmlpp::Node* node = doc.create_root_node ("Content"); as_xml (node); - return content_factory (film, shared_ptr (new cxml::Node (node))); + return content_factory (film, cxml::NodePtr(new cxml::Node (node))); } string diff --git a/src/lib/content_factory.cc b/src/lib/content_factory.cc index d42491f7f..ed9a9e769 100644 --- a/src/lib/content_factory.cc +++ b/src/lib/content_factory.cc @@ -28,7 +28,7 @@ using std::string; using boost::shared_ptr; shared_ptr -content_factory (shared_ptr film, shared_ptr node) +content_factory (shared_ptr film, cxml::NodePtr node) { string const type = node->string_child ("Type"); diff --git a/src/lib/content_factory.h b/src/lib/content_factory.h index 93fd98d83..d2f75051a 100644 --- a/src/lib/content_factory.h +++ b/src/lib/content_factory.h @@ -19,5 +19,5 @@ class Film; -extern boost::shared_ptr content_factory (boost::shared_ptr, boost::shared_ptr); +extern boost::shared_ptr content_factory (boost::shared_ptr, cxml::NodePtr); extern boost::shared_ptr content_factory (boost::shared_ptr, boost::filesystem::path); diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc index de967c045..a6f9e6ac8 100644 --- a/src/lib/ffmpeg_content.cc +++ b/src/lib/ffmpeg_content.cc @@ -59,8 +59,8 @@ FFmpegContent::FFmpegContent (shared_ptr f, shared_ptr > c = node->node_children ("SubtitleStream"); - for (list >::const_iterator i = c.begin(); i != c.end(); ++i) { + list c = node->node_children ("SubtitleStream"); + for (list::const_iterator i = c.begin(); i != c.end(); ++i) { _subtitle_streams.push_back (shared_ptr (new FFmpegSubtitleStream (*i))); if ((*i)->optional_number_child ("Selected")) { _subtitle_stream = _subtitle_streams.back (); @@ -68,7 +68,7 @@ FFmpegContent::FFmpegContent (shared_ptr f, shared_ptrnode_children ("AudioStream"); - for (list >::const_iterator i = c.begin(); i != c.end(); ++i) { + for (list::const_iterator i = c.begin(); i != c.end(); ++i) { _audio_streams.push_back (shared_ptr (new FFmpegAudioStream (*i))); if ((*i)->optional_number_child ("Selected")) { _audio_stream = _audio_streams.back (); @@ -76,7 +76,7 @@ FFmpegContent::FFmpegContent (shared_ptr f, shared_ptrnode_children ("Filter"); - for (list >::iterator i = c.begin(); i != c.end(); ++i) { + for (list::iterator i = c.begin(); i != c.end(); ++i) { _filters.push_back (Filter::from_id ((*i)->content ())); } diff --git a/src/lib/moving_image_content.cc b/src/lib/moving_image_content.cc index 14ebfcf25..dd486b0a7 100644 --- a/src/lib/moving_image_content.cc +++ b/src/lib/moving_image_content.cc @@ -45,8 +45,8 @@ MovingImageContent::MovingImageContent (shared_ptr f, shared_ptr > c = node->node_children ("File"); - for (list >::const_iterator i = c.begin(); i != c.end(); ++i) { + list c = node->node_children ("File"); + for (list::const_iterator i = c.begin(); i != c.end(); ++i) { _files.push_back ((*i)->content ()); } } diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc index 405786050..fc06ea9b9 100644 --- a/src/lib/playlist.cc +++ b/src/lib/playlist.cc @@ -116,8 +116,8 @@ Playlist::video_identifier () const void Playlist::set_from_xml (shared_ptr film, shared_ptr node) { - list > c = node->node_children ("Content"); - for (list >::iterator i = c.begin(); i != c.end(); ++i) { + list c = node->node_children ("Content"); + for (list::iterator i = c.begin(); i != c.end(); ++i) { _content.push_back (content_factory (film, *i)); } -- 2.30.2