From de6798c0208e9a6a64b0f8edc54f03b46ced0e22 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 18 Feb 2020 23:44:46 +0100 Subject: [PATCH] Report when butler returns no video because it died. --- src/lib/butler.cc | 2 +- src/lib/butler.h | 3 ++- 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(), 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, DCPTime> get_video (Error* e = 0); -- 2.30.2