X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_content.h;h=76ba43567d9961ea2c1798c3ebfe13fb27e9772b;hb=91bd51ff82e99113860570b519459303802bd98f;hp=1a30fb60693db7683c18efc00b47a642848f1019;hpb=04533b9cf34ce8089113015715083ee9c5b2b001;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index 1a30fb606..76ba43567 100644
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -20,12 +20,12 @@
 #ifndef DCPOMATIC_FFMPEG_CONTENT_H
 #define DCPOMATIC_FFMPEG_CONTENT_H
 
-#include <boost/enable_shared_from_this.hpp>
-#include <boost/lexical_cast.hpp>
 #include "video_content.h"
 #include "audio_content.h"
 #include "subtitle_content.h"
 #include "audio_mapping.h"
+#include <boost/enable_shared_from_this.hpp>
+#include <boost/lexical_cast.hpp>
 
 struct AVFormatContext;
 struct AVStream;
@@ -33,7 +33,7 @@ struct AVStream;
 class Filter;
 class FFmpegSubtitleStream;
 class FFmpegAudioStream;
-class ffmpeg_pts_offset_test;
+struct ffmpeg_pts_offset_test;
 
 class FFmpegContentProperty : public VideoContentProperty
 {
@@ -59,7 +59,6 @@ public:
 	void examine (boost::shared_ptr<Job>);
 	std::string summary () const;
 	std::string technical_summary () const;
-	std::string information () const;
 	void as_xml (xmlpp::Node *) const;
 	DCPTime full_length () const;
 
@@ -74,7 +73,7 @@ public:
 	boost::filesystem::path audio_analysis_path () const;
 
 	/* SubtitleContent */
-	bool has_subtitle_during (ContentTimePeriod) const;
+	bool has_subtitles () const;
 
 	void set_filters (std::vector<Filter const *> const &);
 	
@@ -111,8 +110,10 @@ public:
 		return _first_video;
 	}
 
+	std::list<ContentTimePeriod> subtitles_during (ContentTimePeriod, bool starting) const;
+
 private:
-	friend class ffmpeg_pts_offset_test;
+	friend struct ffmpeg_pts_offset_test;
 	
 	std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams;
 	boost::shared_ptr<FFmpegSubtitleStream> _subtitle_stream;