X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fffmpeg_examiner.h;h=381c5cea9c9e85a48ec894326f92a482f82bf8e7;hb=b666a794a130386bc01ede2143ef40bd6973eb32;hp=4912d899a85f7a70015fa83c72fe61743cb6aab2;hpb=77fd65d0dd95506b5b51802ab58b6bd5eae60dc7;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_examiner.h b/src/lib/ffmpeg_examiner.h
index 4912d899a..381c5cea9 100644
--- a/src/lib/ffmpeg_examiner.h
+++ b/src/lib/ffmpeg_examiner.h
@@ -30,8 +30,8 @@ public:
 	FFmpegExaminer (boost::shared_ptr<const FFmpegContent>);
 	
 	float video_frame_rate () const;
-	libdcp::Size video_size () const;
-	VideoContent::Frame video_length () const;
+	dcp::Size video_size () const;
+	ContentTime video_length () const;
 
 	std::vector<boost::shared_ptr<FFmpegSubtitleStream> > subtitle_streams () const {
 		return _subtitle_streams;
@@ -41,15 +41,17 @@ public:
 		return _audio_streams;
 	}
 
-	boost::optional<double> first_video () const {
+	boost::optional<ContentTime> first_video () const {
 		return _first_video;
 	}
 	
 private:
 	std::string stream_name (AVStream* s) const;
-	boost::optional<double> frame_time (int) const;
+	std::string audio_stream_name (AVStream* s) const;
+	std::string subtitle_stream_name (AVStream* s) const;
+	boost::optional<ContentTime> frame_time (AVStream* s) const;
 	
 	std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams;
 	std::vector<boost::shared_ptr<FFmpegAudioStream> > _audio_streams;
-	boost::optional<double> _first_video;
+	boost::optional<ContentTime> _first_video;
 };