diff options
author | wm4 <wm4@nowhere> | 2018-05-07 20:36:17 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2018-05-24 19:56:34 +0200 |
commit | 1b611e38ef9291c309e97379ef432fd301605033 (patch) | |
tree | 95034a0442af61b6df9bb753029a2a67a299e31a /player/core.h | |
parent | 115a9b19f14e0e8cc6dd5d0732cd39322cbd686c (diff) | |
download | mpv-1b611e38ef9291c309e97379ef432fd301605033.tar.bz2 mpv-1b611e38ef9291c309e97379ef432fd301605033.tar.xz |
player: make all external file loading actions async
Still missing: not freezing when removing a track (i.e. closing demuxer)
with the sub-remove/audio-remove/rescan-external-files commands.
Diffstat (limited to 'player/core.h')
-rw-r--r-- | player/core.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/player/core.h b/player/core.h index 5ca227a8fa..9a9eb81852 100644 --- a/player/core.h +++ b/player/core.h @@ -296,6 +296,8 @@ typedef struct MPContext { struct track **tracks; int num_tracks; + int64_t death_hack; // don't fucking ask, just don't + char *track_layout_hash; // Selected tracks. NULL if no track selected. @@ -488,7 +490,7 @@ struct playlist_entry *mp_check_playlist_resume(struct MPContext *mpctx, void mp_abort_playback_async(struct MPContext *mpctx); void uninit_player(struct MPContext *mpctx, unsigned int mask); int mp_add_external_file(struct MPContext *mpctx, char *filename, - enum stream_type filter, bool unlock); + enum stream_type filter); #define FLAG_MARK_SELECTION 1 void mp_switch_track(struct MPContext *mpctx, enum stream_type type, struct track *track, int flags); |