Merge remote-tracking branch 'origin/master' into 2.0

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

diff --git a/src/lib/player.h b/src/lib/player.h
index 0c58af44503c7588e20db0eeab0c62418f88f705..a3b745c8e4ca69acd641cb106be7b733ca19e7da 100644 (file)
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -88,7 +88,7 @@ public:
 
        std::list<boost::shared_ptr<PlayerVideo> > get_video (DCPTime time, bool accurate);
        boost::shared_ptr<AudioBuffers> get_audio (DCPTime time, DCPTime length, bool accurate);
-       PlayerSubtitles get_subtitles (DCPTime time, DCPTime length);
+       PlayerSubtitles get_subtitles (DCPTime time, DCPTime length, bool starting);
 
        void set_video_container_size (dcp::Size);
        void set_approximate_size ();
@@ -106,7 +106,7 @@ public:
 private:
        friend class PlayerWrapper;
        friend class Piece;
-       friend class player_overlaps_test;
+       friend struct player_overlaps_test;
 
        void setup_pieces ();
        void playlist_changed ();