1 files changed, 15 insertions, 21 deletions

diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index 4ae5546c2..bd5648ecb 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -163,9 +163,8 @@ FFmpegContent::examine (shared_ptr<Job> job)
 
 	shared_ptr<FFmpegExaminer> examiner (new FFmpegExaminer (shared_from_this ()));
 
-	VideoContent::Frame video_length = 0;
-	video_length = examiner->video_length ();
-	film->log()->log (String::compose ("Video length obtained from header as %1 frames", video_length));
+	ContentTime video_length = examiner->video_length ();
+	film->log()->log (String::compose ("Video length obtained from header as %1 frames", video_length.frames (video_frame_rate ())));
 
 	{
 		boost::mutex::scoped_lock lm (_mutex);
@@ -228,7 +227,7 @@ FFmpegContent::technical_summary () const
 string
 FFmpegContent::information () const
 {
-	if (video_length() == 0 || video_frame_rate() == 0) {
+	if (video_length() == ContentTime (0) || video_frame_rate() == ContentTime (0)) {
 		return "";
 	}
 	
@@ -262,19 +261,17 @@ FFmpegContent::set_audio_stream (shared_ptr<FFmpegAudioStream> s)
 	signal_changed (FFmpegContentProperty::AUDIO_STREAM);
 }
 
-AudioContent::Frame
+ContentTime
 FFmpegContent::audio_length () const
 {
-	int const cafr = content_audio_frame_rate ();
-	int const vfr  = video_frame_rate ();
-	VideoContent::Frame const vl = video_length ();
-
-	boost::mutex::scoped_lock lm (_mutex);
-	if (!_audio_stream) {
-		return 0;
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		if (!_audio_stream) {
+			return ContentTime ();
+		}
 	}
-	
-	return video_frames_to_audio_frames (vl, cafr, vfr);
+
+	return video_length();
 }
 
 int
@@ -310,16 +307,15 @@ FFmpegContent::output_audio_frame_rate () const
 	/* Resample to a DCI-approved sample rate */
 	double t = dcp_audio_frame_rate (content_audio_frame_rate ());
 
-	FrameRateConversion frc (video_frame_rate(), film->video_frame_rate());
+	FrameRateChange frc (video_frame_rate(), film->video_frame_rate());
 
 	/* Compensate if the DCP is being run at a different frame rate
 	   to the source; that is, if the video is run such that it will
 	   look different in the DCP compared to the source (slower or faster).
-	   skip/repeat doesn't come into effect here.
 	*/
 
 	if (frc.change_speed) {
-		t *= video_frame_rate() * frc.factor() / film->video_frame_rate();
+		t /= frc.speed_up;
 	}
 
 	return rint (t);
@@ -417,14 +413,12 @@ FFmpegSubtitleStream::as_xml (xmlpp::Node* root) const
 	FFmpegStream::as_xml (root);
 }
 
-Time
+DCPTime
 FFmpegContent::full_length () const
 {
 	shared_ptr<const Film> film = _film.lock ();
 	assert (film);
-	
-	FrameRateConversion frc (video_frame_rate (), film->video_frame_rate ());
-	return video_length() * frc.factor() * TIME_HZ / film->video_frame_rate ();
+	return DCPTime (video_length(), FrameRateChange (video_frame_rate (), film->video_frame_rate ()));
 }
 
 AudioMapping