X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fbutler.h;h=a61011f4019fa1ddcc5e6e01f184a9e9011a3fb0;hb=c463929602252be95ca340b477b7f3b42ff6b0c0;hp=948a78ea5f64d79dfa82c9ddc864f48b56556927;hpb=565a0ab9fc8be5c21685b019aa06d37e6c66160c;p=dcpomatic.git

diff --git a/src/lib/butler.h b/src/lib/butler.h
index 948a78ea5..a61011f40 100644
--- a/src/lib/butler.h
+++ b/src/lib/butler.h
@@ -27,52 +27,59 @@
 #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);
+	bool get_audio (float* out, Frame frames);
 
 	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, DCPTime time);
-	void player_changed ();
+	void audio (boost::shared_ptr<AudioBuffers> audio);
 	bool should_run () const;
+	void prepare (boost::weak_ptr<PlayerVideo> video) const;
 
-	boost::weak_ptr<const Film> _film;
 	boost::shared_ptr<Player> _player;
+	boost::shared_ptr<Log> _log;
 	boost::thread* _thread;
 
 	VideoRingBuffers _video;
 	AudioRingBuffers _audio;
 
+	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;
 	boost::condition _summon;
 	boost::condition _arrived;
 	boost::optional<DCPTime> _pending_seek_position;
 	bool _pending_seek_accurate;
-
 	bool _finished;
+	bool _died;
+	bool _stop_thread;
 
 	AudioMapping _audio_mapping;
 	int _audio_channels;
 
-	bool _stop_thread;
 	bool _disable_audio;
 
 	boost::signals2::scoped_connection _player_video_connection;
 	boost::signals2::scoped_connection _player_audio_connection;
-	boost::signals2::scoped_connection _player_changed_connection;
 };