From ade33990f5b05ecf1446c93eb6bc5d93bbb3d8b7 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 25 Nov 2007 14:20:03 +0100 Subject: [PATCH] Implemented setup option "Miscellaneous/Emergency exit" --- HISTORY | 2 ++ MANUAL | 8 ++++++++ config.c | 5 ++++- config.h | 3 ++- menu.c | 3 ++- po/ca_ES.po | 5 ++++- po/cs_CZ.po | 5 ++++- po/da_DK.po | 5 ++++- po/de_DE.po | 7 +++++-- po/el_GR.po | 5 ++++- po/es_ES.po | 5 ++++- po/et_EE.po | 5 ++++- po/fi_FI.po | 5 ++++- po/fr_FR.po | 5 ++++- po/hr_HR.po | 5 ++++- po/hu_HU.po | 5 ++++- po/it_IT.po | 5 ++++- po/nl_NL.po | 5 ++++- po/nn_NO.po | 5 ++++- po/pl_PL.po | 5 ++++- po/pt_PT.po | 5 ++++- po/ro_RO.po | 5 ++++- po/ru_RU.po | 5 ++++- po/sl_SI.po | 5 ++++- po/sv_SE.po | 5 ++++- po/tr_TR.po | 5 ++++- po/uk_UA.po | 5 ++++- remux.c | 6 ++++-- shutdown.c | 12 ++++++++---- 29 files changed, 119 insertions(+), 32 deletions(-) diff --git a/HISTORY b/HISTORY index c40f6370..61c1f238 100644 --- a/HISTORY +++ b/HISTORY @@ -5533,3 +5533,5 @@ Video Disk Recorder Revision History - Fixed the declaration of cSubtitleObject::Decode8BppCodeString() (thanks to Gregoire Favre). +- The new setup option "Miscellaneous/Emergency exit" can be used to turn off + the automatic restart of VDR in case a recording fails for some reason. diff --git a/MANUAL b/MANUAL index 106533c1..5bcadbf7 100644 --- a/MANUAL +++ b/MANUAL @@ -850,6 +850,14 @@ Version 1.4 VDR was stopped will be used. The valid range is from 0 (silent) to 255 (loudest). + Emergency exit = yes If, for some reason, a recording fails because the video + data stream is broken, or the CAM doesn't decrypt etc., + VDR automatically exits in order to allow the surrounding + wrapper script to reload the DVB drivers. If this option + is set to 'no', the "emergency exit" will be ignored, + hoping that the problem will go away by itself (as, for + instance, with bad weather conditions). + * Executing system commands The "VDR" menu option "Commands" allows you to execute any system commands diff --git a/config.c b/config.c index 1305ffbb..31365f80 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.157 2007/10/06 14:28:58 kls Exp $ + * $Id: config.c 1.158 2007/11/25 13:46:27 kls Exp $ */ #include "config.h" @@ -289,6 +289,7 @@ cSetup::cSetup(void) CurrentDolby = 0; InitialChannel = 0; InitialVolume = -1; + EmergencyExit = 1; } cSetup& cSetup::operator= (const cSetup &s) @@ -464,6 +465,7 @@ bool cSetup::Parse(const char *Name, const char *Value) else if (!strcasecmp(Name, "CurrentDolby")) CurrentDolby = atoi(Value); else if (!strcasecmp(Name, "InitialChannel")) InitialChannel = atoi(Value); else if (!strcasecmp(Name, "InitialVolume")) InitialVolume = atoi(Value); + else if (!strcasecmp(Name, "EmergencyExit")) EmergencyExit = atoi(Value); else return false; return true; @@ -546,6 +548,7 @@ bool cSetup::Save(void) Store("CurrentDolby", CurrentDolby); Store("InitialChannel", InitialChannel); Store("InitialVolume", InitialVolume); + Store("EmergencyExit", EmergencyExit); Sort(); diff --git a/config.h b/config.h index 72204440..ba3a3841 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.302 2007/11/25 13:34:41 kls Exp $ + * $Id: config.h 1.303 2007/11/25 13:45:48 kls Exp $ */ #ifndef __CONFIG_H @@ -266,6 +266,7 @@ public: int CurrentDolby; int InitialChannel; int InitialVolume; + int EmergencyExit; int __EndData__; cSetup(void); cSetup& operator= (const cSetup &s); diff --git a/menu.c b/menu.c index 7b8ce9a2..06694fdc 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.465 2007/11/03 15:02:00 kls Exp $ + * $Id: menu.c 1.466 2007/11/25 13:47:38 kls Exp $ */ #include "menu.h" @@ -2760,6 +2760,7 @@ cMenuSetupMisc::cMenuSetupMisc(void) Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Channel entry timeout (ms)"), &data.ChannelEntryTimeout, 0)); Add(new cMenuEditChanItem(tr("Setup.Miscellaneous$Initial channel"), &data.InitialChannel, tr("Setup.Miscellaneous$as before"))); Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Initial volume"), &data.InitialVolume, -1, 255, tr("Setup.Miscellaneous$as before"))); + Add(new cMenuEditBoolItem(tr("Setup.Miscellaneous$Emergency exit"), &data.EmergencyExit)); } // --- cMenuSetupPluginItem -------------------------------------------------- diff --git a/po/ca_ES.po b/po/ca_ES.po index c874f431..fa5c8470 100644 --- a/po/ca_ES.po +++ b/po/ca_ES.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-13 11:29+0200\n" +"POT-Creation-Date: 2007-11-25 14:59+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Jordi Vilà \n" "Language-Team: \n" @@ -778,6 +778,9 @@ msgstr "" msgid "Setup.Miscellaneous$Initial volume" msgstr "" +msgid "Setup.Miscellaneous$Emergency exit" +msgstr "" + msgid "Plugins" msgstr "Plugins" diff --git a/po/cs_CZ.po b/po/cs_CZ.po index cdd5715b..c3ae43cd 100644 --- a/po/cs_CZ.po +++ b/po/cs_CZ.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-13 11:29+0200\n" +"POT-Creation-Date: 2007-11-25 14:59+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Vladimír Bárta \n" "Language-Team: \n" @@ -776,6 +776,9 @@ msgstr "jako naposledy" msgid "Setup.Miscellaneous$Initial volume" msgstr "Hlasitost po spu¹tìní" +msgid "Setup.Miscellaneous$Emergency exit" +msgstr "" + msgid "Plugins" msgstr "Moduly" diff --git a/po/da_DK.po b/po/da_DK.po index b11e105a..e08e7e46 100644 --- a/po/da_DK.po +++ b/po/da_DK.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-13 11:29+0200\n" +"POT-Creation-Date: 2007-11-25 14:59+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Mogens Elneff \n" "Language-Team: \n" @@ -776,6 +776,9 @@ msgstr "som f msgid "Setup.Miscellaneous$Initial volume" msgstr "Lydstyrke ved opstart" +msgid "Setup.Miscellaneous$Emergency exit" +msgstr "" + msgid "Plugins" msgstr "Plugins" diff --git a/po/de_DE.po b/po/de_DE.po index 621c3fc3..05f139e5 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-13 11:29+0200\n" -"PO-Revision-Date: 2007-08-12 14:17+0200\n" +"POT-Creation-Date: 2007-11-25 14:59+0100\n" +"PO-Revision-Date: 2007-11-25 15:19+0200\n" "Last-Translator: Klaus Schmidinger \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -776,6 +776,9 @@ msgstr "wie vorher" msgid "Setup.Miscellaneous$Initial volume" msgstr "Lautstärke beim Einschalten" +msgid "Setup.Miscellaneous$Emergency exit" +msgstr "Notausstieg" + msgid "Plugins" msgstr "Plugins" diff --git a/po/el_GR.po b/po/el_GR.po index 1e79779b..4595fb1f 100644 --- a/po/el_GR.po +++ b/po/el_GR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-13 11:29+0200\n" +"POT-Creation-Date: 2007-11-25 14:59+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Dimitrios Dimitrakos \n" "Language-Team: \n" @@ -776,6 +776,9 @@ msgstr "" msgid "Setup.Miscellaneous$Initial volume" msgstr "" +msgid "Setup.Miscellaneous$Emergency exit" +msgstr "" + msgid "Plugins" msgstr "ÅðåêôÜóåéò" diff --git a/po/es_ES.po b/po/es_ES.po index 39450a86..a90a74e0 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-13 11:29+0200\n" +"POT-Creation-Date: 2007-11-25 14:59+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Ruben Nunez Francisco \n" "Language-Team: \n" @@ -776,6 +776,9 @@ msgstr "" msgid "Setup.Miscellaneous$Initial volume" msgstr "" +msgid "Setup.Miscellaneous$Emergency exit" +msgstr "" + msgid "Plugins" msgstr "Plugins" diff --git a/po/et_EE.po b/po/et_EE.po index f8edfc14..d5c47cd0 100644 --- a/po/et_EE.po +++ b/po/et_EE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-13 11:29+0200\n" +"POT-Creation-Date: 2007-11-25 14:59+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Arthur Konovalov \n" "Language-Team: \n" @@ -776,6 +776,9 @@ msgstr "nagu enne" msgid "Setup.Miscellaneous$Initial volume" msgstr "Helitugevus käivitamisel" +msgid "Setup.Miscellaneous$Emergency exit" +msgstr "" + msgid "Plugins" msgstr "Laiendusmoodulid" diff --git a/po/fi_FI.po b/po/fi_FI.po index 6ab26386..b0de1e51 100644 --- a/po/fi_FI.po +++ b/po/fi_FI.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-13 11:29+0200\n" +"POT-Creation-Date: 2007-11-25 14:59+0100\n" "PO-Revision-Date: 2007-08-15 15:52+0200\n" "Last-Translator: Rolf Ahrenberg \n" "Language-Team: \n" @@ -779,6 +779,9 @@ msgstr "edellinen" msgid "Setup.Miscellaneous$Initial volume" msgstr "Äänenvoimakkuus käynnistettäessä" +msgid "Setup.Miscellaneous$Emergency exit" +msgstr "" + msgid "Plugins" msgstr "Laajennokset" diff --git a/po/fr_FR.po b/po/fr_FR.po index de25e804..35d35af5 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-13 11:29+0200\n" +"POT-Creation-Date: 2007-11-25 14:59+0100\n" "PO-Revision-Date: 2007-10-18 16:12+0100\n" "Last-Translator: Michael Nival \n" "Language-Team: \n" @@ -782,6 +782,9 @@ msgstr "comme avant" msgid "Setup.Miscellaneous$Initial volume" msgstr "Volume initial" +msgid "Setup.Miscellaneous$Emergency exit" +msgstr "" + msgid "Plugins" msgstr "Plugins" diff --git a/po/hr_HR.po b/po/hr_HR.po index f0712a0c..a7bf2e17 100644 --- a/po/hr_HR.po +++ b/po/hr_HR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-13 11:29+0200\n" +"POT-Creation-Date: 2007-11-25 14:59+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Drazen Dupor \n" "Language-Team: \n" @@ -777,6 +777,9 @@ msgstr "" msgid "Setup.Miscellaneous$Initial volume" msgstr "" +msgid "Setup.Miscellaneous$Emergency exit" +msgstr "" + msgid "Plugins" msgstr "Dodaci (Plugins)" diff --git a/po/hu_HU.po b/po/hu_HU.po index 6f8b9add..26722c19 100644 --- a/po/hu_HU.po +++ b/po/hu_HU.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-13 11:29+0200\n" +"POT-Creation-Date: 2007-11-25 14:59+0100\n" "PO-Revision-Date: 2007-10-13 14:32+0200\n" "Last-Translator: Thomas Günther \n" "Language-Team: \n" @@ -778,6 +778,9 @@ msgstr "ahogy az el msgid "Setup.Miscellaneous$Initial volume" msgstr "Hangerõ a bekapcsolásnál" +msgid "Setup.Miscellaneous$Emergency exit" +msgstr "" + msgid "Plugins" msgstr "Plugins" diff --git a/po/it_IT.po b/po/it_IT.po index 18eced8b..2f88680b 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-13 11:29+0200\n" +"POT-Creation-Date: 2007-11-25 14:59+0100\n" "PO-Revision-Date: 2007-10-16 02:15+0100\n" "Last-Translator: Diego Pierotto \n" "Language-Team: \n" @@ -779,6 +779,9 @@ msgstr "come prima" msgid "Setup.Miscellaneous$Initial volume" msgstr "Volume iniziale" +msgid "Setup.Miscellaneous$Emergency exit" +msgstr "" + msgid "Plugins" msgstr "Plugins" diff --git a/po/nl_NL.po b/po/nl_NL.po index c8a9b368..e945befa 100644 --- a/po/nl_NL.po +++ b/po/nl_NL.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-13 11:29+0200\n" +"POT-Creation-Date: 2007-11-25 14:59+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Maarten Wisse \n" "Language-Team: \n" @@ -778,6 +778,9 @@ msgstr "" msgid "Setup.Miscellaneous$Initial volume" msgstr "" +msgid "Setup.Miscellaneous$Emergency exit" +msgstr "" + msgid "Plugins" msgstr "Plugins" diff --git a/po/nn_NO.po b/po/nn_NO.po index 80639922..bd2238e3 100644 --- a/po/nn_NO.po +++ b/po/nn_NO.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-13 11:29+0200\n" +"POT-Creation-Date: 2007-11-25 14:59+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Truls Slevigen \n" "Language-Team: \n" @@ -777,6 +777,9 @@ msgstr "" msgid "Setup.Miscellaneous$Initial volume" msgstr "" +msgid "Setup.Miscellaneous$Emergency exit" +msgstr "" + msgid "Plugins" msgstr "Plugins" diff --git a/po/pl_PL.po b/po/pl_PL.po index 96638408..d8be8772 100644 --- a/po/pl_PL.po +++ b/po/pl_PL.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-13 11:29+0200\n" +"POT-Creation-Date: 2007-11-25 14:59+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Michael Rakowski \n" "Language-Team: \n" @@ -776,6 +776,9 @@ msgstr "jak ostatnio" msgid "Setup.Miscellaneous$Initial volume" msgstr "Pocz±tkowa g³o¶no¶æ" +msgid "Setup.Miscellaneous$Emergency exit" +msgstr "" + msgid "Plugins" msgstr "Wtyczki" diff --git a/po/pt_PT.po b/po/pt_PT.po index 8439538f..1786077d 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-13 11:29+0200\n" +"POT-Creation-Date: 2007-11-25 14:59+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Paulo Lopes \n" "Language-Team: \n" @@ -776,6 +776,9 @@ msgstr "" msgid "Setup.Miscellaneous$Initial volume" msgstr "" +msgid "Setup.Miscellaneous$Emergency exit" +msgstr "" + msgid "Plugins" msgstr "Plugins" diff --git a/po/ro_RO.po b/po/ro_RO.po index 52b34521..72fc8b9b 100644 --- a/po/ro_RO.po +++ b/po/ro_RO.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-13 11:29+0200\n" +"POT-Creation-Date: 2007-11-25 14:59+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Lucian Muresan \n" "Language-Team: \n" @@ -777,6 +777,9 @@ msgstr "ca mai msgid "Setup.Miscellaneous$Initial volume" msgstr "Volumul la pornire" +msgid "Setup.Miscellaneous$Emergency exit" +msgstr "" + msgid "Plugins" msgstr "Plugin-uri" diff --git a/po/ru_RU.po b/po/ru_RU.po index 6e4f41ac..6f6038ed 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-13 11:29+0200\n" +"POT-Creation-Date: 2007-11-25 14:59+0100\n" "PO-Revision-Date: 2007-11-05 14:24+0100\n" "Last-Translator: Oleg Roitburd \n" "Language-Team: \n" @@ -777,6 +777,9 @@ msgstr " msgid "Setup.Miscellaneous$Initial volume" msgstr "³àÞÜÚÞáâì ßàØ ÒÚÛîçÕÝØØ" +msgid "Setup.Miscellaneous$Emergency exit" +msgstr "" + msgid "Plugins" msgstr "¼ÞÔãÛØ àÐáèØàÕÝØï" diff --git a/po/sl_SI.po b/po/sl_SI.po index da1de4de..002b82cd 100644 --- a/po/sl_SI.po +++ b/po/sl_SI.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-13 11:29+0200\n" +"POT-Creation-Date: 2007-11-25 14:59+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Matjaz Thaler \n" "Language-Team: \n" @@ -777,6 +777,9 @@ msgstr "kot prej" msgid "Setup.Miscellaneous$Initial volume" msgstr "Privzeta glasnost" +msgid "Setup.Miscellaneous$Emergency exit" +msgstr "" + msgid "Plugins" msgstr "Vstavki" diff --git a/po/sv_SE.po b/po/sv_SE.po index cde4ca7d..40d3c252 100644 --- a/po/sv_SE.po +++ b/po/sv_SE.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-13 11:29+0200\n" +"POT-Creation-Date: 2007-11-25 14:59+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Tomas Prybil \n" "Language-Team: \n" @@ -777,6 +777,9 @@ msgstr "som f msgid "Setup.Miscellaneous$Initial volume" msgstr "Ljudstyrka vid uppstart" +msgid "Setup.Miscellaneous$Emergency exit" +msgstr "" + msgid "Plugins" msgstr "Moduler" diff --git a/po/tr_TR.po b/po/tr_TR.po index 461a3229..57a73090 100644 --- a/po/tr_TR.po +++ b/po/tr_TR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-13 11:29+0200\n" +"POT-Creation-Date: 2007-11-25 14:59+0100\n" "PO-Revision-Date: 2007-08-24 14:37+0200\n" "Last-Translator: Oktay Yolgeçen \n" "Language-Team: \n" @@ -776,6 +776,9 @@ msgstr " msgid "Setup.Miscellaneous$Initial volume" msgstr "Açýlýþdaki ses" +msgid "Setup.Miscellaneous$Emergency exit" +msgstr "" + msgid "Plugins" msgstr "Eklentiler" diff --git a/po/uk_UA.po b/po/uk_UA.po index fdddc901..70afcaf8 100644 --- a/po/uk_UA.po +++ b/po/uk_UA.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.10\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-11-01 11:36+0100\n" +"POT-Creation-Date: 2007-11-25 14:59+0100\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Yarema Aka Knedlyk \n" "Language-Team: \n" @@ -776,6 +776,9 @@ msgstr " msgid "Setup.Miscellaneous$Initial volume" msgstr "³ãçÝöáâì ßàØ ÒÚÛîçÕÝÝö" +msgid "Setup.Miscellaneous$Emergency exit" +msgstr "" + msgid "Plugins" msgstr "¼ÞÔãÛö àÞ×èØàÕÝÝï" diff --git a/remux.c b/remux.c index e265c40f..9b9aa24f 100644 --- a/remux.c +++ b/remux.c @@ -11,7 +11,7 @@ * The cRepacker family's code was originally written by Reinhard Nissl , * and adapted to the VDR coding style by Klaus.Schmidinger@cadsoft.de. * - * $Id: remux.c 1.63 2007/11/18 14:45:28 kls Exp $ + * $Id: remux.c 1.64 2007/11/25 13:56:03 kls Exp $ */ #include "remux.h" @@ -2099,8 +2099,10 @@ uchar *cRemux::Get(int &Count, uchar *PictureType) if (pt != NO_PICTURE) { if (pt < I_FRAME || B_FRAME < pt) { esyslog("ERROR: unknown picture type '%d'", pt); - if (++numUPTerrors > MAXNUMUPTERRORS && exitOnFailure) + if (++numUPTerrors > MAXNUMUPTERRORS && exitOnFailure) { ShutdownHandler.RequestEmergencyExit(); + numUPTerrors = 0; + } } else if (!synced) { if (pt == I_FRAME) { diff --git a/shutdown.c b/shutdown.c index 4fde5440..bf548746 100644 --- a/shutdown.c +++ b/shutdown.c @@ -6,7 +6,7 @@ * * Original version written by Udo Richter . * - * $Id: shutdown.c 1.2 2007/10/19 14:33:40 kls Exp $ + * $Id: shutdown.c 1.3 2007/11/25 13:49:27 kls Exp $ */ #include "shutdown.h" @@ -95,9 +95,13 @@ cShutdownHandler::~cShutdownHandler() void cShutdownHandler::RequestEmergencyExit(void) { - esyslog("initiating emergency exit"); - emergencyExitRequested = true; - Exit(1); + if (Setup.EmergencyExit) { + esyslog("initiating emergency exit"); + emergencyExitRequested = true; + Exit(1); + } + else + dsyslog("emergency exit request ignored according to setup"); } void cShutdownHandler::CheckManualStart(int ManualStart)