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 cdedf1676eca8d46be8745e29a5aac332d4a8d33..cce2bdc21a600ac3e61b59e40d997c0d876985bf 100644 (file)
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -62,7 +62,7 @@ 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 ();
@@ -70,6 +70,7 @@ private:
        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;