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 'Channel locked' message if recording is running on primary interface

Browse Source
This commit is contained in:
Klaus Schmidinger 2001-09-01 13:51:25 +02:00
parent 7fd56f7d6f
commit e2701822e8
2 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HISTORY
View File

@ -689,3 +689,5 @@ Video Disk Recorder Revision History
to 0x15E on the newer keyboards). to 0x15E on the newer keyboards).
- When a recording is edited, the summary information (if present) is now - When a recording is edited, the summary information (if present) is now
also copied. also copied.
- When a recording is running on the primary interface, any attempt to change
the current channel will now lead to a "Channel locked" message.

41
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.66 2001/09/01 11:44:08 kls Exp $ * $Id: vdr.c 1.67 2001/09/01 13:48:44 kls Exp $
*/ */
#define _GNU_SOURCE #define _GNU_SOURCE
@ -395,35 +395,34 @@ int main(int argc, char *argv[])
break; break;
// Direct Channel Select: // Direct Channel Select:
case k1 ... k9: case k1 ... k9:
if (!Interface->Recording()) Menu = new cDisplayChannel(key);
Menu = new cDisplayChannel(key);
break; break;
// Left/Right rotates trough channel groups: // Left/Right rotates trough channel groups:
case kLeft|k_Repeat: case kLeft|k_Repeat:
case kLeft: case kLeft:
case kRight|k_Repeat: case kRight|k_Repeat:
case kRight: if (!Interface->Recording()) { case kRight: {
int SaveGroup = CurrentGroup; int SaveGroup = CurrentGroup;
if (NORMALKEY(key) == kRight) if (NORMALKEY(key) == kRight)
CurrentGroup = Channels.GetNextGroup(CurrentGroup) ; CurrentGroup = Channels.GetNextGroup(CurrentGroup) ;
else else
CurrentGroup = Channels.GetPrevGroup(CurrentGroup < 1 ? 1 : CurrentGroup); CurrentGroup = Channels.GetPrevGroup(CurrentGroup < 1 ? 1 : CurrentGroup);
if (CurrentGroup < 0) if (CurrentGroup < 0)
CurrentGroup = SaveGroup; CurrentGroup = SaveGroup;
Menu = new cDisplayChannel(CurrentGroup, false, true); Menu = new cDisplayChannel(CurrentGroup, false, true);
} break;
break; }
// Up/Down Channel Select: // Up/Down Channel Select:
case kUp|k_Repeat: case kUp|k_Repeat:
case kUp: case kUp:
case kDown|k_Repeat: case kDown|k_Repeat:
case kDown: if (!Interface->Recording()) { case kDown: {
int n = cDvbApi::CurrentChannel() + (NORMALKEY(key) == kUp ? 1 : -1); int n = cDvbApi::CurrentChannel() + (NORMALKEY(key) == kUp ? 1 : -1);
cChannel *channel = Channels.GetByNumber(n); cChannel *channel = Channels.GetByNumber(n);
if (channel) if (channel)
channel->Switch(); channel->Switch();
} break;
break; }
// Menu Control: // Menu Control:
case kMenu: Menu = new cMenuMain(ReplayControl); break; case kMenu: Menu = new cMenuMain(ReplayControl); break;
// Viewing Control: // Viewing Control: