Make terminate_threads() less likely to leave _threads containing invalid pointers.

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

diff --git a/src/lib/player.h b/src/lib/player.h
index 1658207996c2a903020bac44844eaf5d8b0546e8..8a81146c9547fb7d7612dc59e38d3f1b0d289880 100644 (file)
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -90,16 +90,13 @@ public:
 
        boost::signals2::signal<void (ChangeType, int, bool)> Change;
 
-       /** The change suggested by a MayChange did not happen */
-       boost::signals2::signal<void ()> NotChanged;
-
        /** Emitted when a video frame is ready.  These emissions happen in the correct order. */
        boost::signals2::signal<void (boost::shared_ptr<PlayerVideo>, DCPTime)> Video;
-       boost::signals2::signal<void (boost::shared_ptr<AudioBuffers>, DCPTime)> Audio;
+       boost::signals2::signal<void (boost::shared_ptr<AudioBuffers>, DCPTime, int)> Audio;
        /** Emitted when a text is ready.  This signal may be emitted considerably
         *  after the corresponding Video.
         */
-       boost::signals2::signal<void (PlayerText, TextType, DCPTimePeriod)> Text;
+       boost::signals2::signal<void (PlayerText, TextType, boost::optional<DCPTextTrack>, DCPTimePeriod)> Text;
 
 private:
        friend class PlayerWrapper;
@@ -108,14 +105,15 @@ private:
        friend struct player_time_calculation_test2;
        friend struct player_time_calculation_test3;
        friend struct player_subframe_test;
+       friend struct empty_test1;
+       friend struct empty_test2;
 
        void setup_pieces ();
        void setup_pieces_unlocked ();
        void flush ();
-       void film_changed (Film::Property);
+       void film_change (ChangeType, Film::Property);
        void playlist_change (ChangeType);
        void playlist_content_change (ChangeType, int, bool);
-       std::list<PositionImage> transform_bitmap_texts (std::list<BitmapText>) const;
        Frame dcp_to_content_video (boost::shared_ptr<const Piece> piece, DCPTime t) const;
        DCPTime content_video_to_dcp (boost::shared_ptr<const Piece> piece, Frame f) const;
        Frame dcp_to_resampled_audio (boost::shared_ptr<const Piece> piece, DCPTime t) const;
@@ -127,7 +125,7 @@ private:
        void audio (boost::weak_ptr<Piece>, AudioStreamPtr, ContentAudio);
        void bitmap_text_start (boost::weak_ptr<Piece>, boost::weak_ptr<const TextContent>, ContentBitmapText);
        void plain_text_start (boost::weak_ptr<Piece>, boost::weak_ptr<const TextContent>, ContentStringText);
-       void subtitle_stop (boost::weak_ptr<Piece>, boost::weak_ptr<const TextContent>, ContentTime, TextType);
+       void subtitle_stop (boost::weak_ptr<Piece>, boost::weak_ptr<const TextContent>, ContentTime);
        DCPTime one_video_frame () const;
        void fill_audio (DCPTimePeriod period);
        std::pair<boost::shared_ptr<AudioBuffers>, DCPTime> discard_audio (
@@ -147,7 +145,7 @@ private:
        boost::shared_ptr<const Film> _film;
        boost::shared_ptr<const Playlist> _playlist;
 
-       /** true if we are suspended (i.e. pass() and seek() do nothing */
+       /** true if we are suspended (i.e. pass() and seek() do nothing) */
        bool _suspended;
        std::list<boost::shared_ptr<Piece> > _pieces;