summaryrefslogtreecommitdiff
path: root/src/lib/butler.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-10-11 12:27:22 +0200
committerCarl Hetherington <cth@carlh.net>2021-10-11 12:34:39 +0200
commit3fecd33dc2fd14ed487cb14bf9647ee5c0572868 (patch)
tree2c87c46c32772a5118c63abf0f43aacbd2d015a8 /src/lib/butler.cc
parent805d4a48fa6e4d8e28fd582a2ae6ba78b8343144 (diff)
Cleanup: use enum class.
Diffstat (limited to 'src/lib/butler.cc')
-rw-r--r--src/lib/butler.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/butler.cc b/src/lib/butler.cc
index 5a5cc4912..6f7349b5f 100644
--- a/src/lib/butler.cc
+++ b/src/lib/butler.cc
@@ -250,10 +250,10 @@ Butler::get_video (bool blocking, Error* e)
auto setup_error = [this](Error* e, Error::Code fallback) {
if (e) {
if (_died) {
- e->code = Error::DIED;
+ e->code = Error::Code::DIED;
e->message = _died_message;
} else if (_finished) {
- e->code = Error::FINISHED;
+ e->code = Error::Code::FINISHED;
} else {
e->code = fallback;
}
@@ -261,7 +261,7 @@ Butler::get_video (bool blocking, Error* e)
};
if (_video.empty() && (_finished || _died || (_suspended && !blocking))) {
- setup_error (e, Error::AGAIN);
+ setup_error (e, Error::Code::AGAIN);
return make_pair(shared_ptr<PlayerVideo>(), DCPTime());
}
@@ -271,7 +271,7 @@ Butler::get_video (bool blocking, Error* e)
}
if (_video.empty()) {
- setup_error (e, Error::NONE);
+ setup_error (e, Error::Code::NONE);
return make_pair(shared_ptr<PlayerVideo>(), DCPTime());
}
@@ -467,13 +467,13 @@ Butler::Error::summary () const
{
switch (code)
{
- case Error::NONE:
+ case Error::Code::NONE:
return "No error registered";
- case Error::AGAIN:
+ case Error::Code::AGAIN:
return "Butler not ready";
- case Error::DIED:
+ case Error::Code::DIED:
return String::compose("Butler died (%1)", message);
- case Error::FINISHED:
+ case Error::Code::FINISHED:
return "Butler finished";
}