X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fffmpeg_content.cc;fp=src%2Flib%2Fffmpeg_content.cc;h=a374bcf3e7496932b5f843c16e4b07458286a4fa;hp=a51cb3de805cdcdefe8910e9c8bade812601441d;hb=308488324dbc4d8b709d3fb1dc9fee0479346c21;hpb=cfdd68eb5fb0ef8423e860103ad4e5510994f1da diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc index a51cb3de8..a374bcf3e 100644 --- a/src/lib/ffmpeg_content.cc +++ b/src/lib/ffmpeg_content.cc @@ -21,6 +21,7 @@ extern "C" { #include } #include +#include #include "ffmpeg_content.h" #include "ffmpeg_examiner.h" #include "compose.hpp" @@ -40,8 +41,8 @@ using std::list; using std::cout; using std::pair; using boost::shared_ptr; -using boost::lexical_cast; using boost::dynamic_pointer_cast; +using libdcp::raw_convert; int const FFmpegContentProperty::SUBTITLE_STREAMS = 100; int const FFmpegContentProperty::SUBTITLE_STREAM = 101; @@ -152,7 +153,7 @@ FFmpegContent::as_xml (xmlpp::Node* node) const } if (_first_video) { - node->add_child("FirstVideo")->add_child_text (lexical_cast (_first_video.get().get())); + node->add_child("FirstVideo")->add_child_text (raw_convert (_first_video.get().get())); } } @@ -322,7 +323,7 @@ void FFmpegStream::as_xml (xmlpp::Node* root) const { root->add_child("Name")->add_child_text (name); - root->add_child("Id")->add_child_text (lexical_cast (_id)); + root->add_child("Id")->add_child_text (raw_convert (_id)); } FFmpegAudioStream::FFmpegAudioStream (shared_ptr node, int version) @@ -338,10 +339,10 @@ void FFmpegAudioStream::as_xml (xmlpp::Node* root) const { FFmpegStream::as_xml (root); - root->add_child("FrameRate")->add_child_text (lexical_cast (frame_rate)); - root->add_child("Channels")->add_child_text (lexical_cast (channels)); + root->add_child("FrameRate")->add_child_text (raw_convert (frame_rate)); + root->add_child("Channels")->add_child_text (raw_convert (channels)); if (first_audio) { - root->add_child("FirstAudio")->add_child_text (lexical_cast (first_audio.get().get())); + root->add_child("FirstAudio")->add_child_text (raw_convert (first_audio.get().get())); } mapping.as_xml (root->add_child("Mapping")); }