summaryrefslogtreecommitdiffstats
path: root/core/cfg-mplayer.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-04-25 20:38:22 +0200
committerwm4 <wm4@nowhere>2013-04-25 20:52:20 +0200
commit3765cfcf57e0232b5e96e77d9dd628755f1c0518 (patch)
tree8644ca978ddbc535dffc1202b03d5e3ac3fc8deb /core/cfg-mplayer.h
parente1fccfdcd8a9efb2e3ce70cc4b7aba3e0eb91836 (diff)
downloadmpv-3765cfcf57e0232b5e96e77d9dd628755f1c0518.tar.bz2
mpv-3765cfcf57e0232b5e96e77d9dd628755f1c0518.tar.xz
core: simplify handling of --pause
Rename the struct MPOpts "start_pause" field to "pause". Store the user- pause state in that field, so that both runtime pause toggling and the --pause switch change the same variable. Simplify the initialization of pause so that using --pause and changing the file while paused is exactly the same case (changing the file while paused doesn't unpause, this has been always this way). Also make it a bit more consistent. Before, starting with --pause would reset the pause state for every file, instead of following the usual semantics for option switches (compare with behavior of --fs).
Diffstat (limited to 'core/cfg-mplayer.h')
-rw-r--r--core/cfg-mplayer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/cfg-mplayer.h b/core/cfg-mplayer.h
index 156835fd07..5d843c4381 100644
--- a/core/cfg-mplayer.h
+++ b/core/cfg-mplayer.h
@@ -352,7 +352,7 @@ const m_option_t common_opts[] = {
OPT_REL_TIME("end", play_end, 0),
OPT_REL_TIME("length", play_length, 0),
- OPT_FLAG("pause", start_paused, 0),
+ OPT_FLAG("pause", pause, 0),
OPT_FLAG("keep-open", keep_open, 0),
// AVI specific: force non-interleaved mode