diff options
author | wm4 <wm4@nowhere> | 2018-05-18 22:19:10 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2018-05-24 19:56:35 +0200 |
commit | 76dc5d9aa92f5c91c728004214f7b08c3a85a5f6 (patch) | |
tree | 5e7514e6376067c98645b921eb698381aa496b0b /common/playlist.h | |
parent | 12d1404b04e90f5357882e5c1048d92305248cb9 (diff) | |
download | mpv-76dc5d9aa92f5c91c728004214f7b08c3a85a5f6.tar.bz2 mpv-76dc5d9aa92f5c91c728004214f7b08c3a85a5f6.tar.xz |
command: make loadlist command async and abortable
Don't allow it to freeze everything when loading a playlist from network
(although you definitely shouldn't do that, but whatever).
This also affects the really obscure --ordered-chapters-files option.
The --playlist option on the other hand has no choice but to freeze the
shit, because there's no concept of aborting the player during command
line parsing.
Diffstat (limited to 'common/playlist.h')
-rw-r--r-- | common/playlist.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/common/playlist.h b/common/playlist.h index d35fff6df3..a37c516519 100644 --- a/common/playlist.h +++ b/common/playlist.h @@ -101,8 +101,10 @@ int playlist_entry_to_index(struct playlist *pl, struct playlist_entry *e); int playlist_entry_count(struct playlist *pl); struct playlist_entry *playlist_entry_from_index(struct playlist *pl, int index); +struct mp_cancel; struct mpv_global; -struct playlist *playlist_parse_file(const char *file, struct mpv_global *global); +struct playlist *playlist_parse_file(const char *file, struct mp_cancel *cancel, + struct mpv_global *global); void playlist_entry_unref(struct playlist_entry *e); |