summaryrefslogtreecommitdiff
path: root/remux.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2007-02-25 10:56:29 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2007-02-25 10:56:29 +0100
commitddb7f335674d668af3dd06bd61a0853b3af60df0 (patch)
tree5d52ba7939f6aa0b18cc01f546ce5c82ae8d3b80 /remux.c
parent50b14be807e1d3002246f359de83a8a18a0e6008 (diff)
downloadvdr-ddb7f335674d668af3dd06bd61a0853b3af60df0.tar.gz
vdr-ddb7f335674d668af3dd06bd61a0853b3af60df0.tar.bz2
Rewrite of shutdown handling; implemented cPlugin::WakeupTime(); SIGHUP forces reload; cThread::EmergencyExit() replaced by ShutdownHandler.RequestEmergencyExit()
Diffstat (limited to 'remux.c')
-rw-r--r--remux.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/remux.c b/remux.c
index da805b76..ccc5b00d 100644
--- a/remux.c
+++ b/remux.c
@@ -11,13 +11,13 @@
* 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.57 2006/12/01 14:46:25 kls Exp $
+ * $Id: remux.c 1.58 2007/02/24 16:36:10 kls Exp $
*/
#include "remux.h"
#include <stdlib.h>
#include "channels.h"
-#include "thread.h"
+#include "shutdown.h"
#include "tools.h"
ePesHeader AnalyzePesHeader(const uchar *Data, int Count, int &PesPayloadOffset, bool *ContinuationHeader)
@@ -2011,7 +2011,7 @@ int cRemux::Put(const uchar *Data, int Count)
esyslog("ERROR: no useful data seen within %d byte of video stream", skipped);
skipped = -1;
if (exitOnFailure)
- cThread::EmergencyExit(true);
+ ShutdownHandler.RequestEmergencyExit();
}
else
skipped += used;
@@ -2059,7 +2059,7 @@ uchar *cRemux::Get(int &Count, uchar *PictureType)
if (pt < I_FRAME || B_FRAME < pt) {
esyslog("ERROR: unknown picture type '%d'", pt);
if (++numUPTerrors > MAXNUMUPTERRORS && exitOnFailure)
- cThread::EmergencyExit(true);
+ ShutdownHandler.RequestEmergencyExit();
}
else if (!synced) {
if (pt == I_FRAME) {