[vdr] Re: [PATCH] streamdev plugin for vdr-1.3.19

[Jose Alberto Reguero <jareguero@telefonica.net>]

I try the patch posted in this list and make a second patch to aply after the 
first one.
With the two patches it works well.
Jose Alberto.
diff -Naur streamdev-0.3.3-pre3-geni/client/device.h streamdev/client/device.h
--- streamdev-0.3.3-pre3-geni/client/device.h	2005-02-01 10:26:35.757092968 +0100
+++ streamdev/client/device.h	2005-01-27 20:50:38.000000000 +0100
@@ -52,7 +52,7 @@
 	static bool ReInit(void);
 
 	static cStreamdevDevice *GetDevice(void) { return m_Device; }
-       virtual bool HasLock(int) { return m_TSBuffer != NULL; }
+//       virtual bool HasLock(int) { return m_TSBuffer != NULL; }
 };
 
 #endif // VDR_STREAMDEV_DEVICE_H
diff -Naur streamdev-0.3.3-pre3-geni/server/connectionVTP.c streamdev/server/connectionVTP.c
--- streamdev-0.3.3-pre3-geni/server/connectionVTP.c	2005-02-01 10:26:35.758092816 +0100
+++ streamdev/server/connectionVTP.c	2005-01-27 17:47:33.000000000 +0100
@@ -289,7 +289,7 @@
 	if (id == siLive)
 		DELETENULL(m_LiveStreamer);
 
-	Dprintf("ABRT took %ld ms\n", time_ms() - st);
+	Dprintf("ABRT took %ld ms\n", cTimeMs::Now() - st);
 	DELETENULL(m_DataSockets[id]);
 	return Respond(220, "Data connection closed");
 }
diff -Naur streamdev-0.3.3-pre3-geni/server/livestreamer.c streamdev/server/livestreamer.c
--- streamdev-0.3.3-pre3-geni/server/livestreamer.c	2005-02-01 10:26:35.759092664 +0100
+++ streamdev/server/livestreamer.c	2005-01-27 17:23:36.000000000 +0100
@@ -106,7 +106,12 @@
 	} else {
 		for (idx = 0; idx < MAXRECEIVEPIDS; ++idx) {
 			if (m_Pids[idx] == Pid)
-				m_Pids[idx] = 0;
+				for (int idxaux = idx; idxaux < MAXRECEIVEPIDS - 1; ++idxaux) {
+					if (m_Pids[idxaux + 1] != 0)
+						haspids = true;
+					m_Pids[idxaux] = m_Pids[idxaux + 1];
+					m_Pids[idxaux + 1] = 0;
+			}
 			else if (m_Pids[idx] != 0)
 				haspids = true;
 		}