Fix tests.

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

diff --git a/src/lib/player.h b/src/lib/player.h
index 4d23d1951ab53b9256b4e471bc9080f93229ba07..e4fb832209025117a3f5c02414a3d429bf62bc5a 100644 (file)
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */
-
 /*
     Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
 
@@ -49,41 +47,44 @@ public:
 
        void disable_video ();
        void disable_audio ();
-       void disable_subtitles ();
 
        bool pass ();
        void seek (Time);
        void seek_back ();
        void seek_forward ();
 
+       /** @return position that we are at; ie the time of the next thing we will emit on pass() */
        Time position () const {
                return _position;
        }
 
+       void set_video_container_size (libdcp::Size);
+
 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;
        
        bool _video;
        bool _audio;
-       bool _subtitles;
 
        /** 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;
+       boost::optional<libdcp::Size> _video_container_size;
 };
 
 #endif