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

---
 svdrp.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'svdrp.c')

diff --git a/svdrp.c b/svdrp.c
index 9d70732..b59cb39 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.38 2002/06/09 15:56:54 kls Exp $
+ * $Id: svdrp.c 1.39 2002/08/11 12:01:28 kls Exp $
  */
 
 #include "svdrp.h"
@@ -37,6 +37,7 @@ cSocket::cSocket(int Port, int Queue)
 {
   port = Port;
   sock = -1;
+  queue = Queue;
 }
 
 cSocket::~cSocket()
@@ -320,7 +321,7 @@ cSVDRP::cSVDRP(int Port)
 cSVDRP::~cSVDRP()
 {
   Close();
-  delete message;
+  free(message);
 }
 
 void cSVDRP::Close(bool Timeout)
@@ -370,7 +371,7 @@ void cSVDRP::Reply(int Code, const char *fmt, ...)
                  }
               s = n ? n + 1 : NULL;
               }
-        delete buffer;
+        free(buffer);
         va_end(ap);
         }
      else {
@@ -685,7 +686,7 @@ void cSVDRP::CmdLSTR(const char *Option)
            if (recording->Summary()) {
               char *summary = strdup(recording->Summary());
               Reply(250, "%s", strreplace(summary,'\n','|'));
-              delete summary;
+              free(summary);
               }
            else
               Reply(550, "No summary availabe");
@@ -736,7 +737,7 @@ void cSVDRP::CmdLSTT(const char *Option)
 void cSVDRP::CmdMESG(const char *Option)
 {
   if (*Option) {
-     delete message;
+     free(message);
      message = strdup(Option);
      isyslog("SVDRP message: '%s'", message);
      Reply(250, "Message stored");
-- 
cgit v1.2.3