From 8849308cf9ad1e85ed1790aa832806ce7f74e565 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 22 Jul 2007 18:00:00 +0200 Subject: =?UTF-8?q?Version=201.5.6=20-=20Fixed=20a=20buffer=20overflow=20i?= =?UTF-8?q?n=20initializing=20the=20system=20character=20table=20(thanks?= =?UTF-8?q?=20=20=20to=20Marco=20Schl=C3=BC=C3=9Fler).=20-=20Updated=20the?= =?UTF-8?q?=20Russian=20OSD=20texts=20(thanks=20to=20Oleg=20Roitburd).=20-?= =?UTF-8?q?=20Fixed=20handling=20single=20byte=20characters=20>0x7F=20in?= =?UTF-8?q?=20Utf8ToArray()=20(thanks=20to=20Udo=20=20=20Richter).=20-=20I?= =?UTF-8?q?mproved=20numdigits(),=20isnumber()=20and=20strreplace()=20(tha?= =?UTF-8?q?nks=20to=20Tobias=20Bratfisch).=20-=20Fixed=20clearing=20color?= =?UTF-8?q?=20buttons=20in=20the=20'curses'=20skin=20(thanks=20to=20Udo=20?= =?UTF-8?q?Richter).=20-=20Fixed=20a=20typo=20in=20the=20function=20name?= =?UTF-8?q?=20of=20cOsd::SetOsdPosition()=20and=20added=20a=20range=20=20?= =?UTF-8?q?=20check=20to=20it=20(thanks=20to=20Christoph=20Haubrich).=20-?= =?UTF-8?q?=20Updated=20the=20Finnish=20OSD=20texts=20(thanks=20to=20Rolf?= =?UTF-8?q?=20Ahrenberg).=20-=20Improved=20cControl::Launch()=20to=20keep?= =?UTF-8?q?=20'control'=20from=20pointing=20to=20uninitialized=20=20=20mem?= =?UTF-8?q?ory=20(thanks=20to=20Rolf=20Ahrenberg).=20-=20Made=20skipspace(?= =?UTF-8?q?)=20an=20inline=20function=20(suggested=20by=20Tobias=20Bratfis?= =?UTF-8?q?ch)=20and=20changed=20=20=20it=20to=20handle=20the=20most=20com?= =?UTF-8?q?mon=20case=20of=20'no=20leading=20space'=20very=20fast,=20and?= =?UTF-8?q?=20avoid=20=20=20calling=20isspace(),=20which=20made=20the=20wh?= =?UTF-8?q?ole=20function=20a=20lot=20faster.=20-=20Fixed=20detection=20of?= =?UTF-8?q?=20Premiere=20NVOD=20channel=20links=20(thanks=20to=20Markus=20?= =?UTF-8?q?Hahn).=20-=20Added=20a=20table=20of=20the=20used=20trick=20spee?= =?UTF-8?q?d=20values=20to=20the=20description=20of=20=20=20cDevice::Trick?= =?UTF-8?q?Speed()=20(suggested=20by=20Martin=20Dauskardt).=20-=20Added=20?= =?UTF-8?q?a=20missing=20'P'=20to=20vdr.c's=20SHUTDOWNCANCELROMPT=20macro?= =?UTF-8?q?=20(reported=20by=20Marco=20=20=20Schl=C3=BC=C3=9Fler).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vdr.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'vdr.c') diff --git a/vdr.c b/vdr.c index e28c728..54814a7 100644 --- a/vdr.c +++ b/vdr.c @@ -22,7 +22,7 @@ * * The project's page is at http://www.cadsoft.de/vdr * - * $Id: vdr.c 1.293 2007/06/17 11:23:08 kls Exp $ + * $Id: vdr.c 1.294 2007/07/22 11:40:01 kls Exp $ */ #include @@ -65,22 +65,22 @@ #include "transfer.h" #include "videodir.h" -#define MINCHANNELWAIT 10 // seconds to wait between failed channel switchings -#define ACTIVITYTIMEOUT 60 // seconds before starting housekeeping -#define SHUTDOWNWAIT 300 // seconds to wait in user prompt before automatic shutdown -#define SHUTDOWNRETRY 360 // seconds before trying again to shut down -#define SHUTDOWNFORCEPROMPT 5 // seconds to wait in user prompt to allow forcing shutdown -#define SHUTDOWNCANCELROMPT 5 // seconds to wait in user prompt to allow canceling shutdown -#define RESTARTCANCELPROMPT 5 // seconds to wait in user prompt before restarting on SIGHUP -#define MANUALSTART 600 // seconds the next timer must be in the future to assume manual start -#define CHANNELSAVEDELTA 600 // seconds before saving channels.conf after automatic modifications -#define DEVICEREADYTIMEOUT 30 // seconds to wait until all devices are ready -#define MENUTIMEOUT 120 // seconds of user inactivity after which an OSD display is closed -#define TIMERCHECKDELTA 10 // seconds between checks for timers that need to see their channel -#define TIMERDEVICETIMEOUT 8 // seconds before a device used for timer check may be reused -#define TIMERLOOKAHEADTIME 60 // seconds before a non-VPS timer starts and the channel is switched if possible -#define VPSLOOKAHEADTIME 24 // hours within which VPS timers will make sure their events are up to date -#define VPSUPTODATETIME 3600 // seconds before the event or schedule of a VPS timer needs to be refreshed +#define MINCHANNELWAIT 10 // seconds to wait between failed channel switchings +#define ACTIVITYTIMEOUT 60 // seconds before starting housekeeping +#define SHUTDOWNWAIT 300 // seconds to wait in user prompt before automatic shutdown +#define SHUTDOWNRETRY 360 // seconds before trying again to shut down +#define SHUTDOWNFORCEPROMPT 5 // seconds to wait in user prompt to allow forcing shutdown +#define SHUTDOWNCANCELPROMPT 5 // seconds to wait in user prompt to allow canceling shutdown +#define RESTARTCANCELPROMPT 5 // seconds to wait in user prompt before restarting on SIGHUP +#define MANUALSTART 600 // seconds the next timer must be in the future to assume manual start +#define CHANNELSAVEDELTA 600 // seconds before saving channels.conf after automatic modifications +#define DEVICEREADYTIMEOUT 30 // seconds to wait until all devices are ready +#define MENUTIMEOUT 120 // seconds of user inactivity after which an OSD display is closed +#define TIMERCHECKDELTA 10 // seconds between checks for timers that need to see their channel +#define TIMERDEVICETIMEOUT 8 // seconds before a device used for timer check may be reused +#define TIMERLOOKAHEADTIME 60 // seconds before a non-VPS timer starts and the channel is switched if possible +#define VPSLOOKAHEADTIME 24 // hours within which VPS timers will make sure their events are up to date +#define VPSUPTODATETIME 3600 // seconds before the event or schedule of a VPS timer needs to be refreshed #define EXIT(v) { ShutdownHandler.Exit(v); goto Exit; } @@ -1037,7 +1037,7 @@ int main(int argc, char *argv[]) break; } // Ask the final question: - if (!Interface->Confirm(tr("Press any key to cancel shutdown"), SHUTDOWNCANCELROMPT, true)) + if (!Interface->Confirm(tr("Press any key to cancel shutdown"), SHUTDOWNCANCELPROMPT, true)) // If final question was canceled, continue to be active: break; // Ok, now call the shutdown script: -- cgit v1.2.3