mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 12:02:23 +02:00
Code

command: mess with previous commit

Browse Source 
Nothing actually used the returned length. Since the remaining time can
easily become 0 or negative (e.g. incorrectly estimated file duration),
the time_remaining function still needs 2 return values, though.
This commit is contained in:
wm4 2013-12-16 20:12:53 +01:00
parent 908dfa7949
commit 9662e3e509
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mpvcore/player/command.c
View File

@ -382,22 +382,22 @@ static int mp_property_time_pos(m_option_t *prop, int action,
return property_time(prop, action, arg, get_current_time(mpctx));
}
static double time_remaining(MPContext *mpctx, double *len)
static bool time_remaining(MPContext *mpctx, double *remaining)
{
*len = get_time_length(mpctx);
double len = get_time_length(mpctx);
double pos = get_current_time(mpctx);
double start = get_start_time(mpctx);
return *len - (pos - start);
*remaining = len - (pos - start);
return !!(int)len;
}
static int mp_property_remaining(m_option_t *prop, int action,
void *arg, MPContext *mpctx)
{
double len;
double remaining = time_remaining(mpctx, &len);
if (!(int)len)
double remaining;
if (!time_remaining(mpctx, &remaining))
return M_PROPERTY_UNAVAILABLE;
return property_time(prop, action, arg, remaining);
@ -406,10 +406,8 @@ static int mp_property_remaining(m_option_t *prop, int action,
static int mp_property_playtime_remaining(m_option_t *prop, int action,
void *arg, MPContext *mpctx)
{
double len;
double remaining = time_remaining(mpctx, &len);
if (!(int)len)
double remaining;
if (!time_remaining(mpctx, &remaining))
return M_PROPERTY_UNAVAILABLE;
double speed = mpctx->opts->playback_speed;