summaryrefslogtreecommitdiffstats
path: root/demux/demux.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-03-09 23:55:16 +0100
committerwm4 <wm4@nowhere>2016-03-09 23:55:34 +0100
commit953ff6b3908bcfdd69a9189c991e55f362d2d2dc (patch)
treec50f6df2a686154346f3b1455db8a91d69b7b9ec /demux/demux.h
parent7387766445f7aae47a4e8095128ea9b688299091 (diff)
downloadmpv-953ff6b3908bcfdd69a9189c991e55f362d2d2dc.tar.bz2
mpv-953ff6b3908bcfdd69a9189c991e55f362d2d2dc.tar.xz
demux: replace demux_pause/demux_unpause with demux_run_on_thread
This pause stuff is bothersome and is needed only for a few corner- cases. This commit removes it from the demuxer public API and replaces it with a demux_run_on_thread() function and refactors the code which needed demux_pause(). The next commit will change the implementation.
Diffstat (limited to 'demux/demux.h')
-rw-r--r--demux/demux.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/demux/demux.h b/demux/demux.h
index 2c1e3a20fa..a26dada6c8 100644
--- a/demux/demux.h
+++ b/demux/demux.h
@@ -285,8 +285,7 @@ double demuxer_get_time_length(struct demuxer *demuxer);
int demux_stream_control(demuxer_t *demuxer, int ctrl, void *arg);
-void demux_pause(demuxer_t *demuxer);
-void demux_unpause(demuxer_t *demuxer);
+void demux_run_on_thread(struct demuxer *demuxer, void (*fn)(void *), void *ctx);
void demux_changed(demuxer_t *demuxer, int events);
void demux_update(demuxer_t *demuxer);