summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2001-09-01 15:23:27 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2001-09-01 15:23:27 +0200
commit4aee497101eb0546b34edfd3ccf34fe5ba140f3d (patch)
treeaac7fb289bdc7cee1f9251b8f17153da25100a0c
parent5a5fc72814c0a687d38b64c387f9bda642f8c4aa (diff)
downloadvdr-4aee497101eb0546b34edfd3ccf34fe5ba140f3d.tar.gz
vdr-4aee497101eb0546b34edfd3ccf34fe5ba140f3d.tar.bz2
New setup parameter OSDMessageTime
-rw-r--r--HISTORY2
-rw-r--r--MANUAL4
-rw-r--r--config.c5
-rw-r--r--config.h3
-rw-r--r--i18n.c11
-rw-r--r--interface.c4
-rw-r--r--interface.h4
-rw-r--r--menu.c3
8 files changed, 29 insertions, 7 deletions
diff --git a/HISTORY b/HISTORY
index 6980653a..a1e17e3c 100644
--- a/HISTORY
+++ b/HISTORY
@@ -694,3 +694,5 @@ Video Disk Recorder Revision History
- The main program loop now first checks whether any timer recordings are
finished, before starting a new timer recording. This is important in case
one timer ends at the same time another timer starts.
+- New setup parameter OSDMessageTime to define how long an OSD message shall
+ be displayed.
diff --git a/MANUAL b/MANUAL
index 5b3fa808..90067006 100644
--- a/MANUAL
+++ b/MANUAL
@@ -413,6 +413,10 @@ Video Disk Recorder User's Manual
OSDwidth = 52 The width and height of the OSD .
OSDheight = 18 The valid ranges are width=40...56, height=12...21.
+ OSDMessageTime = 1 The time (in seconds) how long an informational
+ message shall be displayed on the OSD. The valid range
+ is 1...60.
+
MaxVideoFileSize=2000 The maximum size of a single recorded video file in MB.
The valid range is 100...2000. Default is 2000, but
you may want to use smaller values if you are planning
diff --git a/config.c b/config.c
index 102bad16..fa9e3641 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: config.c 1.62 2001/09/01 15:04:14 kls Exp $
+ * $Id: config.c 1.63 2001/09/01 15:17:44 kls Exp $
*/
#include "config.h"
@@ -819,6 +819,7 @@ cSetup::cSetup(void)
ChannelInfoPos = 0;
OSDwidth = 52;
OSDheight = 18;
+ OSDMessageTime = 1;
MaxVideoFileSize = MAXVIDEOFILESIZE;
MinEventTimeout = 120;
MinUserInactivity = 120;
@@ -854,6 +855,7 @@ bool cSetup::Parse(char *s)
else if (!strcasecmp(Name, "ChannelInfoPos")) ChannelInfoPos = atoi(Value);
else if (!strcasecmp(Name, "OSDwidth")) OSDwidth = atoi(Value);
else if (!strcasecmp(Name, "OSDheight")) OSDheight = atoi(Value);
+ else if (!strcasecmp(Name, "OSDMessageTime")) OSDMessageTime = atoi(Value);
else if (!strcasecmp(Name, "MaxVideoFileSize")) MaxVideoFileSize = atoi(Value);
else if (!strcasecmp(Name, "MinEventTimeout")) MinEventTimeout = atoi(Value);
else if (!strcasecmp(Name, "MinUserInactivity")) MinUserInactivity = atoi(Value);
@@ -924,6 +926,7 @@ bool cSetup::Save(const char *FileName)
fprintf(f, "ChannelInfoPos = %d\n", ChannelInfoPos);
fprintf(f, "OSDwidth = %d\n", OSDwidth);
fprintf(f, "OSDheight = %d\n", OSDheight);
+ fprintf(f, "OSDMessageTime = %d\n", OSDMessageTime);
fprintf(f, "MaxVideoFileSize = %d\n", MaxVideoFileSize);
fprintf(f, "MinEventTimeout = %d\n", MinEventTimeout);
fprintf(f, "MinUserInactivity = %d\n", MinUserInactivity);
diff --git a/config.h b/config.h
index 5b41641d..b13cd19b 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: config.h 1.69 2001/09/01 14:56:06 kls Exp $
+ * $Id: config.h 1.70 2001/09/01 15:16:42 kls Exp $
*/
#ifndef __CONFIG_H
@@ -295,6 +295,7 @@ public:
int VideoFormat;
int ChannelInfoPos;
int OSDwidth, OSDheight;
+ int OSDMessageTime;
int MaxVideoFileSize;
int MinEventTimeout, MinUserInactivity;
int CurrentChannel;
diff --git a/i18n.c b/i18n.c
index 39c15535..1387b85b 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: i18n.c 1.37 2001/09/01 10:52:35 kls Exp $
+ * $Id: i18n.c 1.38 2001/09/01 15:20:45 kls Exp $
*
* Slovenian translations provided by Miha Setina <mihasetina@softhome.net>
* Italian translations provided by Alberto Carraro <bertocar@tin.it>
@@ -893,6 +893,15 @@ const tPhrase Phrases[] = {
"Hauteur affichage",
"", // TODO
},
+ { "OSDMessageTime",
+ "OSD Nachricht Dauer",
+ "", // TODO
+ "", // TODO
+ "", // TODO
+ "", // TODO
+ "", // TODO
+ "", // TODO
+ },
{ "MaxVideoFileSize",
"Max. Video Dateigröße",
"", // TODO
diff --git a/interface.c b/interface.c
index a6c9451e..8695a367 100644
--- a/interface.c
+++ b/interface.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: interface.c 1.43 2001/09/01 10:33:03 kls Exp $
+ * $Id: interface.c 1.44 2001/09/01 15:18:46 kls Exp $
*/
#include "interface.h"
@@ -106,6 +106,8 @@ void cInterface::PutKey(eKeys Key)
eKeys cInterface::Wait(int Seconds, bool KeepChar)
{
+ if (Seconds == 0)
+ Seconds = Setup.OSDMessageTime;
Flush();
eKeys Key = kNone;
time_t timeout = time(NULL) + Seconds;
diff --git a/interface.h b/interface.h
index 925c33e6..dbfa1bca 100644
--- a/interface.h
+++ b/interface.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: interface.h 1.23 2001/09/01 07:29:24 kls Exp $
+ * $Id: interface.h 1.24 2001/09/01 15:14:50 kls Exp $
*/
#ifndef __INTERFACE_H
@@ -29,7 +29,7 @@ private:
unsigned int GetCh(bool Wait = true, bool *Repeat = NULL, bool *Release = NULL);
void QueryKeys(void);
void HelpButton(int Index, const char *Text, eDvbColor FgColor, eDvbColor BgColor);
- eKeys Wait(int Seconds = 1, bool KeepChar = false);
+ eKeys Wait(int Seconds = 0, bool KeepChar = false);
public:
cInterface(int SVDRPport = 0);
~cInterface();
diff --git a/menu.c b/menu.c
index 65e2d0ba..60ea250c 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: menu.c 1.111 2001/09/01 14:56:31 kls Exp $
+ * $Id: menu.c 1.112 2001/09/01 15:18:23 kls Exp $
*/
#include "menu.h"
@@ -1730,6 +1730,7 @@ void cMenuSetup::Set(void)
Add(new cMenuEditBoolItem(tr("ChannelInfoPos"), &data.ChannelInfoPos, tr("bottom"), tr("top")));
Add(new cMenuEditIntItem( tr("OSDwidth"), &data.OSDwidth, MINOSDWIDTH, MAXOSDWIDTH));
Add(new cMenuEditIntItem( tr("OSDheight"), &data.OSDheight, MINOSDHEIGHT, MAXOSDHEIGHT));
+ Add(new cMenuEditIntItem( tr("OSDMessageTime"), &data.OSDMessageTime, 1, 60));
Add(new cMenuEditIntItem( tr("MaxVideoFileSize"), &data.MaxVideoFileSize, MINVIDEOFILESIZE, MAXVIDEOFILESIZE));
Add(new cMenuEditIntItem( tr("MinEventTimeout"), &data.MinEventTimeout));
Add(new cMenuEditIntItem( tr("MinUserInactivity"), &data.MinUserInactivity));