summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@mplayer2.org>2012-02-29 03:07:10 +0100
committerwm4 <wm4@mplayer2.org>2012-02-29 03:07:10 +0100
commit5fcd29eb4010835d2879304e7a404d575206fcbf (patch)
treee5af8aeeb3605c4a93da34c28d3ec3fbe7de1ce2
parent4b553cd676eadc21a68ac63ec71cca10e44cf5e8 (diff)
downloadmpv-5fcd29eb4010835d2879304e7a404d575206fcbf.tar.bz2
mpv-5fcd29eb4010835d2879304e7a404d575206fcbf.tar.xz
core: rename --paused to --pause, and improve how pausing is done
Callign add_step_frame is not necessary, because mplayer always decodes at least one frame when starting a new file. Calling pause_player is sufficient, and unlike add_step_frame doesn't play any audio.
-rw-r--r--cfg-mplayer.h2
-rw-r--r--mplayer.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/cfg-mplayer.h b/cfg-mplayer.h
index 4fc7b4ddd7..0664d004a1 100644
--- a/cfg-mplayer.h
+++ b/cfg-mplayer.h
@@ -486,7 +486,7 @@ const m_option_t common_opts[] = {
OPT_TIME("ss", seek_to_sec, 0),
// start paused
- OPT_FLAG_ON("paused", start_paused, 0),
+ OPT_FLAG_ON("pause", start_paused, 0),
// stop at given position
{"endpos", &end_at, CONF_TYPE_TIME_SIZE, 0, 0, 0, NULL},
diff --git a/mplayer.c b/mplayer.c
index e843c07436..490f1c7e35 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -5003,7 +5003,7 @@ goto_enable_cache:
mpctx->paused ? VOCTRL_PAUSE : VOCTRL_RESUME, NULL);
if (mpctx->opts.start_paused)
- add_step_frame(mpctx);
+ pause_player(mpctx);
while (!mpctx->stop_play)
run_playloop(mpctx);