Use the correct font to render subtitles in preview / burn-in (#663).

[dcpomatic.git] / src / lib / ffmpeg_audio_stream.cc

diff --git a/src/lib/ffmpeg_audio_stream.cc b/src/lib/ffmpeg_audio_stream.cc
index 7a9e8c18e651f2dfbbe016f489497ce2fb51165d..d7fc7eaedf56b24dfdb768cea1c84c0fc122d82f 100644 (file)
--- a/src/lib/ffmpeg_audio_stream.cc
+++ b/src/lib/ffmpeg_audio_stream.cc
@@ -23,12 +23,16 @@
 #include <libcxml/cxml.h>
 
 using std::string;
+using boost::optional;
 
 FFmpegAudioStream::FFmpegAudioStream (cxml::ConstNodePtr node, int version)
        : FFmpegStream (node)
        , AudioStream (node->number_child<int> ("FrameRate"), AudioMapping (node->node_child ("Mapping"), version))
 {
-       first_audio = node->optional_number_child<double> ("FirstAudio");
+       optional<ContentTime::Type> const f = node->optional_number_child<ContentTime::Type> ("FirstAudio");
+       if (f) {
+               first_audio = ContentTime (f.get ());
+       }
 }
 
 void
@@ -38,6 +42,6 @@ FFmpegAudioStream::as_xml (xmlpp::Node* root) const
        root->add_child("FrameRate")->add_child_text (raw_convert<string> (frame_rate ()));
        mapping().as_xml (root->add_child("Mapping"));
        if (first_audio) {
-               root->add_child("FirstAudio")->add_child_text (raw_convert<string> (first_audio.get ()));
+               root->add_child("FirstAudio")->add_child_text (raw_convert<string> (first_audio.get().get ()));
        }
 }