diff options
Diffstat (limited to 'player/main.c')
-rw-r--r-- | player/main.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/player/main.c b/player/main.c index 700dbfa48f..41a57981e4 100644 --- a/player/main.c +++ b/player/main.c @@ -467,15 +467,7 @@ int mp_initialize(struct MPContext *mpctx) mpctx->ipc_ctx = mp_init_ipc(mpctx->clients, mpctx->global); #endif - if (opts->shuffle) - playlist_shuffle(mpctx->playlist); - - if (opts->merge_files) - merge_playlist_files(mpctx->playlist); - - mpctx->playlist->current = mp_check_playlist_resume(mpctx, mpctx->playlist); - if (!mpctx->playlist->current) - mpctx->playlist->current = mpctx->playlist->first; + prepare_playlist(mpctx, mpctx->playlist); MP_STATS(mpctx, "end init"); |