projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Report better errors when the butler dies.
[dcpomatic.git]
/
src
/
wx
/
video_view.cc
diff --git
a/src/wx/video_view.cc
b/src/wx/video_view.cc
index b0e16737c9c91ebbe88c4b4c8777869c1c0aef9d..7eea4b786fba72917e3f9285997767545e88ea74 100644
(file)
--- a/
src/wx/video_view.cc
+++ b/
src/wx/video_view.cc
@@
-22,6
+22,7
@@
#include "wx_util.h"
#include "film_viewer.h"
#include "lib/butler.h"
#include "wx_util.h"
#include "film_viewer.h"
#include "lib/butler.h"
+#include "lib/dcpomatic_log.h"
#include <boost/optional.hpp>
using std::pair;
#include <boost/optional.hpp>
using std::pair;
@@
-74,7
+75,10
@@
VideoView::get_next_frame (bool non_blocking)
do {
Butler::Error e;
pair<shared_ptr<PlayerVideo>, dcpomatic::DCPTime> pv = butler->get_video (!non_blocking, &e);
do {
Butler::Error e;
pair<shared_ptr<PlayerVideo>, dcpomatic::DCPTime> pv = butler->get_video (!non_blocking, &e);
- if (!pv.first && e == Butler::AGAIN) {
+ if (e.code == Butler::Error::DIED) {
+ LOG_ERROR ("Butler died with %1", e.summary());
+ }
+ if (!pv.first && e.code == Butler::Error::AGAIN) {
return false;
}
_player_video = pv;
return false;
}
_player_video = pv;