Various stuff; mostly change to decoder scaling and adding subtitle; scaling test.

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

diff --git a/src/lib/player.h b/src/lib/player.h
index a5fe844f0af88ca76321c5163c8afa5fa18134dc..cce2bdc21a600ac3e61b59e40d997c0d876985bf 100644 (file)
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -62,11 +62,15 @@ public:
 
 private:
 
-       void process_video (boost::weak_ptr<Content>, boost::shared_ptr<const Image>, bool, boost::shared_ptr<Subtitle>, Time);
+       void process_video (boost::weak_ptr<Content>, boost::shared_ptr<const Image>, bool, Time);
        void process_audio (boost::weak_ptr<Content>, boost::shared_ptr<const AudioBuffers>, Time);
        void setup_pieces ();
        void playlist_changed ();
        void content_changed (boost::weak_ptr<Content>, int);
+       void do_seek (Time, bool);
+       void add_black_piece (Time, Time);
+       void add_silent_piece (Time, Time);
+       void flush ();
 
        boost::shared_ptr<const Film> _film;
        boost::shared_ptr<const Playlist> _playlist;
@@ -78,8 +82,6 @@ private:
        /** Our pieces are ready to go; if this is false the pieces must be (re-)created before they are used */
        bool _have_valid_pieces;
        std::list<boost::shared_ptr<Piece> > _pieces;
-
-       /** Time of the earliest thing not yet to have been emitted */
        Time _position;
        AudioBuffers _audio_buffers;
        Time _next_audio;