fixed regression from fix for switching between encrypted channels. It was

no longer possible to receive multiple (FTA) streams from the same
transponder

HISTORY

@@ -1,6 +1,9 @@
 VDR Plugin 'streamdev' Revision History
 ---------------------------------------
 
+- fixed regression from fix for switching between encrypted channels. It was
+  no longer possible to receive multiple (FTA) streams from the same
+  transponder
 - silenced warnings concerning asprintf (requested by Rolf Ahrenberg)
 - don't update recordings list on CmdPLAY (reported by BBlack)
 - cleaned up common.h / common.c

README

@@ -424,13 +424,7 @@ up. So please consider the logs for the correct value. Remember to fill in
 hexadecimal values if you are using an editor to modify your channels.conf
 (number 10 becomes an "a", number 11 a "b", ...).
 
-2. Turn encrypted channels into Free-to-Air channels on the client. Again,
-either enter the channels menu or edit the client's channels.conf. You will
-also have to disable automatic channel updates on the client or (if streamdev
-is the only DVB source) disable streamdev's filter streaming feature. Otherwise
-VDR will revert the channel into an encrypted one.
-
-3. Apply either patch "patches/vdr-1.6.0-intcamdevices.patch" or patch
+2. Apply either patch "patches/vdr-1.6.0-intcamdevices.patch" or patch
 "patches/vdr-1.6.0-ignore_missing_cam.diff" to your client VDR. Intcamdevices
 is the clean solution. But as it modifies the VDR API, so you will need to
 recompile all of your plugins. The ignore_missing_cam patch is trivial, no need

client/device.c

@@ -1,5 +1,5 @@
 /*
- *  $Id: device.c,v 1.23 2009/04/06 06:48:59 schmirl Exp $
+ *  $Id: device.c,v 1.24 2009/10/19 06:19:10 schmirl Exp $
  */
  
 #include "client/device.h"
@@ -123,12 +123,10 @@ bool cStreamdevDevice::SetChannelDevice(const cChannel *Channel,
 	if (LiveView)
 		return false;
 
-#if 0
 	if (ClientSocket.DataSocket(siLive) != NULL 
 			&& TRANSPONDER(Channel, m_Channel)
-			&& Channel->Ca() < CA_ENCRYPTED_MIN)
+			&& Channel->Ca() == m_Channel->Ca())
 		return true;
-#endif
 
 	DetachAllReceivers();
 	m_Channel = Channel;