path: root/input
diff options
authorwm4 <wm4@nowhere>2014-04-25 19:12:24 +0200
committerwm4 <wm4@nowhere>2014-04-25 19:12:24 +0200
commite0cf983e53afa6a524821265c7547c11f5c79551 (patch)
tree4ea1c5f0b17464e6b503c23be14b935cba0090d4 /input
parent3d51ef3dc83ea59a47c0eccf4ae93ae2a441ceb7 (diff)
stream: remove interrupt callback global variables
This used global variables for the asynchronous interrupt callback. Pick the simple and dumb solution and stuff the callback into mpv_global. Do this because interrupt checking should also work in the connect phase, and currently stream creation equates connecting. Ideally, this would be passed to the stream on creation instead, or connecting would be separated from creation. But since I don't know yet which is better, and since moving stream/demuxer into their own thread is something that will happen later, go with the mpv_global solution.
Diffstat (limited to 'input')
2 files changed, 3 insertions, 6 deletions
diff --git a/input/input.c b/input/input.c
index 5245fd8b63..3ab6089de3 100644
--- a/input/input.c
+++ b/input/input.c
@@ -1640,15 +1640,12 @@ static bool test_abort(struct input_ctx *ictx)
return false;
- * \param time time to wait for an interruption in milliseconds
- */
-int mp_input_check_interrupt(struct input_ctx *ictx, int time)
+bool mp_input_check_interrupt(struct input_ctx *ictx)
bool res = test_abort(ictx);
if (!res) {
- read_events(ictx, time);
+ read_events(ictx, 0);
res = test_abort(ictx);
diff --git a/input/input.h b/input/input.h
index 512d0457bf..8f46b0fd9a 100644
--- a/input/input.h
+++ b/input/input.h
@@ -209,7 +209,7 @@ void mp_input_wakeup(struct input_ctx *ictx);
void mp_input_wakeup_nolock(struct input_ctx *ictx);
// Interruptible usleep: (used by demux)
-int mp_input_check_interrupt(struct input_ctx *ictx, int time);
+bool mp_input_check_interrupt(struct input_ctx *ictx);
// If this returns true, use Right Alt key as Alt Gr to produce special
// characters. If false, count Right Alt as the modifier Alt key.