diff options
author | wm4 <wm4@nowhere> | 2018-05-17 20:58:49 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2018-05-24 19:56:35 +0200 |
commit | 31b78ad7fa97d8047b609c1647a273e72612d425 (patch) | |
tree | d6a5e960ac431eef46d01b440fd504b1ac1f1159 /stream/stream.h | |
parent | 12bd4fe9abce797a3c98dc437579b163e0a8162a (diff) | |
download | mpv-31b78ad7fa97d8047b609c1647a273e72612d425.tar.bz2 mpv-31b78ad7fa97d8047b609c1647a273e72612d425.tar.xz |
misc: move mp_cancel from stream.c to thread_tools.c
It seems a bit inappropriate to have dumped this into stream.c, even if
it's roughly speaking its main user. At least it made its way somewhat
unfortunately to other components not related to the stream or demuxer
layer at all.
I'm too greedy to give this weird helper its own file, so dump it into
thread_tools.c.
Probably a somewhat pointless change.
Diffstat (limited to 'stream/stream.h')
-rw-r--r-- | stream/stream.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/stream/stream.h b/stream/stream.h index 3ce74ecd15..863c0cfd3c 100644 --- a/stream/stream.h +++ b/stream/stream.h @@ -254,14 +254,6 @@ stream_t *open_memory_stream(void *data, int len); void mp_url_unescape_inplace(char *buf); char *mp_url_escape(void *talloc_ctx, const char *s, const char *ok); -struct mp_cancel *mp_cancel_new(void *talloc_ctx); -void mp_cancel_trigger(struct mp_cancel *c); -bool mp_cancel_test(struct mp_cancel *c); -bool mp_cancel_wait(struct mp_cancel *c, double timeout); -void mp_cancel_reset(struct mp_cancel *c); -void *mp_cancel_get_event(struct mp_cancel *c); // win32 HANDLE -int mp_cancel_get_fd(struct mp_cancel *c); - // stream_file.c char *mp_file_url_to_filename(void *talloc_ctx, bstr url); char *mp_file_get_path(void *talloc_ctx, bstr url); |