projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add button to send test emails in the mail server prefs (#2216).
[dcpomatic.git]
/
src
/
wx
/
video_view.cc
diff --git
a/src/wx/video_view.cc
b/src/wx/video_view.cc
index 1d10beb30b7bd74255ea2e63153c311e12b11bef..1c645f11f688bd6adab4924c07ad9b0fcd25811c 100644
(file)
--- a/
src/wx/video_view.cc
+++ b/
src/wx/video_view.cc
@@
-75,12
+75,12
@@
VideoView::get_next_frame (bool non_blocking)
do {
Butler::Error e;
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) {
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 (
}
_player_video = pv;
} while (