summaryrefslogtreecommitdiff
path: root/remux.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <kls (at) cadsoft (dot) de>2002-05-13 18:00:00 +0200
committerKlaus Schmidinger <kls (at) cadsoft (dot) de>2002-05-13 18:00:00 +0200
commitd07e3829f7c44d713b2677ef73f864af80b3dea3 (patch)
tree8d6d89b303900b502ec52e83e408795a5728db52 /remux.c
parent803c6c6bf6340302f78171892bef599aa272c266 (diff)
downloadvdr-patch-lnbsharing-d07e3829f7c44d713b2677ef73f864af80b3dea3.tar.gz
vdr-patch-lnbsharing-d07e3829f7c44d713b2677ef73f864af80b3dea3.tar.bz2
Version 1.1.2vdr-1.1.2
- Changed the cPlugin::Start() function to return a boolean value that indicates if the plugin will not be able to perform its task (suggested by Stefan Huelswitt). - Added the cPlugin::Housekeeping() function (suggested by Stefan Huelswitt). - Updated channels.conf.cable (thanks to Uwe Scheffler). - Added 'insert' capabilities to cList (suggested by Stefan Huelswitt). - Changed the 'package' target in the plugin's Makefile to produce a package that expands to a directory with just the plugin name and version number (suggested by Stefan Huelswitt). - Made the config directory available to plugins (suggested by Stefan Huelswitt). See PLUGINS.html, section "Configuration files" for details. - Improved the [eid]syslog() macros, so that the LOG_... macros don't need to be given any more.
Diffstat (limited to 'remux.c')
-rw-r--r--remux.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/remux.c b/remux.c
index 99a6440..08d632c 100644
--- a/remux.c
+++ b/remux.c
@@ -8,7 +8,7 @@
* the Linux DVB driver's 'tuxplayer' example and were rewritten to suit
* VDR's needs.
*
- * $Id: remux.c 1.8 2002/02/03 16:20:37 kls Exp $
+ * $Id: remux.c 1.9 2002/05/13 16:31:38 kls Exp $
*/
/* The calling interface of the 'cRemux::Process()' function is defined
@@ -154,7 +154,7 @@ cTS2PES::cTS2PES(uint8_t *ResultBuffer, int *ResultCount, int Size, uint8_t Audi
audioCid = AudioCid;
if (!(buf = new uint8_t[size]))
- esyslog(LOG_ERR, "Not enough memory for ts_transform");
+ esyslog("Not enough memory for ts_transform");
reset_ipack();
}
@@ -172,7 +172,7 @@ void cTS2PES::Clear(void)
void cTS2PES::store(uint8_t *Data, int Count)
{
if (*resultCount + Count > RESULTBUFFERSIZE) {
- esyslog(LOG_ERR, "ERROR: result buffer overflow (%d + %d > %d)", *resultCount, Count, RESULTBUFFERSIZE);
+ esyslog("ERROR: result buffer overflow (%d + %d > %d)", *resultCount, Count, RESULTBUFFERSIZE);
Count = RESULTBUFFERSIZE - *resultCount;
}
memcpy(resultBuffer + *resultCount, Data, Count);
@@ -309,7 +309,7 @@ void cTS2PES::instant_repack(const uint8_t *Buf, int Count)
if ((flag1 & 0xC0) == 0x80 )
mpeg = 2;
else {
- esyslog(LOG_INFO, "ERROR: can't record MPEG1!");
+ esyslog("ERROR: can't record MPEG1!");
hlength = 0;
which = 0;
mpeg = 1;
@@ -525,7 +525,7 @@ XXX*/
used++;
}
if (used)
- esyslog(LOG_ERR, "ERROR: skipped %d byte to sync on TS packet", used);
+ esyslog("ERROR: skipped %d byte to sync on TS packet", used);
// Convert incoming TS data into multiplexed PES:
@@ -570,7 +570,7 @@ XXX*/
if (!synced && skipped >= 0) {
if (skipped > MAXNONUSEFULDATA) {
- esyslog(LOG_ERR, "ERROR: no useful data seen within %d byte of video stream", skipped);
+ esyslog("ERROR: no useful data seen within %d byte of video stream", skipped);
skipped = -1;
if (exitOnFailure)
cThread::EmergencyExit(true);
@@ -595,7 +595,7 @@ XXX*/
return NULL; // no useful data found, wait for more
if (pt != NO_PICTURE) {
if (pt < I_FRAME || B_FRAME < pt)
- esyslog(LOG_ERR, "ERROR: unknown picture type '%d'", pt);
+ esyslog("ERROR: unknown picture type '%d'", pt);
else if (!synced) {
if (pt == I_FRAME) {
resultDelivered = i; // will drop everything before this position