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

1 files changed, 2 insertions, 1 deletions

diff --git a/src/lib/player.h b/src/lib/player.h
index cdedf1676..cce2bdc21 100644
--- 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;