From 76dc5d9aa92f5c91c728004214f7b08c3a85a5f6 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 18 May 2018 22:19:10 +0200 Subject: 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. --- common/playlist.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'common/playlist.h') 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); -- cgit v1.2.3