frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Fixed learning keys when VDR is already running

Browse Source
This commit is contained in:
Klaus Schmidinger 2006-03-31 14:24:58 +02:00
parent 8c55ada0af
commit daa9047247
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CONTRIBUTORS
View File

@ -1801,3 +1801,6 @@ Oleg Roitburd <oleg@roitburd.de>
Marius Heidenstecker <marius@heidenstecker.de> Marius Heidenstecker <marius@heidenstecker.de>
for suggesting to make cMenuRecordings::GetRecording() 'protected' for suggesting to make cMenuRecordings::GetRecording() 'protected'
Jurij Retzlaff <jurij@topofweb.de>
for fixing learning keys when VDR is already running

1
HISTORY
View File

@ -4465,3 +4465,4 @@ Video Disk Recorder Revision History
- Fixed broken entry 'A111.1W' in sources.conf (reported by Luca Olivetti). - Fixed broken entry 'A111.1W' in sources.conf (reported by Luca Olivetti).
- Replaced the obsolete entry 'S21.5E' in the default 'diseqc.conf' with 'S13.0E' - Replaced the obsolete entry 'S21.5E' in the default 'diseqc.conf' with 'S13.0E'
(reported by Ville Skyttä). (reported by Ville Skyttä).
- Fixed learning keys when VDR is already running (thanks to Jurij Retzlaff).

7
interface.c
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.74 2006/03/25 11:50:55 kls Exp $ * $Id: interface.c 1.75 2006/03/31 14:20:04 kls Exp $
*/ */
#include "interface.h" #include "interface.h"
@ -37,7 +37,10 @@ eKeys cInterface::GetKey(bool Wait)
if (SVDRP->Process()) if (SVDRP->Process())
Wait = false; Wait = false;
} }
return cRemote::Get(Wait ? 1000 : 10); if (!cRemote::IsLearning())
return cRemote::Get(Wait ? 1000 : 10);
else
return kNone;
} }
eKeys cInterface::Wait(int Seconds, bool KeepChar) eKeys cInterface::Wait(int Seconds, bool KeepChar)

3
remote.h
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: remote.h 1.33 2006/01/29 12:27:08 kls Exp $ * $Id: remote.h 1.34 2006/03/31 14:18:44 kls Exp $
*/ */
#ifndef __REMOTE_H #ifndef __REMOTE_H
@ -42,6 +42,7 @@ public:
virtual bool Initialize(void); virtual bool Initialize(void);
const char *Name(void) { return name; } const char *Name(void) { return name; }
static void SetLearning(cRemote *Learning) { learning = Learning; } static void SetLearning(cRemote *Learning) { learning = Learning; }
static bool IsLearning() { return learning != NULL; }
static void Clear(void); static void Clear(void);
static bool Put(eKeys Key, bool AtFront = false); static bool Put(eKeys Key, bool AtFront = false);
static bool PutMacro(eKeys Key); static bool PutMacro(eKeys Key);