summaryrefslogtreecommitdiffstats
path: root/mpvcore/options.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-08-19 00:50:39 +0200
committerwm4 <wm4@nowhere>2013-08-19 01:05:49 +0200
commit4579cce768d0c9c84dc5f318b7189ffb03b49ece (patch)
tree86ddbbbeb92e4e0c78e72d9d393c27c91dcc9580 /mpvcore/options.c
parent2508f38a92f8863cfc156b2b7310512863db7d4e (diff)
downloadmpv-4579cce768d0c9c84dc5f318b7189ffb03b49ece.tar.bz2
mpv-4579cce768d0c9c84dc5f318b7189ffb03b49ece.tar.xz
mplayer: reshuffle on every loop if --loop and --shuffle are used
See github issue #194. Unfortunately, this breaks the property that going back in the playlist always works as expected. This changes, because the playlist_prev command will work on the reshuffled playlist, instead of loading the previously played files in order. If this ever becomes an issue, I might revert this commit.
Diffstat (limited to 'mpvcore/options.c')
-rw-r--r--mpvcore/options.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/mpvcore/options.c b/mpvcore/options.c
index 4a3c067404..727a3313df 100644
--- a/mpvcore/options.c
+++ b/mpvcore/options.c
@@ -322,7 +322,6 @@ const m_option_t mp_opts[] = {
// handled in command line parser (parser-mpcmd.c)
{"playlist", NULL, CONF_TYPE_STRING, CONF_NOCFG | M_OPT_MIN, 1, 0, NULL},
- {"shuffle", NULL, CONF_TYPE_FLAG, CONF_NOCFG, 0, 0, NULL},
{"{", NULL, CONF_TYPE_STORE, CONF_NOCFG, 0, 0, NULL},
{"}", NULL, CONF_TYPE_STORE, CONF_NOCFG, 0, 0, NULL},
@@ -335,6 +334,8 @@ const m_option_t mp_opts[] = {
// handled in mplayer.c (looks at the raw argv[])
{"leak-report", "", CONF_TYPE_STORE, CONF_GLOBAL | CONF_NOCFG },
+ OPT_FLAG("shuffle", shuffle, CONF_GLOBAL | CONF_NOCFG),
+
// ------------------------- common options --------------------
OPT_FLAG("quiet", quiet, CONF_GLOBAL),
{"really-quiet", &verbose, CONF_TYPE_STORE, CONF_GLOBAL|CONF_PRE_PARSE, 0, -10, NULL},