diff options
Diffstat (limited to 'vdr.c')
| -rw-r--r-- | vdr.c | 13 |
1 files changed, 8 insertions, 5 deletions
@@ -22,7 +22,7 @@ * * The project's page is at http://www.cadsoft.de/vdr * - * $Id: vdr.c 1.300 2007/08/26 14:36:48 kls Exp $ + * $Id: vdr.c 1.302 2007/11/03 14:46:29 kls Exp $ */ #include <getopt.h> @@ -181,6 +181,7 @@ int main(int argc, char *argv[]) #define DEFAULTSVDRPPORT 2001 #define DEFAULTWATCHDOG 0 // seconds +#define DEFAULTCONFDIR CONFDIR #define DEFAULTPLUGINDIR PLUGINDIR #define DEFAULTEPGDATAFILENAME "epg.data" @@ -382,8 +383,7 @@ int main(int argc, char *argv[]) if (DisplayHelp) { printf("Usage: vdr [OPTIONS]\n\n" // for easier orientation, this is column 80| " -a CMD, --audio=CMD send Dolby Digital audio to stdin of command CMD\n" - " -c DIR, --config=DIR read config files from DIR (default is to read them\n" - " from the video directory)\n" + " -c DIR, --config=DIR read config files from DIR (default: %s)\n" " -d, --daemon run in daemon mode\n" " -D NUM, --device=NUM use only the given DVB device (NUM = 0, 1, 2...)\n" " there may be several -D options (default: all DVB\n" @@ -425,6 +425,7 @@ int main(int argc, char *argv[]) " -w SEC, --watchdog=SEC activate the watchdog timer with a timeout of SEC\n" " seconds (default: %d); '0' disables the watchdog\n" "\n", + DEFAULTCONFDIR, DEFAULTEPGDATAFILENAME, DEFAULTPLUGINDIR, LIRC_DEVICE, @@ -523,6 +524,7 @@ int main(int argc, char *argv[]) int PreviousChannel[2] = { 1, 1 }; int PreviousChannelIndex = 0; time_t LastChannelChanged = time(NULL); + time_t LastInteract = 0; int MaxLatencyTime = 0; bool InhibitEpgScan = false; bool IsInfoMenu = false; @@ -536,7 +538,7 @@ int main(int argc, char *argv[]) // Configuration data: if (!ConfigDirectory) - ConfigDirectory = CONFDIR; + ConfigDirectory = DEFAULTCONFDIR; cPlugin::SetConfigDirectory(ConfigDirectory); cThemes::SetThemesDirectory(AddDirectory(ConfigDirectory, "themes")); @@ -1069,6 +1071,7 @@ int main(int argc, char *argv[]) } Interact = Menu ? Menu : cControl::Control(); // might have been closed in the mean time if (Interact) { + LastInteract = Now; eOSState state = Interact->ProcessKey(key); if (state == osUnknown && Interact != cControl::Control()) { if (ISMODELESSKEY(key) && cControl::Control()) { @@ -1195,7 +1198,7 @@ int main(int argc, char *argv[]) ShutdownHandler.countdown.Cancel(); } - if (!Interact && !cRecordControls::Active() && !cCutter::Active() && !Interface->HasSVDRPConnection() && (Now - cRemote::LastActivity()) > ACTIVITYTIMEOUT) { + if ((Now - LastInteract) > ACTIVITYTIMEOUT && !cRecordControls::Active() && !cCutter::Active() && !Interface->HasSVDRPConnection() && (Now - cRemote::LastActivity()) > ACTIVITYTIMEOUT) { // Handle housekeeping tasks // Shutdown: |