frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Implemented setup option "Miscellaneous/Emergency exit"

This commit is contained in:
Klaus Schmidinger 2007-11-25 14:20:03 +01:00
parent a97119d0b4
commit ade33990f5
29 changed files with 119 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HISTORY
View File

@ -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.

8
MANUAL
View File

@ -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

5
config.c
View File

@ -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();

3
config.h
View File

@ -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);

3
menu.c
View File

@ -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 --------------------------------------------------

5
po/ca_ES.po
View File

@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\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à <jvila@tinet.org>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@ -778,6 +778,9 @@ msgstr ""
msgid "Setup.Miscellaneous$Initial volume"
msgstr ""
msgid "Setup.Miscellaneous$Emergency exit"
msgstr ""
msgid "Plugins"
msgstr "Plugins"

5
po/cs_CZ.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\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 <vladimir.barta@k2atmitec.cz>\n"
"Language-Team: <vdr@linuxtv.org>\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"

5
po/da_DK.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\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 <mogens@elneff.dk>\n"
"Language-Team: <vdr@linuxtv.org>\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"

7
po/de_DE.po
View File

@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\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 <kls@cadsoft.de>\n"
"Language-Team: <vdr@linuxtv.org>\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"

5
po/el_GR.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\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 <mail@dimitrios.de>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@ -776,6 +776,9 @@ msgstr ""
msgid "Setup.Miscellaneous$Initial volume"
msgstr ""
msgid "Setup.Miscellaneous$Emergency exit"
msgstr ""
msgid "Plugins"
msgstr "ÅðåêôÜóåéò"

5
po/es_ES.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\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 <ruben.nunez@tang-it.com>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@ -776,6 +776,9 @@ msgstr ""
msgid "Setup.Miscellaneous$Initial volume"
msgstr ""
msgid "Setup.Miscellaneous$Emergency exit"
msgstr ""
msgid "Plugins"
msgstr "Plugins"

5
po/et_EE.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\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 <kasjas@hot.ee>\n"
"Language-Team: <vdr@linuxtv.org>\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"

5
po/fi_FI.po
View File

@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\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 <rahrenbe@cc.hut.fi>\n"
"Language-Team: <vdr@linuxtv.org>\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"

5
po/fr_FR.po
View File

@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\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 <mnival@club-internet.fr>\n"
"Language-Team: <vdr@linuxtv.org>\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"

5
po/hr_HR.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\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 <drazen.dupor@dupor.com>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@ -777,6 +777,9 @@ msgstr ""
msgid "Setup.Miscellaneous$Initial volume"
msgstr ""
msgid "Setup.Miscellaneous$Emergency exit"
msgstr ""
msgid "Plugins"
msgstr "Dodaci (Plugins)"

5
po/hu_HU.po
View File

@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\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 <tom@toms-cafe.de>\n"
"Language-Team: <vdr@linuxtv.org>\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"

5
po/it_IT.po
View File

@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\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 <vdr-italian@tiscali.it>\n"
"Language-Team: <vdr@linuxtv.org>\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"

5
po/nl_NL.po
View File

@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\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 <Maarten.Wisse@urz.uni-hd.de>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@ -778,6 +778,9 @@ msgstr ""
msgid "Setup.Miscellaneous$Initial volume"
msgstr ""
msgid "Setup.Miscellaneous$Emergency exit"
msgstr ""
msgid "Plugins"
msgstr "Plugins"

5
po/nn_NO.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\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 <truls@slevigen.no>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@ -777,6 +777,9 @@ msgstr ""
msgid "Setup.Miscellaneous$Initial volume"
msgstr ""
msgid "Setup.Miscellaneous$Emergency exit"
msgstr ""
msgid "Plugins"
msgstr "Plugins"

5
po/pl_PL.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\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 <mrak@gmx.de>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@ -776,6 +776,9 @@ msgstr "jak ostatnio"
msgid "Setup.Miscellaneous$Initial volume"
msgstr "Pocz徠kowa g這郾o嗆"
msgid "Setup.Miscellaneous$Emergency exit"
msgstr ""
msgid "Plugins"
msgstr "Wtyczki"

5
po/pt_PT.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\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 <pmml@netvita.pt>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@ -776,6 +776,9 @@ msgstr ""
msgid "Setup.Miscellaneous$Initial volume"
msgstr ""
msgid "Setup.Miscellaneous$Emergency exit"
msgstr ""
msgid "Plugins"
msgstr "Plugins"

5
po/ro_RO.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\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 <lucianm@users.sourceforge.net>\n"
"Language-Team: <vdr@linuxtv.org>\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"

5
po/ru_RU.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\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 <oleg@roitburd.de>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@ -777,6 +777,9 @@ msgstr "
msgid "Setup.Miscellaneous$Initial volume"
msgstr "³àÞÜÚÞáâì ßàØ ÒÚÛîçÕÝØØ"
msgid "Setup.Miscellaneous$Emergency exit"
msgstr ""
msgid "Plugins"
msgstr "¼ÞÔãÛØ àÐáèØàÕÝØï"

5
po/sl_SI.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\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 <matjaz.thaler@guest.arnes.si>\n"
"Language-Team: <vdr@linuxtv.org>\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"

5
po/sv_SE.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\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 <tomas@prybil.se>\n"
"Language-Team: <vdr@linuxtv.org>\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"

5
po/tr_TR.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\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 <oktay_73@yahoo.de>\n"
"Language-Team: <vdr@linuxtv.org>\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"

5
po/uk_UA.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.10\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\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 <yupadmin@gmail.com>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@ -776,6 +776,9 @@ msgstr "
msgid "Setup.Miscellaneous$Initial volume"
msgstr "³ãçÝöáâì ßàØ ÒÚÛîçÕÝÝö"
msgid "Setup.Miscellaneous$Emergency exit"
msgstr ""
msgid "Plugins"
msgstr "¼ÞÔãÛö àÞ×èØàÕÝÝï"

6
remux.c
View File

@ -11,7 +11,7 @@
* The cRepacker family's code was originally written by Reinhard Nissl <rnissl@gmx.de>,
* 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) {

12
shutdown.c
View File

@ -6,7 +6,7 @@
*
* Original version written by Udo Richter <udo_richter@gmx.de>.
*
* $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)