summaryrefslogtreecommitdiff
path: root/interface.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <kls (at) cadsoft (dot) de>2000-09-03 18:00:00 +0200
committerKlaus Schmidinger <kls (at) cadsoft (dot) de>2000-09-03 18:00:00 +0200
commit48fea259ae5ed3ac19bcc4152341252b9df39128 (patch)
tree244597d3af4bc89bc1997e7cceb91745e23ea811 /interface.c
parent9b405778674d5325b225b32ab694d9216b099527 (diff)
downloadvdr-patch-lnbsharing-48fea259ae5ed3ac19bcc4152341252b9df39128.tar.gz
vdr-patch-lnbsharing-48fea259ae5ed3ac19bcc4152341252b9df39128.tar.bz2
Version 0.62vdr-0.62
- The Makefile now defines DVBDIR to easily point to where the DVB driver source is located. - When switching channels the current/next information is now displayed if available (thanks to Robert Schneider). Since there is now more information to read when switching channels, the timeout for displaying it has been increased from 2 to 5 seconds (remember that this info can always be recalled by pressing the "Ok" button). For this feature to work it is necessary that the 'Pnr' parameter in the channel setup ('channels.conf') is set to the proper value. This has been done for some of the channels in the default 'channels.conf'. Some other parameters in the default 'channels.conf' have also been updated, so please make sure your timers still use the correct channels!
Diffstat (limited to 'interface.c')
-rw-r--r--interface.c23
1 files changed, 20 insertions, 3 deletions
diff --git a/interface.c b/interface.c
index 244488a..2ae49c3 100644
--- a/interface.c
+++ b/interface.c
@@ -4,13 +4,16 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: interface.c 1.10 2000/07/15 12:39:20 kls Exp $
+ * $Id: interface.c 1.11 2000/09/03 10:17:21 kls Exp $
*/
#include "interface.h"
#include <unistd.h>
+#include "eit.h"
#include "remote.h"
+cEIT EIT;
+
#if defined(REMOTE_RCU)
cRcIoRCU RcIo("/dev/ttyS1");
#elif defined(REMOTE_LIRC)
@@ -316,7 +319,7 @@ void cInterface::DisplayChannel(int Number, const char *Name)
{
RcIo.Number(Number);
if (Name && !Recording()) {
- Open(MenuColumns, 1);
+ Open(MenuColumns, EIT.IsValid() ? 5 : 1);
char buffer[MenuColumns + 1];
snprintf(buffer, sizeof(buffer), "%d %s", Number, Name ? Name : "");
Write(0, 0, buffer);
@@ -324,7 +327,21 @@ void cInterface::DisplayChannel(int Number, const char *Name)
struct tm *now = localtime(&t);
snprintf(buffer, sizeof(buffer), "%02d:%02d", now->tm_hour, now->tm_min);
Write(-5, 0, buffer);
- if (Wait(2, true) == kOk)
+ if (EIT.IsValid()) {
+ const int t = 7;
+ int w = MenuColumns - t;
+ Write(0, 1, EIT.GetRunningTime(), clrYellow, clrBackground);
+ snprintf(buffer, sizeof(buffer), "%.*s", w, EIT.GetRunningTitle());
+ Write(t, 1, buffer, clrCyan, clrBackground);
+ snprintf(buffer, sizeof(buffer), "%.*s", w, EIT.GetRunningSubtitle());
+ Write(t, 2, buffer, clrCyan, clrBackground);
+ Write(0, 3, EIT.GetNextTime(), clrYellow, clrBackground);
+ snprintf(buffer, sizeof(buffer), "%.*s", w, EIT.GetNextTitle());
+ Write(t, 3, buffer, clrCyan, clrBackground);
+ snprintf(buffer, sizeof(buffer), "%.*s", w, EIT.GetNextSubtitle());
+ Write(t, 4, buffer, clrCyan, clrBackground);
+ }
+ if (Wait(5, true) == kOk)
GetKey();
Close();
}