diff options
author | Uoti Urpala <uau@mplayer2.org> | 2012-04-06 14:24:26 +0300 |
---|---|---|
committer | Uoti Urpala <uau@mplayer2.org> | 2012-04-06 14:34:56 +0300 |
commit | b93ed278362185ff980e0ce8f4ab3029f8fe395f (patch) | |
tree | b0915d50baa17cc7ab94180421f8837f7b5b3ee4 /osdep/getch2-win.c | |
parent | 87ae9d3e45ef6e331b34fa92ac1d0c68495f5379 (diff) | |
download | mpv-b93ed278362185ff980e0ce8f4ab3029f8fe395f.tar.bz2 mpv-b93ed278362185ff980e0ce8f4ab3029f8fe395f.tar.xz |
input: stop trying to read terminal input on EOF
Stop trying to read terminal input if a read attempt returns EOF. The
most important case where this matters is when someone runs the player
with stdin redirected from /dev/null and without specifying
--no-consolecontrols. This used to cause 100% CPU load while paused,
as select() would continuously trigger on stdin (the need for
--no-consolecontrols was not apparent to people with older mplayer
versions, as input reading was less efficient and latencies like
hardcoded sleeps kept CPU use well below 100%). Now this will only
cause a "Dead key input" error message.
Diffstat (limited to 'osdep/getch2-win.c')
-rw-r--r-- | osdep/getch2-win.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/osdep/getch2-win.c b/osdep/getch2-win.c index 326cf1a7d0..f1ccea6359 100644 --- a/osdep/getch2-win.c +++ b/osdep/getch2-win.c @@ -158,11 +158,12 @@ static int getch2_internal(void) return -1; } -void getch2(struct mp_fifo *fifo) +bool getch2(struct mp_fifo *fifo) { int r = getch2_internal(); if (r >= 0) mplayer_put_key(fifo, r); + return true; } void getch2_enable(void) |