diff options
Diffstat (limited to 'src/lib/butler.cc')
| -rw-r--r-- | src/lib/butler.cc | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/lib/butler.cc b/src/lib/butler.cc index a127ee9bd..3e408c4d5 100644 --- a/src/lib/butler.cc +++ b/src/lib/butler.cc @@ -190,17 +190,27 @@ try } pair<shared_ptr<PlayerVideo>, DCPTime> -Butler::get_video () +Butler::get_video (Error* e) { boost::mutex::scoped_lock lm (_mutex); + if (_suspended) { + if (e) { + *e = AGAIN; + } + return make_pair(shared_ptr<PlayerVideo>(), DCPTime()); + } + /* Wait for data if we have none */ while (_video.empty() && !_finished && !_died) { _arrived.wait (lm); } if (_video.empty()) { - return make_pair (shared_ptr<PlayerVideo>(), DCPTime()); + if (e) { + *e = NONE; + } + return make_pair(shared_ptr<PlayerVideo>(), DCPTime()); } pair<shared_ptr<PlayerVideo>, DCPTime> const r = _video.get (); |