path: root/common
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 /common
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 'common')
1 files changed, 3 insertions, 0 deletions
diff --git a/common/global.h b/common/global.h
index 546c585294..e49169bebb 100644
--- a/common/global.h
+++ b/common/global.h
@@ -7,6 +7,9 @@
struct mpv_global {
struct MPOpts *opts;
struct mp_log *log;
+ int (*stream_interrupt_cb)(void *ctx);
+ void *stream_interrupt_cb_ctx;