diff options
author | wm4 <wm4@nowhere> | 2014-09-09 00:38:38 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-09-09 01:23:10 +0200 |
commit | c0fbab7a7cfcca8c1fa6ac5ea532924b35938923 (patch) | |
tree | 12830798510d03bbdef2c8663a7a1c63c92619ad /common/playlist.h | |
parent | 9cb1e2c58ca21f12b65167eb8a3640bda8eadfd5 (diff) | |
download | mpv-c0fbab7a7cfcca8c1fa6ac5ea532924b35938923.tar.bz2 mpv-c0fbab7a7cfcca8c1fa6ac5ea532924b35938923.tar.xz |
player: deal with some corner cases with playlist navigation
The purpose is making accessing the current playlist entry saner when
commands are executed during initialization, termination, or after
playlist navigation commands.
For example, the "playlist_remove current" command will invalidate
playlist->current - but some things still access the playlist entry even
on uninit. Until now, checking stop_play implicitly took care of it, so
it worked, but it was still messy.
Introduce the mpctx->playing field, which points to the current playlist
entry, even if the entry was removed and/or the playlist's current entry
was moved (e.g. due to playlist navigation).
Diffstat (limited to 'common/playlist.h')
-rw-r--r-- | common/playlist.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/common/playlist.h b/common/playlist.h index 6c609733da..e0ac816774 100644 --- a/common/playlist.h +++ b/common/playlist.h @@ -41,6 +41,11 @@ struct playlist_entry { bool playback_short : 1; // Set to true if not at least 1 frame (audio or video) could be played. bool init_failed : 1; + // Entry was removed with playlist_remove (etc.), but not deallocated. + bool removed : 1; + // Additional refcount. Normally (reserved==0), the entry is owned by the + // playlist, and this can be used to keep the entry alive. + int reserved; // Used to reject loading of unsafe entries from external playlists. // Can have any of the following bit flags set: // STREAM_SAFE_ONLY: only allow streams marked with is_safe @@ -89,4 +94,6 @@ struct playlist_entry *playlist_entry_from_index(struct playlist *pl, int index) struct mpv_global; struct playlist *playlist_parse_file(const char *file, struct mpv_global *global); +void playlist_entry_unref(struct playlist_entry *e); + #endif |