If Setup.ShowInfoOnChSwitch is set to 'no', the box for the EPG display is no longer shown

This commit is contained in:
Klaus Schmidinger 2002-02-10 11:58:17 +01:00
parent 94b9c72e22
commit 219ccb51a7
3 changed files with 8 additions and 3 deletions

View File

@ -162,6 +162,7 @@ Simon Bauschulte <SemiSchwabe@Brutzel.de>
Andy Grobb <Charly98@01019freenet.de> Andy Grobb <Charly98@01019freenet.de>
for completing storing the current audio volume in the setup.conf file for completing storing the current audio volume in the setup.conf file
for fixing the EPG display in case Setup.ShowInfoOnChSwitch is set to "no"
Thomas Heiligenmann <thomas@heiligenmann.de> Thomas Heiligenmann <thomas@heiligenmann.de>
for implementing the SVDRP commands LSTR and DELR for implementing the SVDRP commands LSTR and DELR

View File

@ -987,3 +987,5 @@ Video Disk Recorder Revision History
automatically closed (suggested by Uwe Freese). automatically closed (suggested by Uwe Freese).
- Changed the default name for instant recordings to "TITLE EPISODE" (avoiding - Changed the default name for instant recordings to "TITLE EPISODE" (avoiding
the '-'). the '-').
- If Setup.ShowInfoOnChSwitch is set to "no", the box for the EPG display is no
longer shown (thanks to Andy Grobb).

8
menu.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: menu.c 1.151 2002/02/10 11:25:07 kls Exp $ * $Id: menu.c 1.152 2002/02/10 11:52:34 kls Exp $
*/ */
#include "menu.h" #include "menu.h"
@ -2124,10 +2124,11 @@ cDisplayChannel::cDisplayChannel(int Number, bool Switched)
{ {
group = -1; group = -1;
withInfo = !Switched || Setup.ShowInfoOnChSwitch; withInfo = !Switched || Setup.ShowInfoOnChSwitch;
int EpgLines = withInfo ? 5 : 1;
lines = 0; lines = 0;
oldNumber = number = 0; oldNumber = number = 0;
cChannel *channel = Channels.GetByNumber(Number); cChannel *channel = Channels.GetByNumber(Number);
Interface->Open(Setup.OSDwidth, Setup.ChannelInfoPos ? 5 : -5); Interface->Open(Setup.OSDwidth, Setup.ChannelInfoPos ? EpgLines : -EpgLines);
if (channel) { if (channel) {
DisplayChannel(channel); DisplayChannel(channel);
DisplayInfo(); DisplayInfo();
@ -2142,7 +2143,8 @@ cDisplayChannel::cDisplayChannel(eKeys FirstKey)
oldNumber = cDvbApi::CurrentChannel(); oldNumber = cDvbApi::CurrentChannel();
number = 0; number = 0;
lastTime = time_ms(); lastTime = time_ms();
Interface->Open(Setup.OSDwidth, Setup.ChannelInfoPos ? 5 : -5); int EpgLines = Setup.ShowInfoOnChSwitch ? 5 : 1;
Interface->Open(Setup.OSDwidth, Setup.ChannelInfoPos ? EpgLines : -EpgLines);
ProcessKey(FirstKey); ProcessKey(FirstKey);
} }