File vdr-mcli_device.patch of Package vdr-plugin-mcli

File vdr-mcli_device.patch of Package vdr-plugin-mcli (Revision 3)

Currently displaying revision 3 , Show latest

diff -U 3 -H -d -r -N -- vdr-mcli-plugin.orig/device.c vdr-mcli-plugin/device.c
--- vdr-mcli-plugin.orig/device.c	2011-08-19 23:11:41.000000000 +0300
+++ vdr-mcli-plugin/device.c	2014-10-23 03:44:52.526705704 +0300
@@ -352,7 +352,7 @@
 	return false;
 }
 
-bool cMcliDevice::IsTunedToTransponder (const cChannel * Channel)
+bool cMcliDevice::IsTunedToTransponder (const cChannel * Channel) const
 {
 	return IsTunedToTransponderConst(Channel);
 }
@@ -474,7 +474,7 @@
 	} else {
 		m_disabletimeout = TEMP_DISABLE_TIMEOUT_DEFAULT;
 	}
-	bool cam_force=!EITScanner.UsesDevice(this);
+	bool cam_force=true;
 	if(cam_force && !CheckCAM(Channel, true)) {
 #ifdef DEBUG_TUNE
 		printf("No CAM on %d available even after tried to steal one\n", CardIndex () + 1);
@@ -691,16 +691,16 @@
 	return true;
 }
 
-bool cMcliDevice::HasLock (int TimeoutMs)
+bool cMcliDevice::HasLock (int TimeoutMs) const
 {
 //      printf ("HasLock TimeoutMs:%d\n", TimeoutMs);
 
 	if ((m_ten.s.st & FE_HAS_LOCK) || !TimeoutMs) {
 		return m_ten.s.st & FE_HAS_LOCK;
 	}
-	cMutexLock MutexLock (&mutex);
+	cMutexLock MutexLock ((cMutex*)&mutex);
 	if (TimeoutMs && !(m_ten.s.st & FE_HAS_LOCK)) {
-		m_locked.TimedWait (mutex, TimeoutMs);
+		((cCondVar&)m_locked).TimedWait ((cMutex&)mutex, TimeoutMs);
 	}
 	if (m_ten.s.st & FE_HAS_LOCK) {
 		return true;
diff -U 3 -H -d -r -N -- vdr-mcli-plugin.orig/device.h vdr-mcli-plugin/device.h
--- vdr-mcli-plugin.orig/device.h	2011-08-19 23:11:41.000000000 +0300
+++ vdr-mcli-plugin/device.h	2014-10-23 03:25:04.194608691 +0300
@@ -48,7 +48,7 @@
       protected:
       	cPluginMcli *m_mcli;
 	virtual bool SetChannelDevice (const cChannel * Channel, bool LiveView);
-	virtual bool HasLock (int TimeoutMs);
+	virtual bool HasLock(int TimeoutMs = 0) const;
 	virtual bool SetPid (cPidHandle * Handle, int Type, bool On);
 	virtual bool OpenDvr (void);
 	virtual void CloseDvr (void);
@@ -100,7 +100,7 @@
 	virtual bool ProvidesSource (int Source) const;
 	virtual bool ProvidesTransponder (const cChannel * Channel) const;
 	virtual bool ProvidesChannel (const cChannel * Channel, int Priority = -1, bool * NeedsDetachReceivers = NULL) const;
-	virtual bool IsTunedToTransponder (const cChannel * Channel);
+	virtual bool IsTunedToTransponder (const cChannel * Channel) const;
 
 	virtual int HandleTsData (unsigned char *buffer, size_t len);
 	tra_t *GetTenData (void) {