RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

player: cosmetics: rename internal variable for consistency 

This was so annoying.
This commit is contained in:
wm4 2018-01-03 21:50:04 +01:00 committed by Kevin Mitchell
parent f798bc3c25
commit e894f75bb5
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
options/options.c
View File

@ -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},

2
options/options.h
View File

@ -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;

4
player/playloop.c
View File

@ -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;