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

command: add a property to indicate core pause state 

Currently this is (probably) equivalent to "paused-for-cache", but the
latter is a bit special, while this new property is a bit more general.
One case where they might actually be different is dvdnav menus, but I
haven't checked.

Also add property change notifications for these two properties.
This commit is contained in:
wm4 2014-04-14 22:03:43 +02:00
parent e1f1b0c275
commit 1e3e7bb7f4
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
DOCS/man/en/input.rst
View File

@ -754,6 +754,11 @@ Property list
``pause`` (RW)
Pause status. This is usually ``yes`` or ``no``. See ``--pause``.
``core-idle``
Return ``yes`` if the playback core is paused, otherwise ``no``. This can
be different ``pause`` in special situations, such as when the player
pauses itself due to low network cache.
``cache``
Network cache fill state (0-100).

13
player/command.c
View File

@ -984,6 +984,13 @@ static int mp_property_pause(m_option_t *prop, int action, void *arg,
return mp_property_generic_option(prop, action, arg, ctx);
}
static int mp_property_core_idle(m_option_t *prop, int action, void *arg,
void *ctx)
{
MPContext *mpctx = ctx;
return m_property_int_ro(prop, action, arg, mpctx->paused);
}
static int mp_property_cache(m_option_t *prop, int action, void *arg,
void *ctx)
{
@ -2243,6 +2250,8 @@ static const m_option_t mp_properties[] = {
M_PROPERTY("chapter-metadata", mp_property_chapter_metadata),
M_PROPERTY( "vf-metadata", mp_property_vf_metadata),
M_OPTION_PROPERTY_CUSTOM("pause", mp_property_pause),
{ "core-idle", mp_property_core_idle, CONF_TYPE_FLAG,
M_OPT_RANGE, 0, 1, NULL },
{ "cache", mp_property_cache, CONF_TYPE_INT },
{ "cache-size", mp_property_cache_size, CONF_TYPE_INT, M_OPT_MIN, 0 },
{ "paused-for-cache", mp_property_paused_for_cache, CONF_TYPE_FLAG,
@ -2380,8 +2389,8 @@ const char **mp_event_property_change[] = {
E(MPV_EVENT_TRACK_SWITCHED, "vid", "video", "aid", "audio", "sid", "sub",
"secondary-sid"),
E(MPV_EVENT_IDLE, "*"),
E(MPV_EVENT_PAUSE, "pause"),
E(MPV_EVENT_UNPAUSE, "pause"),
E(MPV_EVENT_PAUSE, "pause", "paused-on-cache", "core-idle"),
E(MPV_EVENT_UNPAUSE, "pause", "paused-on-cache", "core-idle"),
E(MPV_EVENT_TICK, "time-pos", "stream-pos", "stream-time-pos", "avsync",
"percent-pos", "time-remaining", "playtime-remaining"),
E(MPV_EVENT_VIDEO_RECONFIG, "video-out-params", "video-params",