diff options
| author | Frank Schmirler <vdr@schmirler.de> | 2010-12-02 09:48:23 +0100 |
|---|---|---|
| committer | Frank Schmirler <vdr@schmirler.de> | 2010-12-02 09:48:23 +0100 |
| commit | 11b22d9f33d50f20cba1eaee2aadb55d3580d879 (patch) | |
| tree | 5c4e7fe1046bd9cc1ef7a7b21abe118f43689902 /client/device.c | |
| parent | 435f01649c2ee8c23c21e0680d0a39e773008549 (diff) | |
| download | vdr-plugin-streamdev-11b22d9f33d50f20cba1eaee2aadb55d3580d879.tar.gz vdr-plugin-streamdev-11b22d9f33d50f20cba1eaee2aadb55d3580d879.tar.bz2 | |
Streamdev 0.5.0-rc1
Diffstat (limited to 'client/device.c')
| -rw-r--r-- | client/device.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/client/device.c b/client/device.c index 4b6c3c5..d53bde1 100644 --- a/client/device.c +++ b/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.26 2010/06/08 05:55:17 schmirl Exp $ */ #include "client/device.h" @@ -33,9 +33,6 @@ cStreamdevDevice::cStreamdevDevice(void) { m_Device = this; m_Pids = 0; m_DvrClosed = true; - - if (StreamdevClientSetup.SyncEPG) - ClientSocket.SynchronizeEPG(); } cStreamdevDevice::~cStreamdevDevice() { @@ -72,7 +69,9 @@ bool cStreamdevDevice::IsTunedToTransponder(const cChannel *Channel) { bool res = false; if (ClientSocket.DataSocket(siLive) != NULL - && TRANSPONDER(Channel, m_Channel)) + && TRANSPONDER(Channel, m_Channel) + && Channel->Ca() == CA_FTA + && m_Channel->Ca() == CA_FTA) res = true; return res; } @@ -123,12 +122,11 @@ 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() == CA_FTA + && m_Channel->Ca() == CA_FTA) return true; -#endif DetachAllReceivers(); m_Channel = Channel; |