Report when butler returns no video because it died.

diff --git a/src/lib/butler.cc b/src/lib/butler.cc
index fe331fc79dca1609f9ba5ddacd23a20595bf0f94..ab3e9b94ebf6221780619cdacbf7cf123b31550f 100644 (file)
--- a/src/lib/butler.cc
+++ b/src/lib/butler.cc
@@ -234,7 +234,7 @@ Butler::get_video (Error* e)
 
        if (_video.empty()) {
                if (e) {
-                       *e = NONE;
+                       *e = _died ? DIED : NONE;
                }
                return make_pair(shared_ptr<PlayerVideo>(), DCPTime());
        }

diff --git a/src/lib/butler.h b/src/lib/butler.h
index 8c4d30efefbad224ce47731c353791511296160d..4d4fa4a0939d86186e54c2488e9478fa4f29baeb 100644 (file)
--- a/src/lib/butler.h
+++ b/src/lib/butler.h
@@ -51,7 +51,8 @@ public:
 
        enum Error {
                NONE,
-               AGAIN
+               AGAIN,
+               DIED
        };
 
        std::pair<boost::shared_ptr<PlayerVideo>, DCPTime> get_video (Error* e = 0);