frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/vdr-projects/vdr.git synced 2025-03-01 10:50:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed handling dedicated keys

Browse Source
This commit is contained in:
Klaus Schmidinger
2003-05-02 10:59:07 +02:00
parent 03a4a3a618
commit 6ffb7912d8
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
HISTORY
View File

@@ -2094,3 +2094,4 @@ Video Disk Recorder Revision History
to Oliver Endriss for reporting this one). to Oliver Endriss for reporting this one).
- Fixed double call to MainMenuAction() of a plugin if invoked via a hotkey (thanks - Fixed double call to MainMenuAction() of a plugin if invoked via a hotkey (thanks
to Kai Moeller for reporting this one). to Kai Moeller for reporting this one).
- Fixed handling dedicated keys.

8
vdr.c
View File

@@ -22,7 +22,7 @@
* *
* The project's page is at http://www.cadsoft.de/people/kls/vdr * The project's page is at http://www.cadsoft.de/people/kls/vdr
* *
* $Id: vdr.c 1.150 2003/04/21 14:41:41 kls Exp $ * $Id: vdr.c 1.151 2003/05/02 10:59:07 kls Exp $
*/ */
#include <getopt.h> #include <getopt.h>
@@ -503,6 +503,7 @@ int main(int argc, char *argv[])
switch (key) { switch (key) {
// Menu control: // Menu control:
case kMenu: case kMenu:
key = kNone; // nobody else needs to see this key
if (Menu) { if (Menu) {
DELETENULL(Menu); DELETENULL(Menu);
if (!Temp) if (!Temp)
@@ -518,14 +519,15 @@ int main(int argc, char *argv[])
if (cControl::Control())\ if (cControl::Control())\
cControl::Control()->Hide();\ cControl::Control()->Hide();\
Menu = new cMenuMain(cControl::Control(), function);\ Menu = new cMenuMain(cControl::Control(), function);\
Temp = NULL; Temp = NULL;\
key = kNone; // nobody else needs to see this key
case kSchedule: DirectMainFunction(osSchedule); break; case kSchedule: DirectMainFunction(osSchedule); break;
case kChannels: DirectMainFunction(osChannels); break; case kChannels: DirectMainFunction(osChannels); break;
case kTimers: DirectMainFunction(osTimers); break; case kTimers: DirectMainFunction(osTimers); break;
case kRecordings: DirectMainFunction(osRecordings); break; case kRecordings: DirectMainFunction(osRecordings); break;
case kSetup: DirectMainFunction(osSetup); break; case kSetup: DirectMainFunction(osSetup); break;
case kCommands: DirectMainFunction(osCommands); break; case kCommands: DirectMainFunction(osCommands); break;
case kUser1 ... kUser9: cRemote::PutMacro(key); break; case kUser1 ... kUser9: cRemote::PutMacro(key); key = kNone; break;
case k_Plugin: DirectMainFunction(osPlugin, cRemote::GetPlugin()); break; case k_Plugin: DirectMainFunction(osPlugin, cRemote::GetPlugin()); break;
// Channel up/down: // Channel up/down:
case kChanUp|k_Repeat: case kChanUp|k_Repeat: