Multi-threaded decode of DCP when previewing.

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

diff --git a/src/lib/butler.h b/src/lib/butler.h
index c2c5d8ca5e990a75c8516992b0bf0fc6f6371505..1e8947f9d2d554f4e58af0bdc4f6cdef0474e77a 100644 (file)
--- a/src/lib/butler.h
+++ b/src/lib/butler.h
@@ -27,6 +27,7 @@
 #include <boost/thread.hpp>
 #include <boost/thread/condition.hpp>
 #include <boost/signals2.hpp>
+#include <boost/asio.hpp>
 
 class Film;
 class Player;
@@ -40,16 +41,17 @@ public:
 
        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 ();
 
 private:
        void thread ();
        void video (boost::shared_ptr<PlayerVideo> video, DCPTime time);
-       void audio (boost::shared_ptr<AudioBuffers> audio, DCPTime time);
+       void audio (boost::shared_ptr<AudioBuffers> audio);
        void player_changed ();
        bool should_run () const;
+       void prepare (boost::weak_ptr<PlayerVideo> video) const;
 
        boost::weak_ptr<const Film> _film;
        boost::shared_ptr<Player> _player;
@@ -58,6 +60,10 @@ private:
        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;