X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_decoder.h;h=9f85c2dca8e5e2d9fc66045cd694dab07c12fb90;hb=c39979ef676b49e97129c5f29c2e2c700fdc1d3a;hp=2cda8f89d5b6263db0600454369d7732cd893c1f;hpb=7f2e74604a51b984e4c8cbb5d5f4bb642677ec00;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 2cda8f89d..9f85c2dca 100644
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -48,17 +48,14 @@ class FFmpegDecoder : public VideoDecoder, public AudioDecoder, public SubtitleD
 {
 public:
 	FFmpegDecoder (boost::shared_ptr<const FFmpegContent>, boost::shared_ptr<Log>);
-	~FFmpegDecoder ();
 
 private:
-	friend class ::ffmpeg_pts_offset_test;
+	friend struct ::ffmpeg_pts_offset_test;
 
 	void seek (ContentTime time, bool);
 	bool pass ();
 	void flush ();
 
-	void setup_subtitle ();
-
 	AVSampleFormat audio_sample_format () const;
 	int bytes_per_audio_sample () const;
 
@@ -69,14 +66,9 @@ private:
 	void maybe_add_subtitle ();
 	boost::shared_ptr<AudioBuffers> deinterleave_audio (uint8_t** data, int size);
 
-	bool seek_overrun_finished (ContentTime, boost::optional<ContentTime>, boost::optional<ContentTime>) const;
-	bool seek_final_finished (int, int) const;
-	int minimal_run (boost::function<bool (boost::optional<ContentTime>, boost::optional<ContentTime>, int)>);
-	void seek_and_flush (ContentTime);
-
+	std::list<ContentTimePeriod> subtitles_during (ContentTimePeriod, bool starting) const;
+	
 	boost::shared_ptr<Log> _log;
-	AVCodecContext* _subtitle_codec_context; ///< may be 0 if there is no subtitle
-	AVCodec* _subtitle_codec;		 ///< may be 0 if there is no subtitle
 	
 	std::list<boost::shared_ptr<FilterGraph> > _filter_graphs;
 	boost::mutex _filter_graphs_mutex;