#include <sys/time.h>
-using std::pair;
using std::shared_ptr;
using boost::optional;
do {
Butler::Error e;
- auto pv = butler->get_video (!non_blocking, &e);
- if (e.code == Butler::Error::DIED) {
+ auto pv = butler->get_video (non_blocking ? Butler::Behaviour::NON_BLOCKING : Butler::Behaviour::BLOCKING, &e);
+ 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 (