From 04a5985dcc0a24a1ff7b8debd5e88d4de46bb989 Mon Sep 17 00:00:00 2001
From: lordjaxom <lordjaxom>
Date: Tue, 25 Jan 2005 14:14:43 +0000
Subject: [PATCH] - updated to 1.3.19

---
 client/assembler.c |  4 ++--
 client/device.c    | 16 +++++++++-------
 client/device.h    |  4 ++--
 remux/tsremux.h    |  2 ++
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/client/assembler.c b/client/assembler.c
index 9e36204..a32b2ed 100644
--- a/client/assembler.c
+++ b/client/assembler.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: assembler.c,v 1.1 2004/12/30 22:44:04 lordjaxom Exp $
+ *  $Id: assembler.c,v 1.2 2005/01/25 14:14:43 lordjaxom Exp $
  */
 
 #include "client/assembler.h"
@@ -33,7 +33,7 @@ cStreamdevAssembler::cStreamdevAssembler(cTBSocket *Socket)
 cStreamdevAssembler::~cStreamdevAssembler() {
 	if (m_Active) {
 		m_Active = false;
-		WakeUp();
+/*      WakeUp();*/
 		Cancel(3);
 	}
 	close(m_Pipe[0]);
diff --git a/client/device.c b/client/device.c
index 50510e2..bd34984 100644
--- a/client/device.c
+++ b/client/device.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: device.c,v 1.1 2004/12/30 22:44:00 lordjaxom Exp $
+ *  $Id: device.c,v 1.2 2005/01/25 14:14:43 lordjaxom Exp $
  */
  
 #include "client/device.h"
@@ -131,11 +131,15 @@ void cStreamdevDevice::CloseDvr(void) {
 }
 
 bool cStreamdevDevice::GetTSPacket(uchar *&Data) {
-  if (m_TSBuffer) {
-    int r;
+	if (m_TSBuffer) {
+		Data = m_TSBuffer->Get();
+		return true;
+	}
+	return false;
+    /*int r;
     while ((r = m_TSBuffer->Read()) >= 0) {
       Data = m_TSBuffer->Get();
-#if VDRVERSNUM >= 10300
+#if VDRVERSNUM >= 10300 // --> TODO: no filter streaming yet
 			if (Data != NULL) {
 				u_short pid = (((u_char)Data[1] & PID_MASK_HI) << 8) | Data[2];
 				u_char tid = Data[3];
@@ -151,9 +155,7 @@ bool cStreamdevDevice::GetTSPacket(uchar *&Data) {
       LOG_ERROR;
     	return false;
     }
-  	return true;
-	}
-  return false;
+  	return true;*/
 }
 
 #if VDRVERSNUM >= 10300
diff --git a/client/device.h b/client/device.h
index b35dabe..b7ab3da 100644
--- a/client/device.h
+++ b/client/device.h
@@ -1,5 +1,5 @@
 /*
- *  $Id: device.h,v 1.1 2004/12/30 22:44:00 lordjaxom Exp $
+ *  $Id: device.h,v 1.2 2005/01/25 14:14:43 lordjaxom Exp $
  */
  
 #ifndef VDR_STREAMDEV_DEVICE_H
@@ -30,7 +30,7 @@ private:
 
 protected:
 	virtual bool SetChannelDevice(const cChannel *Channel, bool LiveView);
-	virtual bool HasLock(void) { return m_TSBuffer != NULL; }
+	virtual bool HasLock(int TimeoutMs) { return m_TSBuffer != NULL; } // TODO
 
 	virtual bool SetPid(cPidHandle *Handle, int Type, bool On);
 	virtual bool OpenDvr(void);
diff --git a/remux/tsremux.h b/remux/tsremux.h
index 3e83c73..a48e5b1 100644
--- a/remux/tsremux.h
+++ b/remux/tsremux.h
@@ -4,6 +4,8 @@
 #include "libdvbmpeg/transform.h"
 #include <vdr/remux.h>
 
+#define RESULTBUFFERSIZE KILOBYTE(256)
+
 class cTSRemux {
 protected:
   uchar m_ResultBuffer[RESULTBUFFERSIZE];