summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2018-01-03 21:50:04 +0100
committerKevin Mitchell <kevmitch@gmail.com>2018-01-03 15:43:51 -0800
commite894f75bb570e20966d64607aa69d64ba9022bd8 (patch)
tree26f84a5540e6e3eae0cbc1ee817aa74a23bd87f1
parentf798bc3c2542b4c3e7b4cb1483d41ce309b4fb51 (diff)
downloadmpv-e894f75bb570e20966d64607aa69d64ba9022bd8.tar.bz2
mpv-e894f75bb570e20966d64607aa69d64ba9022bd8.tar.xz
player: cosmetics: rename internal variable for consistency
This was so annoying.
-rw-r--r--options/options.c4
-rw-r--r--options/options.h2
-rw-r--r--player/playloop.c4
3 files changed, 5 insertions, 5 deletions
diff --git a/options/options.c b/options/options.c
index 08cb9be3cf..c0697e8e71 100644
--- a/options/options.c
+++ b/options/options.c
@@ -450,7 +450,7 @@ const m_option_t mp_opts[] = {
OPT_STRING("sub-demuxer", sub_demuxer_name, 0),
OPT_FLAG("demuxer-thread", demuxer_thread, 0),
OPT_FLAG("prefetch-playlist", prefetch_open, 0),
- OPT_FLAG("cache-pause", cache_pausing, 0),
+ OPT_FLAG("cache-pause", cache_pause, 0),
OPT_FLAG("cache-pause-initial", cache_pause_initial, 0),
OPT_FLOAT("cache-pause-wait", cache_pause_wait, M_OPT_MIN, .min = 0),
@@ -895,7 +895,7 @@ const struct MPOpts mp_default_opts = {
.autoload_files = 1,
.demuxer_thread = 1,
.hls_bitrate = INT_MAX,
- .cache_pausing = 1,
+ .cache_pause = 1,
.cache_pause_wait = 1.0,
.chapterrange = {-1, -1},
.ab_loop = {MP_NOPTS_VALUE, MP_NOPTS_VALUE},
diff --git a/options/options.h b/options/options.h
index 96f19a2ee5..38afc1c831 100644
--- a/options/options.h
+++ b/options/options.h
@@ -262,7 +262,7 @@ typedef struct MPOpts {
char *audio_demuxer_name;
char *sub_demuxer_name;
- int cache_pausing;
+ int cache_pause;
int cache_pause_initial;
float cache_pause_wait;
diff --git a/player/playloop.c b/player/playloop.c
index e9d9112588..1184e94ad9 100644
--- a/player/playloop.c
+++ b/player/playloop.c
@@ -618,7 +618,7 @@ static void handle_pause_on_low_cache(struct MPContext *mpctx)
if (mpctx->restart_complete && use_pause_on_low_cache) {
if (mpctx->paused && mpctx->paused_for_cache) {
- if (!s.underrun && (!opts->cache_pausing || s.idle ||
+ if (!s.underrun && (!opts->cache_pause || s.idle ||
s.ts_duration >= opts->cache_pause_wait))
{
mpctx->paused_for_cache = false;
@@ -627,7 +627,7 @@ static void handle_pause_on_low_cache(struct MPContext *mpctx)
}
mp_set_timeout(mpctx, 0.2);
} else {
- if (opts->cache_pausing && s.underrun) {
+ if (opts->cache_pause && s.underrun) {
mpctx->paused_for_cache = true;
update_internal_pause_state(mpctx);
mpctx->cache_stop_time = now;