From ed643353b100bee75459c4ef2d0330e7a04e1f2a Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Fri, 16 Aug 2002 18:00:00 +0200
Subject: =?UTF-8?q?Version=201.1.7=20-=20Adapted=20VDR=20to=20the=20NEWSTR?=
 =?UTF-8?q?UCT=20driver.=20To=20use=20the=20new=20driver,=20compile=20VDR?=
 =?UTF-8?q?=20with=20=20=20'make=20NEWSTRUCT=3D1'=20(thanks=20to=20Holger?=
 =?UTF-8?q?=20W=C3=A4chtler=20for=20some=20valuable=20advice).=20=20=20By?=
 =?UTF-8?q?=20default=20it=20currently=20still=20uses=20the=20old=20driver?=
 =?UTF-8?q?.=20-=20Added=20some=20missing=20#includes=20(thanks=20to=20Mar?=
 =?UTF-8?q?tin=20Hammerschmid).=20-=20Changed=20the=20log=20error=20messag?=
 =?UTF-8?q?e=20"can't=20record=20MPEG1!"=20to=20"error=20in=20data=20strea?=
 =?UTF-8?q?m!",=20=20=20since=20the=20mentioning=20of=20MPEG1=20has=20irri?=
 =?UTF-8?q?tated=20many=20people.=20-=20Consistently=20using=20malloc/free?=
 =?UTF-8?q?=20and=20new/delete=20(thanks=20to=20Andreas=20Schultz).=20-=20?=
 =?UTF-8?q?Temporarily=20made=20cDevice::ProvidesCa()=20virtual=20(Andreas?=
 =?UTF-8?q?=20Schultz=20needs=20this=20=20=20in=20his=20DXR3=20plugin).=20?=
 =?UTF-8?q?-=20cDevice=20no=20longer=20exposes=20a=20file=20handle=20to=20?=
 =?UTF-8?q?cPlayer.=20A=20derived=20cPlayer=20class=20=20=20can=20now=20ca?=
 =?UTF-8?q?ll=20DevicePoll()=20to=20see=20whether=20the=20replay=20device?=
 =?UTF-8?q?=20is=20ready=20for=20=20=20further=20data.=20A=20derived=20cDe?=
 =?UTF-8?q?vice=20class=20must=20implement=20Poll()=20and=20shall=20=20=20?=
 =?UTF-8?q?check=20if=20any=20of=20its=20file=20handles=20is=20ready=20for?=
 =?UTF-8?q?=20data.=20-=20Implemented=20several=20replay=20modes=20to=20al?=
 =?UTF-8?q?low=20players=20that=20play=20only=20audio=20(thanks=20=20=20to?=
 =?UTF-8?q?=20Stefan=20Huelswitt).=20-=20Improved=20cCondVar::Wait()=20and?=
 =?UTF-8?q?=20implemented=20cCondVar::TimedWait()=20(thanks=20to=20=20=20S?=
 =?UTF-8?q?tefan=20Huelswitt).=20-=20VDR=20no=20longer=20gives=20up=20if?=
 =?UTF-8?q?=20there=20is=20no=20DVB=20device.=20It=20continues=20to=20work?=
 =?UTF-8?q?=20if=20=20=20there=20is=20at=20least=20one=20device,=20either?=
 =?UTF-8?q?=20a=20DVB=20device=20found=20by=20the=20core=20VDR=20code=20?=
 =?UTF-8?q?=20=20itself,=20or=20a=20device=20implemented=20by=20a=20plugin?=
 =?UTF-8?q?.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 remux.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'remux.c')

diff --git a/remux.c b/remux.c
index 08d632c..6a2753b 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.9 2002/05/13 16:31:38 kls Exp $
+ * $Id: remux.c 1.11 2002/08/11 11:48:34 kls Exp $
  */
 
 /* The calling interface of the 'cRemux::Process()' function is defined
@@ -66,6 +66,7 @@
 */
 
 #include "remux.h"
+#include <stdlib.h>
 #include "thread.h"
 #include "tools.h"
 
@@ -153,7 +154,7 @@ cTS2PES::cTS2PES(uint8_t *ResultBuffer, int *ResultCount, int Size, uint8_t Audi
   size = Size;
   audioCid = AudioCid;
 
-  if (!(buf = new uint8_t[size]))
+  if (!(buf = MALLOC(uint8_t, size)))
      esyslog("Not enough memory for ts_transform");
 
   reset_ipack();
@@ -161,7 +162,7 @@ cTS2PES::cTS2PES(uint8_t *ResultBuffer, int *ResultCount, int Size, uint8_t Audi
 
 cTS2PES::~cTS2PES()
 {
-  delete buf;
+  free(buf);
 }
 
 void cTS2PES::Clear(void)
@@ -309,7 +310,7 @@ void cTS2PES::instant_repack(const uint8_t *Buf, int Count)
                      if ((flag1 & 0xC0) == 0x80 )
                         mpeg = 2;
                      else {
-                        esyslog("ERROR: can't record MPEG1!");
+                        esyslog("ERROR: error in data stream!");
                         hlength = 0;
                         which = 0;
                         mpeg = 1;
-- 
cgit v1.2.3