New Setup item 'Restart'

3 files changed, 49 insertions, 3 deletions

diff --git a/HISTORY b/HISTORY
index e987a995..edc08bde 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1067,7 +1067,7 @@ Video Disk Recorder Revision History
   available on any DVB card).
 - Updated French language texts (thanks to Jean-Claude Repetto).
 
-2002-03-16: Version 1.0.0pre4
+2002-03-17: Version 1.0.0pre4
 
 - Added 'Ca' code 201 for 'Cryptoworks, GOD-DIGITAL' to 'ca.conf' (thanks to
   Bernd Schweikert).
@@ -1114,3 +1114,7 @@ Video Disk Recorder Revision History
 - The "Commands" menu now automatically assigns number keys as hotkeys to the
   commands. If you have preceeded your commands with digits you may want to
   remove these from your 'commands.conf' file.
+- The new Setup item "Restart" can be used to force a complete restart of VDR,
+  including reloading the driver. Note that this can only work if VDR and the
+  driver are wrapped into a mechanism that actually performs this action if VDR
+  exits. The 'runvdr' script can be used for this purpose.
diff --git a/i18n.c b/i18n.c
index 1ed75024..c19af1d7 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.64 2002/03/16 10:04:23 kls Exp $
+ * $Id: i18n.c 1.65 2002/03/17 12:00:41 kls Exp $
  *
  * Slovenian translations provided by Miha Setina <mihasetina@softhome.net>
  * Italian   translations provided by Alberto Carraro <bertocar@tin.it>
@@ -470,6 +470,26 @@ const tPhrase Phrases[] = {
     "Avbryte redigering?",
     "Peruutetaanko muokkaus?",
   },
+  { "Really restart?",
+    "Wirklich neu starten?",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
+  { "Recording - restart anyway?",
+    "Aufnahme läuft - trotzdem neu starten?",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
   { "Recording - shut down anyway?",
     "Aufnahme läuft - trotzdem ausschalten?",
     "", // TODO
@@ -934,6 +954,16 @@ const tPhrase Phrases[] = {
     "", // TODO
     "", // TODO
   },
+  { "Restart",
+    "Neustart",
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+    "", // TODO
+  },
   // Setup parameters:
   { "OSD-Language",
     "OSD-Sprache",
diff --git a/menu.c b/menu.c
index 01ba8bb5..80d7c8e4 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.169 2002/03/16 16:44:15 kls Exp $
+ * $Id: menu.c 1.170 2002/03/17 12:01:08 kls Exp $
  */
 
 #include "menu.h"
@@ -2142,6 +2142,7 @@ void cMenuSetupMisc::Set(void)
 class cMenuSetup : public cOsdMenu {
 private:
   virtual void Set(void);
+  eOSState Restart(void);
 public:
   cMenuSetup(void);
   virtual eOSState ProcessKey(eKeys Key);
@@ -2166,6 +2167,16 @@ void cMenuSetup::Set(void)
   Add(new cOsdItem(hk(tr("Recording")),     osUser6));
   Add(new cOsdItem(hk(tr("Replay")),        osUser7));
   Add(new cOsdItem(hk(tr("Miscellaneous")), osUser8));
+  Add(new cOsdItem(hk(tr("Restart")),       osUser9));
+}
+
+eOSState cMenuSetup::Restart(void)
+{
+  if (Interface->Confirm(cRecordControls::Active() ? tr("Recording - restart anyway?") : tr("Really restart?"))) {
+     cThread::EmergencyExit(true);
+     return osEnd;
+     }
+  return osContinue;
 }
 
 eOSState cMenuSetup::ProcessKey(eKeys Key)
@@ -2182,6 +2193,7 @@ eOSState cMenuSetup::ProcessKey(eKeys Key)
     case osUser6: return AddSubMenu(new cMenuSetupRecord);
     case osUser7: return AddSubMenu(new cMenuSetupReplay);
     case osUser8: return AddSubMenu(new cMenuSetupMisc);
+    case osUser9: return Restart();
     default: ;
     }
   if (Setup.OSDLanguage != osdLanguage) {