Give Butler a weak_ptr<Film>

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

diff --git a/src/lib/butler.h b/src/lib/butler.h
index ea43374434f033a5becfebc13f2fce09a6436d5c..1fe05742f107821e65c63ab34650849e3f883c60 100644 (file)
--- a/src/lib/butler.h
+++ b/src/lib/butler.h
@@ -37,10 +37,12 @@ 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,
                boost::function<AVPixelFormat (AVPixelFormat)> pixel_format,
+               VideoRange video_range,
                bool aligned,
                bool fast
                );
@@ -49,9 +51,23 @@ public:
 
        void seek (dcpomatic::DCPTime position, bool accurate);
 
-       enum Error {
-               NONE,
-               AGAIN
+       class Error {
+       public:
+               enum Code{
+                       NONE,
+                       AGAIN,
+                       DIED,
+                       FINISHED
+               };
+
+               Error()
+                       : code (NONE)
+               {}
+
+               Code code;
+               std::string message;
+
+               std::string summary () const;
        };
 
        std::pair<boost::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> get_video (bool blocking, Error* e = 0);
@@ -72,8 +88,9 @@ private:
        void player_change (ChangeType type);
        void seek_unlocked (dcpomatic::DCPTime position, bool accurate);
 
+       boost::weak_ptr<const Film> _film;
        boost::shared_ptr<Player> _player;
-       boost::thread* _thread;
+       boost::thread _thread;
 
        VideoRingBuffers _video;
        AudioRingBuffers _audio;
@@ -83,7 +100,7 @@ private:
        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 */
+       /** mutex to protect _pending_seek_position, _pending_seek_accurate, _finished, _died, _stop_thread */
        boost::mutex _mutex;
        boost::condition _summon;
        boost::condition _arrived;
@@ -92,6 +109,7 @@ private:
        int _suspended;
        bool _finished;
        bool _died;
+       std::string _died_message;
        bool _stop_thread;
 
        AudioMapping _audio_mapping;
@@ -100,6 +118,7 @@ private:
        bool _disable_audio;
 
        boost::function<AVPixelFormat (AVPixelFormat)> _pixel_format;
+       VideoRange _video_range;
        bool _aligned;
        bool _fast;