From e1fccfdcd8a9efb2e3ce70cc4b7aba3e0eb91836 Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 25 Apr 2013 19:07:47 +0200 Subject: core: don't let cache pause handling and user pausing conflict The core pauses and unpauses automatically to wait for the network cache (also known as buffering). This conflicted with user pause control, and was perceived as if the player was unresponsive and/or the cache just overturned the user's decisions. Change it so that the actual pause state and the pause state as intended by the user never conflict. If the user toggles pause, the pause state will be in the expected state as soon as the cache is loaded. --- core/command.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'core/command.c') diff --git a/core/command.c b/core/command.c index 11d987819d..7497ea817f 100644 --- a/core/command.c +++ b/core/command.c @@ -527,7 +527,7 @@ static int mp_property_pause(m_option_t *prop, int action, void *arg, } return M_PROPERTY_OK; case M_PROPERTY_GET: - *(int *)arg = mpctx->paused; + *(int *)arg = mpctx->paused_user; return M_PROPERTY_OK; } return M_PROPERTY_NOT_IMPLEMENTED; @@ -2303,7 +2303,7 @@ void run_command(MPContext *mpctx, mp_cmd_t *cmd) pause_player(mpctx); break; case 3: // "pausing_toggle" - if (mpctx->paused) + if (mpctx->paused_user) unpause_player(mpctx); else pause_player(mpctx); -- cgit v1.2.3