X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fffmpeg_content.h;h=e4c4a8a52de35ef3cd2caf47f4a1c8a5c75829b3;hp=6ab95d2fe9d2bf53a08acd050845721ed40fc1a1;hb=2e504b33eb9f38cac629ad31b7c107fb0cf5efda;hpb=48b2c7b8ec57e72f2f27d5080e54e4b3c3fcda3d

diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index 6ab95d2fe..e4c4a8a52 100644
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -87,7 +87,7 @@ public:
 	int frame_rate;
 	int channels;
 	AudioMapping mapping;
-	boost::optional<double> first_audio;
+	boost::optional<ContentTime> first_audio;
 
 private:
 	friend class ffmpeg_pts_offset_test;
@@ -139,13 +139,13 @@ public:
 	std::string technical_summary () const;
 	std::string information () const;
 	void as_xml (xmlpp::Node *) const;
-	Time full_length () const;
+	DCPTime full_length () const;
 
 	std::string identifier () const;
 	
 	/* AudioContent */
 	int audio_channels () const;
-	AudioContent::Frame audio_length () const;
+	ContentTime audio_length () const;
 	int content_audio_frame_rate () const;
 	int output_audio_frame_rate () const;
 	AudioMapping audio_mapping () const;
@@ -182,7 +182,7 @@ public:
 	void set_subtitle_stream (boost::shared_ptr<FFmpegSubtitleStream>);
 	void set_audio_stream (boost::shared_ptr<FFmpegAudioStream>);
 
-	boost::optional<double> first_video () const {
+	boost::optional<ContentTime> first_video () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _first_video;
 	}
@@ -194,7 +194,7 @@ private:
 	boost::shared_ptr<FFmpegSubtitleStream> _subtitle_stream;
 	std::vector<boost::shared_ptr<FFmpegAudioStream> > _audio_streams;
 	boost::shared_ptr<FFmpegAudioStream> _audio_stream;
-	boost::optional<double> _first_video;
+	boost::optional<ContentTime> _first_video;
 	/** Video filters that should be used when generating DCPs */
 	std::vector<Filter const *> _filters;
 };