Fix crashes on x-thread signal emission.

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

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index b5bcdd35800fbaa07a0556ce00c082f8e4964e91..616fa88dd42f3f40f3ab993785ef89fe89a0e075 100644 (file)
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -53,8 +53,8 @@ public:
 private:
        friend struct ::ffmpeg_pts_offset_test;
 
+       bool pass (PassReason reason);
        void seek (ContentTime time, bool);
-       bool pass ();
        void flush ();
 
        AVSampleFormat audio_sample_format () const;
@@ -67,10 +67,6 @@ private:
        void maybe_add_subtitle ();
        boost::shared_ptr<AudioBuffers> deinterleave_audio (uint8_t** data, int size);
 
-       boost::optional<ContentTime> _pending_subtitle_from;
-       boost::shared_ptr<Image> _pending_subtitle_image;
-       boost::optional<dcpomatic::Rect<double> > _pending_subtitle_rect;
-
        std::list<ContentTimePeriod> image_subtitles_during (ContentTimePeriod, bool starting) const;
        std::list<ContentTimePeriod> text_subtitles_during (ContentTimePeriod, bool starting) const;