summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-05-25 18:39:46 +0200
committerwm4 <wm4@nowhere>2013-05-26 16:44:20 +0200
commit51254a678c386cf48f2caa51e06ad34065c8693a (patch)
tree2a6bd525ae6db1582c7c1c752a722695dd6560b4 /core
parent561aab2d770776fcc60a03f3aca20782572b9a36 (diff)
downloadmpv-51254a678c386cf48f2caa51e06ad34065c8693a.tar.bz2
mpv-51254a678c386cf48f2caa51e06ad34065c8693a.tar.xz
vo: rip out VO timer wakeup mechanism again
This was used by some VOs to do timing of cursor autohiding, but we recently moved that out of the VOs. Even though this mechanism might be a good idea and could be needed again in future (but for what?), it's unused now. So better just get rid of it.
Diffstat (limited to 'core')
-rw-r--r--core/mplayer.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/core/mplayer.c b/core/mplayer.c
index df6b42973e..0b1bee4179 100644
--- a/core/mplayer.c
+++ b/core/mplayer.c
@@ -3771,18 +3771,8 @@ static void run_playloop(struct MPContext *mpctx)
}
}
}
- if (sleeptime > 0) {
- int sleep_ms = sleeptime * 1000;
- if (mpctx->sh_video) {
- unsigned int vo_sleep = vo_get_sleep_time(mpctx->video_out);
- sleep_ms = FFMIN(sleep_ms, vo_sleep);
- if (mpctx->mouse_waiting_hide) {
- vo_sleep = mpctx->mouse_timer - GetTimerMS();
- sleep_ms = FFMIN(sleep_ms, vo_sleep);
- }
- }
- mp_input_get_cmd(mpctx->input, sleep_ms, true);
- }
+ if (sleeptime > 0)
+ mp_input_get_cmd(mpctx->input, sleeptime * 1000, true);
}
//================= Keyboard events, SEEKing ====================