summaryrefslogtreecommitdiff
path: root/src/lib/butler.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-09-04 12:50:25 +0100
committerCarl Hetherington <cth@carlh.net>2018-09-04 12:50:25 +0100
commita57717d54c34096d80a467ad78e9fdcecca70b2c (patch)
treeaee991e62c82443d7c2d780ce6cb7debe79ee1bc /src/lib/butler.h
parent1938b1b08d38fc199717d1875a61ef05e5b965de (diff)
Allow the butler to say "try again later" when get_video() is called
while it's suspended. Then make the GUI follow that suggestion. Should
Diffstat (limited to 'src/lib/butler.h')
-rw-r--r--src/lib/butler.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/lib/butler.h b/src/lib/butler.h
index 4322c401d..fb133d108 100644
--- a/src/lib/butler.h
+++ b/src/lib/butler.h
@@ -41,7 +41,13 @@ public:
~Butler ();
void seek (DCPTime position, bool accurate);
- std::pair<boost::shared_ptr<PlayerVideo>, DCPTime> get_video ();
+
+ enum Error {
+ NONE,
+ AGAIN
+ };
+
+ std::pair<boost::shared_ptr<PlayerVideo>, DCPTime> get_video (Error* e = 0);
boost::optional<DCPTime> get_audio (float* out, Frame frames);
boost::optional<TextRingBuffers::Data> get_closed_caption ();