mirror of
https://github.com/VDR4Arch/vdr.git
synced 2023-10-10 13:36:52 +02:00
Fixed 'Channel locked' message if recording is running on primary interface
This commit is contained in:
parent
7fd56f7d6f
commit
e2701822e8
2
HISTORY
2
HISTORY
@ -689,3 +689,5 @@ Video Disk Recorder Revision History
|
||||
to 0x15E on the newer keyboards).
|
||||
- When a recording is edited, the summary information (if present) is now
|
||||
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.
|
||||
|
11
vdr.c
11
vdr.c
@ -22,7 +22,7 @@
|
||||
*
|
||||
* 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
|
||||
@ -395,14 +395,13 @@ int main(int argc, char *argv[])
|
||||
break;
|
||||
// Direct Channel Select:
|
||||
case k1 ... k9:
|
||||
if (!Interface->Recording())
|
||||
Menu = new cDisplayChannel(key);
|
||||
break;
|
||||
// Left/Right rotates trough channel groups:
|
||||
case kLeft|k_Repeat:
|
||||
case kLeft:
|
||||
case kRight|k_Repeat:
|
||||
case kRight: if (!Interface->Recording()) {
|
||||
case kRight: {
|
||||
int SaveGroup = CurrentGroup;
|
||||
if (NORMALKEY(key) == kRight)
|
||||
CurrentGroup = Channels.GetNextGroup(CurrentGroup) ;
|
||||
@ -411,19 +410,19 @@ int main(int argc, char *argv[])
|
||||
if (CurrentGroup < 0)
|
||||
CurrentGroup = SaveGroup;
|
||||
Menu = new cDisplayChannel(CurrentGroup, false, true);
|
||||
}
|
||||
break;
|
||||
}
|
||||
// Up/Down Channel Select:
|
||||
case kUp|k_Repeat:
|
||||
case kUp:
|
||||
case kDown|k_Repeat:
|
||||
case kDown: if (!Interface->Recording()) {
|
||||
case kDown: {
|
||||
int n = cDvbApi::CurrentChannel() + (NORMALKEY(key) == kUp ? 1 : -1);
|
||||
cChannel *channel = Channels.GetByNumber(n);
|
||||
if (channel)
|
||||
channel->Switch();
|
||||
}
|
||||
break;
|
||||
}
|
||||
// Menu Control:
|
||||
case kMenu: Menu = new cMenuMain(ReplayControl); break;
|
||||
// Viewing Control:
|
||||
|
Loading…
Reference in New Issue
Block a user