mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
vdr-wirbelscan: update to vdr-wirbelscan-0.0.9
this fixes crash in the middle of runing scan two (new) upstream bugs fixed: - fix upstream bug where dvb-s scan scans only on first defined transponder frequency - allow using wirbelscancontrol plugin for manual scans
This commit is contained in:
Stefan Saraev
parent
4975d2836d
commit
e20ceae50d
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="vdr-wirbelscan"
|
||||
PKG_VERSION="0.0.7"
|
||||
PKG_VERSION="0.0.9"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
From f1923761486397809be88b3344d0c498afe1bf29 Mon Sep 17 00:00:00 2001
|
||||
From: Stefan Saraev <stefan@saraev.ca>
|
||||
Date: Mon, 9 Jun 2014 22:02:58 +0300
|
||||
Subject: [PATCH] dont build i18n
|
||||
|
||||
---
|
||||
Makefile | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 87d274e..b9f4b29 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -74,7 +74,7 @@ UNCRUSTIFY_FILES = scanner.c scanner.h scanfilter.c scanfilter.h statemachine.h
|
||||
|
||||
### The main target:
|
||||
|
||||
-all: libvdr-$(PLUGIN).so i18n
|
||||
+all: libvdr-$(PLUGIN).so
|
||||
|
||||
### Implicit rules:
|
||||
|
||||
--
|
||||
1.7.2.5
|
||||
|
||||
@ -1,51 +0,0 @@
|
||||
commit 64f969e39d18aefa263dc3a61172e33df33963fb
|
||||
Author: Stefan Saraev <stefan@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);
|
||||
@ -0,0 +1,26 @@
|
||||
From 2b6a0e4b41a082655516c3a276a4d74e7a61cd90 Mon Sep 17 00:00:00 2001
|
||||
From: Stefan Saraev <stefan@saraev.ca>
|
||||
Date: Mon, 2 Feb 2015 13:22:36 +0200
|
||||
Subject: [PATCH] fix dvbs scan
|
||||
|
||||
using first channel freq from satellites.dat is not good.
|
||||
---
|
||||
scanner.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/scanner.c b/scanner.c
|
||||
index 0c29ac2..25d6f8a 100644
|
||||
--- a/scanner.c
|
||||
+++ b/scanner.c
|
||||
@@ -738,7 +738,7 @@ void cScanner::Action(void) {
|
||||
break;
|
||||
case SCAN_SATELLITE:
|
||||
aChannel->SetTransponderData(cSource::FromString(sat_list[this_channellist].source_id),
|
||||
- sat_list[this_channellist].items[0].intermediate_frequency,
|
||||
+ sat_list[this_channellist].items[channel].intermediate_frequency,
|
||||
sat_list[this_channellist].items[channel].symbol_rate,
|
||||
*ParamsToString('S',
|
||||
GetVDRPolarizationFromDVB(sat_list[this_channellist].items[0].polarization),
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
@ -0,0 +1,61 @@
|
||||
From 4708fdeab67cae81ee7211a306c6adf0bed24d3c Mon Sep 17 00:00:00 2001
|
||||
From: Stefan Saraev <stefan@saraev.ca>
|
||||
Date: Tue, 3 Feb 2015 18:19:17 +0200
|
||||
Subject: [PATCH] fix wirbelscancontrol
|
||||
|
||||
---
|
||||
common.c | 2 +-
|
||||
extended_frontend.h | 7 +++----
|
||||
menusetup.c | 2 +-
|
||||
3 files changed, 5 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/common.c b/common.c
|
||||
index 04a1e6e..40194d2 100644
|
||||
--- a/common.c
|
||||
+++ b/common.c
|
||||
@@ -54,7 +54,7 @@ void cMySetup::InitSystems(void) {
|
||||
}
|
||||
|
||||
if (DVB_Type >= SCAN_NO_DEVICE || ! systems[DVB_Type]) {
|
||||
- for (DVB_Type = scantype_t(SCAN_UNDEFINED + 1); DVB_Type < SCAN_NO_DEVICE; DVB_Type = scantype_t(DVB_Type + 1)) {
|
||||
+ for (DVB_Type = scantype_t(SCAN_TERRESTRIAL); DVB_Type < SCAN_NO_DEVICE; DVB_Type = scantype_t(DVB_Type + 1)) {
|
||||
if (systems[DVB_Type])
|
||||
break;
|
||||
}
|
||||
diff --git a/extended_frontend.h b/extended_frontend.h
|
||||
index 680594e..bcdb11f 100644
|
||||
--- a/extended_frontend.h
|
||||
+++ b/extended_frontend.h
|
||||
@@ -152,13 +152,12 @@ typedef enum {
|
||||
* 20120107 wirbel
|
||||
*/
|
||||
typedef enum {
|
||||
- SCAN_UNDEFINED,
|
||||
- SCAN_SATELLITE,
|
||||
- SCAN_CABLE,
|
||||
SCAN_TERRESTRIAL,
|
||||
- SCAN_TERRCABLE_ATSC, /* I dislike this mixture of terr and cable. fix later, as it leads to problems now. */
|
||||
+ SCAN_CABLE,
|
||||
+ SCAN_SATELLITE,
|
||||
SCAN_PVRINPUT,
|
||||
SCAN_PVRINPUT_FM,
|
||||
+ SCAN_TERRCABLE_ATSC, /* I dislike this mixture of terr and cable. fix later, as it leads to problems now. */
|
||||
SCAN_NO_DEVICE,
|
||||
SCAN_TRANSPONDER=999
|
||||
} scantype_t;
|
||||
diff --git a/menusetup.c b/menusetup.c
|
||||
index daeccb1..46087be 100644
|
||||
--- a/menusetup.c
|
||||
+++ b/menusetup.c
|
||||
@@ -22,7 +22,7 @@
|
||||
using namespace COUNTRY;
|
||||
|
||||
static const char * ScannerDesc = "wirbelscan scan thread";
|
||||
-static const char * DVB_Types[] = {"NOTHING","DVB-S/S2","DVB-C","DVB-T/T2","ATSC","pvrinput","pvrinput FM", "no device found"};
|
||||
+static const char * DVB_Types[] = {"DVB-T/T2", "DVB-C", "DVB-S/S2", "pvrinput", "pvrinput FM", "ATSC", "no device found"};
|
||||
|
||||
cMenuScanning * MenuScanning = NULL; // pointer to actual menu
|
||||
cScanner * Scanner = NULL;
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user