X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fbutler.h;h=fb133d10809413298364faba4e02a8d62c42c5b1;hb=5302f2cda0afd16d714ab898549c7cd278196473;hp=f68504f0e5cdb2e19384a5b34c3ea83e7b092789;hpb=2b1f8bb12adc35dcd7f352885cb0f9a80b04093e;p=dcpomatic.git

diff --git a/src/lib/butler.h b/src/lib/butler.h
index f68504f0e..fb133d108 100644
--- a/src/lib/butler.h
+++ b/src/lib/butler.h
@@ -20,6 +20,7 @@
 
 #include "video_ring_buffers.h"
 #include "audio_ring_buffers.h"
+#include "text_ring_buffers.h"
 #include "audio_mapping.h"
 #include "exception_store.h"
 #include <boost/shared_ptr.hpp>
@@ -27,36 +28,60 @@
 #include <boost/thread.hpp>
 #include <boost/thread/condition.hpp>
 #include <boost/signals2.hpp>
+#include <boost/asio.hpp>
 
-class Film;
 class Player;
 class PlayerVideo;
+class Log;
 
 class Butler : public ExceptionStore, public boost::noncopyable
 {
 public:
-	Butler (boost::weak_ptr<const Film> film, boost::shared_ptr<Player> player, AudioMapping map, int audio_channels);
+	Butler (boost::shared_ptr<Player> player, boost::shared_ptr<Log> log, AudioMapping map, int audio_channels);
 	~Butler ();
 
 	void seek (DCPTime position, bool accurate);
-	std::pair<boost::shared_ptr<PlayerVideo>, DCPTime> get_video ();
-	void get_audio (float* out, Frame frames);
+
+	enum Error {
+		NONE,
+		AGAIN
+	};
+
+	std::pair<boost::shared_ptr<PlayerVideo>, DCPTime> get_video (Error* e = 0);
+	boost::optional<DCPTime> get_audio (float* out, Frame frames);
+	boost::optional<TextRingBuffers::Data> get_closed_caption ();
 
 	void disable_audio ();
 
+	std::pair<size_t, std::string> memory_used () const;
+
 private:
 	void thread ();
 	void video (boost::shared_ptr<PlayerVideo> video, DCPTime time);
-	void audio (boost::shared_ptr<AudioBuffers> audio);
-	void player_changed ();
+	void audio (boost::shared_ptr<AudioBuffers> audio, DCPTime time);
+	void text (PlayerText pt, TextType type, boost::optional<DCPTextTrack> track, DCPTimePeriod period);
 	bool should_run () const;
+	void prepare (boost::weak_ptr<PlayerVideo> video) const;
+	void player_change (ChangeType type, bool frequent);
+	void seek_unlocked (DCPTime position, bool accurate);
 
-	boost::weak_ptr<const Film> _film;
 	boost::shared_ptr<Player> _player;
+	boost::shared_ptr<Log> _log;
 	boost::thread* _thread;
 
+	/** mutex to protect _video, _audio and _closed_caption for when we are clearing them and they all need to be
+	    cleared together without any data being inserted in the interim;
+	    XXX: is this necessary now that all butler output data is timestamped? Perhaps the locked clear-out
+	    is only required if we guarantee that get_video() and get_audio() calls are in sync.
+	*/
+	boost::mutex _buffers_mutex;
 	VideoRingBuffers _video;
 	AudioRingBuffers _audio;
+	TextRingBuffers _closed_caption;
+
+	boost::thread_group _prepare_pool;
+	boost::asio::io_service _prepare_service;
+	boost::shared_ptr<boost::asio::io_service::work> _prepare_work;
 
 	/** mutex to protect _pending_seek_position, _pending_seek_acurate, _finished, _died, _stop_thread */
 	boost::mutex _mutex;
@@ -64,6 +89,7 @@ private:
 	boost::condition _arrived;
 	boost::optional<DCPTime> _pending_seek_position;
 	bool _pending_seek_accurate;
+	int _suspended;
 	bool _finished;
 	bool _died;
 	bool _stop_thread;
@@ -73,7 +99,13 @@ private:
 
 	bool _disable_audio;
 
+	/** If we are waiting to be refilled following a seek, this is the time we were
+	    seeking to.
+	*/
+	boost::optional<DCPTime> _awaiting;
+
 	boost::signals2::scoped_connection _player_video_connection;
 	boost::signals2::scoped_connection _player_audio_connection;
-	boost::signals2::scoped_connection _player_changed_connection;
+	boost::signals2::scoped_connection _player_text_connection;
+	boost::signals2::scoped_connection _player_change_connection;
 };