diff options
| author | wm4 <wm4@nowhere> | 2013-02-21 22:15:26 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-02-23 00:07:11 +0100 |
| commit | 8deb57b040fd416305de6575890788aad4059d99 (patch) | |
| tree | ffefa85523c0a466bba1d24a121723d241179d29 /core | |
| parent | 9b7fb867f77bf0819bdfe1a4ceb55aade7db6f1b (diff) | |
| download | mpv-8deb57b040fd416305de6575890788aad4059d99.tar.bz2 mpv-8deb57b040fd416305de6575890788aad4059d99.tar.xz | |
options: fix --no-shuffle and --no-{
--no-shuffle accidentally did nothing after commit 57879a2. The options
--no-{ and --no-} make no sense and shouldn't exist (wrong option type).
Diffstat (limited to 'core')
| -rw-r--r-- | core/cfg-mplayer.h | 4 | ||||
| -rw-r--r-- | core/parser-mpcmd.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/core/cfg-mplayer.h b/core/cfg-mplayer.h index 30096ff295..84024f7a6d 100644 --- a/core/cfg-mplayer.h +++ b/core/cfg-mplayer.h @@ -647,8 +647,8 @@ const m_option_t mplayer_opts[]={ {"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_FLAG, CONF_NOCFG, 0, 0, NULL}, - {"}", 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}, OPT_FLAG("ordered-chapters", ordered_chapters, 0), OPT_INTRANGE("chapter-merge-threshold", chapter_merge_threshold, 0, 0, 10000), diff --git a/core/parser-mpcmd.c b/core/parser-mpcmd.c index fd22a1e054..223b487a2a 100644 --- a/core/parser-mpcmd.c +++ b/core/parser-mpcmd.c @@ -202,6 +202,10 @@ bool m_config_parse_mp_command_line(m_config_t *config, struct playlist *files, shuffle = parse_flag(p.arg, p.param); continue; } + if (bstrcmp0(p.arg, "no-shuffle") == 0) { + shuffle = false; + continue; + } if (bstrcmp0(p.arg, "playlist") == 0) { // append the playlist to the local args |