X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.cc;h=9c8ecf0bb7d5c9b595077ced69a80d5aef8884b9;hb=39bc73fe192f932ed6695eb87b19de446e8b4f55;hp=9edbc104a92d3daa77a0a19b46dd18d55317c14e;hpb=2c0478d2b33906845b9d910668b12fe3e8f03a7c;p=dcpomatic.git

diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 9edbc104a..9c8ecf0bb 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -20,6 +20,7 @@
 #include <iomanip>
 #include <libcxml/cxml.h>
 #include <dcp/colour_matrix.h>
+#include <dcp/raw_convert.h>
 #include "video_content.h"
 #include "video_examiner.h"
 #include "compose.hpp"
@@ -45,9 +46,9 @@ using std::setprecision;
 using std::cout;
 using std::vector;
 using boost::shared_ptr;
-using boost::lexical_cast;
 using boost::optional;
 using boost::dynamic_pointer_cast;
+using dcp::raw_convert;
 
 vector<VideoContentScale> VideoContentScale::_scales;
 
@@ -81,7 +82,7 @@ VideoContent::VideoContent (shared_ptr<const Film> f, boost::filesystem::path p)
 	setup_default_colour_conversion ();
 }
 
-VideoContent::VideoContent (shared_ptr<const Film> f, shared_ptr<const cxml::Node> node, int version)
+VideoContent::VideoContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, int version)
 	: Content (f, node)
 {
 	_video_length = ContentTime (node->number_child<int64_t> ("VideoLength"));
@@ -155,15 +156,12 @@ void
 VideoContent::as_xml (xmlpp::Node* node) const
 {
 	boost::mutex::scoped_lock lm (_mutex);
-	node->add_child("VideoLength")->add_child_text (lexical_cast<string> (_video_length.get ()));
-	node->add_child("VideoWidth")->add_child_text (lexical_cast<string> (_video_size.width));
-	node->add_child("VideoHeight")->add_child_text (lexical_cast<string> (_video_size.height));
-	node->add_child("VideoFrameRate")->add_child_text (lexical_cast<string> (_video_frame_rate));
-	node->add_child("VideoFrameType")->add_child_text (lexical_cast<string> (static_cast<int> (_video_frame_type)));
-	node->add_child("LeftCrop")->add_child_text (boost::lexical_cast<string> (_crop.left));
-	node->add_child("RightCrop")->add_child_text (boost::lexical_cast<string> (_crop.right));
-	node->add_child("TopCrop")->add_child_text (boost::lexical_cast<string> (_crop.top));
-	node->add_child("BottomCrop")->add_child_text (boost::lexical_cast<string> (_crop.bottom));
+	node->add_child("VideoLength")->add_child_text (raw_convert<string> (_video_length.get ()));
+	node->add_child("VideoWidth")->add_child_text (raw_convert<string> (_video_size.width));
+	node->add_child("VideoHeight")->add_child_text (raw_convert<string> (_video_size.height));
+	node->add_child("VideoFrameRate")->add_child_text (raw_convert<string> (_video_frame_rate));
+	node->add_child("VideoFrameType")->add_child_text (raw_convert<string> (static_cast<int> (_video_frame_type)));
+	_crop.as_xml (node);
 	_scale.as_xml (node->add_child("Scale"));
 	_colour_conversion.as_xml (node->add_child("ColourConversion"));
 }
@@ -395,7 +393,7 @@ VideoContentScale::VideoContentScale (bool scale)
 
 }
 
-VideoContentScale::VideoContentScale (shared_ptr<cxml::Node> node)
+VideoContentScale::VideoContentScale (cxml::NodePtr node)
 	: _ratio (0)
 	, _scale (true)
 {