[SCM] vdr-plugin-wirbelscan packaging repository branch, master, updated. debian/0.0.7-2-1-g0e9b2c7

etobi git at e-tobi.net
Wed May 9 21:22:27 UTC 2012


The following commit has been merged in the master branch:
commit 0e9b2c76880b9862d0be094cc557d02589c150dc
Author: etobi <git at e-tobi.net>
Date:   Wed May 9 23:21:38 2012 +0200

    VDR 1.7.27 adaption (patch by Stefan Saraev)

diff --git a/debian/changelog b/debian/changelog
index 0cd7553..4c1f483 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vdr-plugin-wirbelscan (0.0.7-3) experimental; urgency=low
+
+  * VDR 1.7.27 adaption (patch by Stefan Saraev)
+
+ -- Tobias Grimm <etobi at debian.org>  Wed, 09 May 2012 23:20:50 +0200
+
 vdr-plugin-wirbelscan (0.0.7-2) experimental; urgency=low
 
   * Switched to GIT using pristine tar
diff --git a/debian/patches/receiver-api-fixes.patch b/debian/patches/receiver-api-fixes.patch
new file mode 100644
index 0000000..3db9284
--- /dev/null
+++ b/debian/patches/receiver-api-fixes.patch
@@ -0,0 +1,51 @@
+commit 64f969e39d18aefa263dc3a61172e33df33963fb
+Author: Stefan Saraev <stefan at saraev.ca>
+Date:   Thu Mar 29 20:22:11 2012 +0300
+
+    wirbelscan: receiver-api-fixes
+
+diff --git a/statemachine.c b/statemachine.c
+index 48a212e..bc0c8e5 100644
+--- a/statemachine.c
++++ b/statemachine.c
+@@ -36,12 +36,12 @@ protected:
+     while (Running()) cCondWait::SleepMs(5);
+     }; /*TODO: check here periodically for lock and wether we got any data!*/
+ public:
+-  cScanReceiver(tChannelID ChannelID, int AnyPid);
++  cScanReceiver(const cChannel* chan, int AnyPid);
+   virtual ~cScanReceiver() {cReceiver::Detach(); };
+   };
+ 
+-cScanReceiver::cScanReceiver(tChannelID ChannelID, int AnyPid) :
+-     cReceiver(ChannelID, 99, AnyPid), cThread("dummy receiver") { }
++cScanReceiver::cScanReceiver(const cChannel* chan, int AnyPid) :
++     cReceiver(chan, 99), cThread("dummy receiver") {  AddPid(AnyPid); }
+ 
+ ///!-----------------------------------------------------------------
+ ///!  v 0.0.5, store state in lastState if different and print state
+@@ -144,7 +144,7 @@ void cStateMachine::Action(void) {
+          ScannedTransponders.Add(ScannedTransponder);
+ 
+          dev->SwitchChannel(Transponder, false);
+-         aReceiver = new cScanReceiver(Transponder->GetChannelID(), 99);
++         aReceiver = new cScanReceiver(Transponder, 99);
+          dev->AttachReceiver(aReceiver);
+ 
+          cCondWait::SleepMs(1000);
+diff --git a/ttext.c b/ttext.c
+index 0053936..0864484 100644
+--- a/ttext.c
++++ b/ttext.c
+@@ -374,9 +374,9 @@ void cSwReceiver::Action() {
+      }
+ }
+ 
+-cSwReceiver::cSwReceiver(cChannel * Channel) : cReceiver(Channel->GetChannelID(),
+-   100, Channel->Tpid()), cThread("ttext") {
++cSwReceiver::cSwReceiver(cChannel * Channel) : cReceiver(Channel, 100), cThread("ttext") {
+ 
++   AddPid(Channel->Tpid());
+    stopped = fuzzy = false;
+    channel = Channel;
+    buffer  = new cRingBufferLinear(MEGABYTE(1),184);
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..771bcb8
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+receiver-api-fixes.patch

-- 
vdr-plugin-wirbelscan packaging repository



More information about the pkg-vdr-dvb-changes mailing list