X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fbutler.h;h=b10c93e7984c5a581615d73ac6ab959a86074c1c;hb=f968fb875135884b0551195edc2315d4be76d5bc;hp=7e97bd3c013cc51327f284c4eeddfa691bb8669f;hpb=984455f1a072b0fa42879d03042e82df0a3cb3bd;p=dcpomatic.git

diff --git a/src/lib/butler.h b/src/lib/butler.h
index 7e97bd3c0..b10c93e79 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>
@@ -42,6 +43,7 @@ public:
 	void seek (DCPTime position, bool accurate);
 	std::pair<boost::shared_ptr<PlayerVideo>, DCPTime> get_video ();
 	boost::optional<DCPTime> get_audio (float* out, Frame frames);
+	boost::optional<std::pair<PlayerText, DCPTimePeriod> > get_closed_caption ();
 
 	void disable_audio ();
 
@@ -51,21 +53,25 @@ private:
 	void thread ();
 	void video (boost::shared_ptr<PlayerVideo> video, DCPTime time);
 	void audio (boost::shared_ptr<AudioBuffers> audio, DCPTime time);
+	void text (PlayerText pt, TextType type, DCPTimePeriod period);
 	bool should_run () const;
 	void prepare (boost::weak_ptr<PlayerVideo> video) const;
-	void player_changed ();
+	void player_change (ChangeType type, bool frequent);
 	void seek_unlocked (DCPTime position, bool accurate);
 
 	boost::shared_ptr<Player> _player;
 	boost::shared_ptr<Log> _log;
 	boost::thread* _thread;
 
-	/** mutex to protect _video and _audio for when we are clearing them and they both need to be
-	    cleared together without any data being inserted in the interim.
+	/** 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 _video_audio_mutex;
+	boost::mutex _buffers_mutex;
 	VideoRingBuffers _video;
 	AudioRingBuffers _audio;
+	TextRingBuffers _closed_caption;
 
 	boost::thread_group _prepare_pool;
 	boost::asio::io_service _prepare_service;
@@ -77,6 +83,7 @@ private:
 	boost::condition _arrived;
 	boost::optional<DCPTime> _pending_seek_position;
 	bool _pending_seek_accurate;
+	int _suspended;
 	bool _finished;
 	bool _died;
 	bool _stop_thread;
@@ -93,5 +100,6 @@ private:
 
 	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;
 };