summaryrefslogtreecommitdiffstats
path: root/player
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-09-17 18:07:40 +0200
committerwm4 <wm4@nowhere>2016-09-17 18:07:40 +0200
commitdc48893630d11829121a45137460afb45e24ef2d (patch)
treee9209740429c15bfa768d3f9c5086cf8ef760df9 /player
parentd1d5e9dda430b2aa7172308ad7c6639913680af5 (diff)
downloadmpv-dc48893630d11829121a45137460afb45e24ef2d.tar.bz2
mpv-dc48893630d11829121a45137460afb45e24ef2d.tar.xz
options: simplify M_OPT_EXIT
There were multiple values under M_OPT_EXIT (M_OPT_EXIT-n for n>=0). Somehow M_OPT_EXIT-n either meant error code n (with n==0 no error?), or the number of option valus consumed (0 or 1). The latter is MPlayer legacy, which left it to the option type parsers to determine whether an option took a value or not. All of this was changed in mpv, by requiring the user to use explicit syntax ("--opt=val" instead of "-opt val"). In any case, the n value wasn't even used (anymore), so rip this all out. Now M_OPT_EXIT-1 doesn't mean anything, and could be used by a new error code.
Diffstat (limited to 'player')
-rw-r--r--player/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/player/main.c b/player/main.c
index 76300162f3..d4c31a4726 100644
--- a/player/main.c
+++ b/player/main.c
@@ -392,7 +392,7 @@ int mp_initialize(struct MPContext *mpctx, char **options)
int r = m_config_parse_mp_command_line(mpctx->mconfig, mpctx->playlist,
mpctx->global, options);
if (r < 0)
- return r <= M_OPT_EXIT ? -2 : -1;
+ return r == M_OPT_EXIT ? -2 : -1;
update_logging(mpctx);
}