Improve butler error reporting during export.

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

diff --git a/src/lib/butler.h b/src/lib/butler.h
index ea43374434f033a5becfebc13f2fce09a6436d5c..6263d61431d6e9fff81d7886d5e134d3a1a00c18 100644 (file)
--- a/src/lib/butler.h
+++ b/src/lib/butler.h
@@ -51,7 +51,9 @@ public:
 
        enum Error {
                NONE,
-               AGAIN
+               AGAIN,
+               DIED,
+               FINISHED
        };
 
        std::pair<boost::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> get_video (bool blocking, Error* e = 0);
@@ -73,7 +75,7 @@ private:
        void seek_unlocked (dcpomatic::DCPTime position, bool accurate);
 
        boost::shared_ptr<Player> _player;
-       boost::thread* _thread;
+       boost::thread _thread;
 
        VideoRingBuffers _video;
        AudioRingBuffers _audio;
@@ -83,7 +85,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;