summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2020-02-18 23:44:46 +0100
committerCarl Hetherington <cth@carlh.net>2020-02-18 23:44:46 +0100
commitde6798c0208e9a6a64b0f8edc54f03b46ced0e22 (patch)
treed42b40cc074ff0041973f5ace27c7a9b3d463f06
parent5aec5373f7d8688646a2faec2107c81af291d0aa (diff)
Report when butler returns no video because it died.
-rw-r--r--src/lib/butler.cc2
-rw-r--r--src/lib/butler.h3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/butler.cc b/src/lib/butler.cc
index fe331fc79..ab3e9b94e 100644
--- 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 8c4d30efe..4d4fa4a09 100644
--- 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);