1
0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00

Repeat keys are now ignored when waiting for a keypress to cancel an operation

This commit is contained in:
Klaus Schmidinger 2005-09-03 09:09:23 +02:00
parent 70bc836e3f
commit 2a91de02ab
3 changed files with 8 additions and 3 deletions

View File

@ -1465,3 +1465,6 @@ Hardy Flor <HFlor@web.de>
Harald Milz <hm@seneca.muc.de> Harald Milz <hm@seneca.muc.de>
for his CUTR patch, which was used as a base to implement the SVDRP command EDIT for his CUTR patch, which was used as a base to implement the SVDRP command EDIT
Marko Mäkelä <marko.makela@hut.fi>
for making repeat keys be ignored when waiting for a keypress to cancel an operation

View File

@ -3747,7 +3747,7 @@ Video Disk Recorder Revision History
- The new SVDRP command EDIT can be used to start the editing process of a recording - The new SVDRP command EDIT can be used to start the editing process of a recording
(based on the CUTR patch by Harald Milz). (based on the CUTR patch by Harald Milz).
2005-09-02: Version 1.3.32 2005-09-03: Version 1.3.32
- Added some missing braces in remux.c (thanks to Wayne Keer for reporting this one). - Added some missing braces in remux.c (thanks to Wayne Keer for reporting this one).
- Removed unused MAINMENUENTRY from svdrpdemo.c (thanks to Udo Richter for reporting - Removed unused MAINMENUENTRY from svdrpdemo.c (thanks to Udo Richter for reporting
@ -3771,3 +3771,5 @@ Video Disk Recorder Revision History
by Malcolm Caldwell). by Malcolm Caldwell).
- Adjusted the Makefile to the dvb-kernel driver on kernel 2.6 and up (thanks to - Adjusted the Makefile to the dvb-kernel driver on kernel 2.6 and up (thanks to
Lauri Tischler). Lauri Tischler).
- Repeat keys are now ignored when waiting for a keypress to cancel an operation
(thanks to Marko Mäkelä).

View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: interface.c 1.68 2004/11/01 14:23:28 kls Exp $ * $Id: interface.c 1.69 2005/09/03 09:07:23 kls Exp $
*/ */
#include "interface.h" #include "interface.h"
@ -56,7 +56,7 @@ eKeys cInterface::Wait(int Seconds, bool KeepChar)
time_t timeout = time(NULL) + Seconds; time_t timeout = time(NULL) + Seconds;
for (;;) { for (;;) {
Key = GetKey(); Key = GetKey();
if ((Key != kNone && (RAWKEY(Key) != kOk || RAWKEY(Key) == Key)) || time(NULL) > timeout || interrupted) if (ISRAWKEY(Key) || time(NULL) > timeout || interrupted)
break; break;
} }
if (KeepChar && ISRAWKEY(Key)) if (KeepChar && ISRAWKEY(Key))