X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fvideo_content.cc;h=bd24621f79fe72c144d04bf33edaf908cadb61b8;hp=9edbc104a92d3daa77a0a19b46dd18d55317c14e;hb=308488324dbc4d8b709d3fb1dc9fee0479346c21;hpb=cfdd68eb5fb0ef8423e860103ad4e5510994f1da diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index 9edbc104a..bd24621f7 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -20,6 +20,7 @@ #include #include #include +#include #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::_scales; @@ -155,15 +156,15 @@ void VideoContent::as_xml (xmlpp::Node* node) const { boost::mutex::scoped_lock lm (_mutex); - node->add_child("VideoLength")->add_child_text (lexical_cast (_video_length.get ())); - node->add_child("VideoWidth")->add_child_text (lexical_cast (_video_size.width)); - node->add_child("VideoHeight")->add_child_text (lexical_cast (_video_size.height)); - node->add_child("VideoFrameRate")->add_child_text (lexical_cast (_video_frame_rate)); - node->add_child("VideoFrameType")->add_child_text (lexical_cast (static_cast (_video_frame_type))); - node->add_child("LeftCrop")->add_child_text (boost::lexical_cast (_crop.left)); - node->add_child("RightCrop")->add_child_text (boost::lexical_cast (_crop.right)); - node->add_child("TopCrop")->add_child_text (boost::lexical_cast (_crop.top)); - node->add_child("BottomCrop")->add_child_text (boost::lexical_cast (_crop.bottom)); + node->add_child("VideoLength")->add_child_text (raw_convert (_video_length.get ())); + node->add_child("VideoWidth")->add_child_text (raw_convert (_video_size.width)); + node->add_child("VideoHeight")->add_child_text (raw_convert (_video_size.height)); + node->add_child("VideoFrameRate")->add_child_text (raw_convert (_video_frame_rate)); + node->add_child("VideoFrameType")->add_child_text (raw_convert (static_cast (_video_frame_type))); + node->add_child("LeftCrop")->add_child_text (raw_convert (_crop.left)); + node->add_child("RightCrop")->add_child_text (raw_convert (_crop.right)); + node->add_child("TopCrop")->add_child_text (raw_convert (_crop.top)); + node->add_child("BottomCrop")->add_child_text (raw_convert (_crop.bottom)); _scale.as_xml (node->add_child("Scale")); _colour_conversion.as_xml (node->add_child("ColourConversion")); }