[vdr] Re: VDR developer version 1.3.14

[Anssi Hannula <anssi.hannula@mbnet.fi>]

Tony Grant wrote:

> Le dim 24/10/2004 à 17:20, Klaus Schmidinger a écrit :
>  
> > VDR developer version 1.3.14 is now available at
> >
> >    ftp://ftp.cadsoft.de/vdr/Developer/vdr-1.3.14.tar.bz2
> >    
> I cannot make the streamdev pluggin - I have read the mailing list but
> the patch doesn't change anything
>  
I have made an attached patch to streamdev for 1.3.13/14 against 
http://www.magoa.net/linux/contrib/vdr-streamdev-0.3.3-pre4.tgz

I only use the server for http clients, so I don't know if the client 
part works correctly.

--
Anssi Hannula
diff -Nur streamdev-0.3.3-pre3-geni/client/assembler.c streamdev-0.3.3-pre3-geni-delta/client/assembler.c
--- streamdev-0.3.3-pre3-geni/client/assembler.c	2004-10-24 19:50:48.000000000 +0300
+++ streamdev-0.3.3-pre3-geni-delta/client/assembler.c	2004-10-24 19:54:44.000000000 +0300
@@ -33,7 +33,9 @@
 cStreamdevAssembler::~cStreamdevAssembler() {
 	if (m_Active) {
 		m_Active = false;
+#if VDRVERSNUM < 10314
 		WakeUp();
+#endif
 		Cancel(3);
 	}
 	close(m_Pipe[0]);
diff -Nur streamdev-0.3.3-pre3-geni/client/device.c streamdev-0.3.3-pre3-geni-delta/client/device.c
--- streamdev-0.3.3-pre3-geni/client/device.c	2004-10-24 19:50:37.000000000 +0300
+++ streamdev-0.3.3-pre3-geni-delta/client/device.c	2004-10-25 13:34:02.354527208 +0300
@@ -132,8 +132,12 @@
 
 bool cStreamdevDevice::GetTSPacket(uchar *&Data) {
   if (m_TSBuffer) {
+#if VDRVERSNUM < 10313
     int r;
     while ((r = m_TSBuffer->Read()) >= 0) {
+#else
+    while (m_TSBuffer) {
+#endif
       Data = m_TSBuffer->Get();
 #if VDRVERSNUM >= 10300
 			if (Data != NULL) {
diff -Nur streamdev-0.3.3-pre3-geni/remux/tsremux.h streamdev-0.3.3-pre3-geni-delta/remux/tsremux.h
--- streamdev-0.3.3-pre3-geni/remux/tsremux.h	2004-10-24 19:50:37.000000000 +0300
+++ streamdev-0.3.3-pre3-geni-delta/remux/tsremux.h	2004-10-25 13:36:26.835562752 +0300
@@ -4,6 +4,13 @@
 #include "libdvbmpeg/transform.h"
 #include <vdr/remux.h>
 
+#ifndef MINVIDEODATA
+#define MINVIDEODATA (16*1024)
+#endif
+#ifndef RESULTBUFFERSIZE
+#define RESULTBUFFERSIZE (MINVIDEODATA * 4)
+#endif
+
 class cTSRemux {
 protected:
   uchar m_ResultBuffer[RESULTBUFFERSIZE];