From: Jan-Pascal van Best <janpascal@vanbest.org>
Date: Tue, 2 Apr 2013 10:54:25 +0000 (+0200)
Subject: Add patch to fix tuner lock bug
X-Git-Tag: debian/620-13~5
X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=6d75e0184a02d62a2bcb50f10ca809342dbacdc1;p=sasc-ng.git

Add patch to fix tuner lock bug
---

diff --git a/debian/changelog b/debian/changelog
index 88b5b8b..38307c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 sasc-ng (620-11) local; urgency=low
 
   * Provide debug symbols in -dbg packages
+  * Add patch to fix tuner lock bug from 
+    http://dolot.kipdola.com/wiki/Install_SASC-NG#Configuring_and_compiling
 
- -- Jan-Pascal van Best <janpascal@vanbest.org>  Tue, 02 Apr 2013 11:10:55 +0200
+ -- Jan-Pascal van Best <janpascal@vanbest.org>  Tue, 02 Apr 2013 12:54:46 +0200
 
 sasc-ng (620-10) local; urgency=low
 
diff --git a/debian/patches/fix-tuner-lock-bug.patch b/debian/patches/fix-tuner-lock-bug.patch
new file mode 100644
index 0000000..39adff2
--- /dev/null
+++ b/debian/patches/fix-tuner-lock-bug.patch
@@ -0,0 +1,26 @@
+diff -r 51c5add369d7 cam.c
+--- a/cam.c     Tue Nov 22 21:11:32 2011 +0100
++++ b/cam.c     Wed Dec 14 22:53:12 2011 +0000
+@@ -2277,13 +2277,18 @@
+ 
+ void cCam::Tune(const cChannel *channel)
+ {
+-  cMutexLock lock(&camMutex);
+-  if(source!=channel->Source() || transponder!=channel->Transponder()) {
++  camMutex.Lock();
++  if(source!=channel->Source() || transponder!=channel->Transponder()) 
++  {
+     source=channel->Source(); transponder=channel->Transponder();
+     PRINTF(L_CORE_PIDS,"%s: now tuned to source %x(%s) transponder %x",devId,source,*cSource::ToString(source),transponder);
++    camMutex.Unlock();
+     Stop();
+-    }
+-  else PRINTF(L_CORE_PIDS,"%s: tune to same source/transponder",devId);
++    return;
++  }
++  else
++    PRINTF(L_CORE_PIDS,"%s: tune to same source/transponder",devId);
++  camMutex.Unlock();
+ }
+ 
+ void cCam::PostTune(void)
diff --git a/debian/patches/series b/debian/patches/series
index d56210f..dfe59e2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 always-assume-recent-kernel.patch
 use-proper-kernel-header-locations.patch
 use-ldflags-in-makefiles.patch
+fix-tuner-lock-bug.patch