From: Carl Hetherington <cth@carlh.net>
Date: Tue, 7 Jul 2015 18:47:53 +0000 (+0100)
Subject: Arch tweaks.
X-Git-Tag: v2.1.20~9
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=c4daef4670d41b449835e7fb3cc7670d4fb3af7c;p=dcpomatic.git

Arch tweaks.
---

diff --git a/src/lib/ffmpeg_audio_stream.cc b/src/lib/ffmpeg_audio_stream.cc
index d71b65ff4..d7fc7eaed 100644
--- 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<int64_t> ("FirstAudio");
+	optional<ContentTime::Type> const f = node->optional_number_child<ContentTime::Type> ("FirstAudio");
+	if (f) {
+		first_audio = ContentTime (f.get ());
+	}
 }
 
 void
diff --git a/src/lib/sndfile_content.cc b/src/lib/sndfile_content.cc
index 6d3ee18f5..34096e50f 100644
--- a/src/lib/sndfile_content.cc
+++ b/src/lib/sndfile_content.cc
@@ -44,7 +44,7 @@ SndfileContent::SndfileContent (shared_ptr<const Film> film, boost::filesystem::
 SndfileContent::SndfileContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
 	: Content (film, node)
 	, SingleStreamAudioContent (film, node, version)
-	, _audio_length (node->number_child<int64_t> ("AudioLength"))
+	, _audio_length (node->number_child<Frame> ("AudioLength"))
 {
 
 }
@@ -109,4 +109,3 @@ SndfileContent::full_length () const
 	FrameRateChange const frc = film->active_frame_rate_change (position ());
 	return DCPTime::from_frames (audio_length() / frc.speed_up, audio_stream()->frame_rate ());
 }
-