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;
}
};
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());
}
}
if (_video.empty()) {
- setup_error (e, Error::NONE);
+ setup_error (e, Error::Code::NONE);
return make_pair(shared_ptr<PlayerVideo>(), DCPTime());
}
{
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";
}
do {
Butler::Error e;
auto pv = butler->get_video (!non_blocking, &e);
- if (e.code == Butler::Error::DIED) {
+ if (e.code == Butler::Error::Code::DIED) {
LOG_ERROR ("Butler died with %1", e.summary());
}
if (!pv.first) {
- return e.code == Butler::Error::AGAIN ? AGAIN : FAIL;
+ return e.code == Butler::Error::Code::AGAIN ? AGAIN : FAIL;
}
_player_video = pv;
} while (