Reinstate subtitle list view.

[dcpomatic.git] / src / lib / ffmpeg_decoder.h

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index d6f50cd43511769d2089e79654bcd8d22aa18aa5..65e4cf46afc6ff6ba9ea87a7dcdcc3264acc808a 100644 (file)
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -46,13 +46,13 @@ class FFmpegDecoder : public FFmpeg, public Decoder
 public:
        FFmpegDecoder (boost::shared_ptr<const FFmpegContent>, boost::shared_ptr<Log>);
 
+       bool pass ();
+       void seek (ContentTime time, bool);
+
 private:
        friend struct ::ffmpeg_pts_offset_test;
 
-       bool pass (PassReason, bool accurate);
-       void seek (ContentTime time, bool);
        void flush ();
-       void update_position (boost::optional<ContentTime>& current, ContentTime p);
 
        AVSampleFormat audio_sample_format (boost::shared_ptr<FFmpegAudioStream> stream) const;
        int bytes_per_audio_sample (boost::shared_ptr<FFmpegAudioStream> stream) const;
@@ -67,9 +67,6 @@ private:
        void maybe_add_subtitle ();
        boost::shared_ptr<AudioBuffers> deinterleave_audio (boost::shared_ptr<FFmpegAudioStream> stream) const;
 
-       std::list<ContentTimePeriod> image_subtitles_during (ContentTimePeriod, bool starting) const;
-       std::list<ContentTimePeriod> text_subtitles_during (ContentTimePeriod, bool starting) const;
-
        boost::shared_ptr<Log> _log;
 
        std::list<boost::shared_ptr<VideoFilterGraph> > _filter_graphs;