mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-08-03 07:57:49 +00:00
vdr-plugin-wirbelscan: update to 2021.03.07, moved PKG_SITE and PKG_URL
This commit is contained in:
mglae
parent
9586fd3227
commit
544e86e1e5
@ -3,11 +3,11 @@
|
||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="vdr-plugin-wirbelscan"
|
||||
PKG_VERSION="2018.11.04"
|
||||
PKG_SHA256="62c2848aefdb768c165310f70b3746665f57b96a95ebae96761febbb07e942e3"
|
||||
PKG_VERSION="2021.03.07"
|
||||
PKG_SHA256="9267ebd12a3a58e0ae453f6e311782262ae0782b25721cc8d7e5048a76cb3759"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://wirbel.htpc-forum.de/wirbelscan/index2.html"
|
||||
PKG_URL="http://wirbel.htpc-forum.de/wirbelscan/vdr-wirbelscan-${PKG_VERSION}.tgz"
|
||||
PKG_SITE="https://www.gen2vdr.de/wirbel/wirbelscan/index2.html"
|
||||
PKG_URL="https://www.gen2vdr.de/wirbel/wirbelscan/vdr-wirbelscan-${PKG_VERSION}.tgz"
|
||||
PKG_DEPENDS_TARGET="toolchain vdr"
|
||||
PKG_NEED_UNPACK="$(get_pkg_directory vdr)"
|
||||
PKG_LONGDESC="Performs a channel scans for DVB-T, DVB-C and DVB-S"
|
||||
|
||||
@ -1,56 +1,25 @@
|
||||
Subject: [PATCH 1/2] interface channel count
|
||||
Subject: [PATCH] interface channel count
|
||||
|
||||
diff --git a/wirbelscan.c b/wirbelscan.c
|
||||
index 602e659..aafbec3 100644
|
||||
--- a/wirbelscan.c
|
||||
+++ b/wirbelscan.c
|
||||
@@ -12,6 +12,7 @@
|
||||
#include "menusetup.h"
|
||||
#include "countries.h"
|
||||
#include "satellites.h"
|
||||
+extern TChannels NewChannels;
|
||||
|
||||
static const char *VERSION = "2018.11.04";
|
||||
static const char *DESCRIPTION = "DVB channel scan for VDR";
|
||||
@@ -201,8 +202,8 @@ bool cPluginWirbelscan::Service(const char* id, void* Data) {
|
||||
strcpy(s->transponder, lTransponder.length()? lTransponder.c_str():"none");
|
||||
s->progress = s->status == StatusScanning?lProgress:0;
|
||||
s->strength = s->status == StatusScanning?lStrength:0;
|
||||
- s->numChannels = 0; // Channels.Count(); // not possible any longer.
|
||||
- s->newChannels = channelcount; // ((Channels.Count() - channelcount) > 0) && channelcount?Channels.Count() - channelcount:0;
|
||||
+ s->numChannels = cChannels::MaxNumber();
|
||||
+ s->newChannels = (NewChannels.Count() > cChannels::MaxNumber()) ? NewChannels.Count() - cChannels::MaxNumber():0;
|
||||
s->nextTransponders = nextTransponders;
|
||||
return true;
|
||||
}
|
||||
Subject: [PATCH 2/2] device detection
|
||||
|
||||
diff --git a/common.c b/common.c
|
||||
index 0ba4656..1ea8e51 100644
|
||||
--- a/common.c
|
||||
+++ b/common.c
|
||||
@@ -46,20 +46,10 @@ void cMySetup::InitSystems(void) {
|
||||
for(int i = 0; i < cDevice::NumDevices(); i++) {
|
||||
cDevice* device = cDevice::GetDevice(i);
|
||||
if (device == NULL) continue;
|
||||
- std::string t = *device->DeviceType();
|
||||
- if (t == "DVB-C" ) systems[SCAN_CABLE ] = 1;
|
||||
- if (t == "DVB-T" ) systems[SCAN_TERRESTRIAL ] = 1;
|
||||
- if (t == "DSS" ) systems[SCAN_SATELLITE ] = 1;
|
||||
- if (t == "DVB-S" ) systems[SCAN_SATELLITE ] = 1;
|
||||
- if (t == "DVB-S2") systems[SCAN_SATELLITE ] = 1;
|
||||
- if (t == "ATSC" ) systems[SCAN_TERRCABLE_ATSC] = 1;
|
||||
- if (t == "DVB-T2") systems[SCAN_TERRESTRIAL ] = 1;
|
||||
- if (t == "TURBO" ) systems[SCAN_SATELLITE ] = 1;
|
||||
- if (t == "SAT>IP") {
|
||||
- if (device->ProvidesSource(cSource::FromString("S"))) systems[SCAN_SATELLITE ] = 1;
|
||||
- if (device->ProvidesSource(cSource::FromString("T"))) systems[SCAN_TERRESTRIAL ] = 1;
|
||||
- if (device->ProvidesSource(cSource::FromString("C"))) systems[SCAN_CABLE ] = 1;
|
||||
- }
|
||||
+ if (device->ProvidesSource(cSource::stSat)) systems[SCAN_SATELLITE] = 1;
|
||||
+ if (device->ProvidesSource(cSource::stTerr)) systems[SCAN_TERRESTRIAL] = 1;
|
||||
+ if (device->ProvidesSource(cSource::stCable)) systems[SCAN_CABLE] = 1;
|
||||
+ if (device->ProvidesSource(cSource::stAtsc)) systems[SCAN_TERRCABLE_ATSC] = 1;
|
||||
}
|
||||
|
||||
if (DVB_Type >= SCAN_NO_DEVICE || ! systems[DVB_Type]) {
|
||||
#include "menusetup.h"
|
||||
#include "countries.h"
|
||||
#include "satellites.h"
|
||||
+extern TChannels NewChannels;
|
||||
|
||||
static const char *WIRBELSCAN_VERSION = "2021.03.07";
|
||||
static const char *WIRBELSCAN_DESCRIPTION = "DVB channel scan for VDR";
|
||||
@@ -202,8 +203,8 @@ bool cPluginWirbelscan::Service(const ch
|
||||
strcpy(s->transponder, lTransponder.length()? lTransponder.c_str():"none");
|
||||
s->progress = s->status == StatusScanning?lProgress:0;
|
||||
s->strength = s->status == StatusScanning?lStrength:0;
|
||||
- s->numChannels = 0; // Channels.Count(); // not possible any longer.
|
||||
- s->newChannels = channelcount; // ((Channels.Count() - channelcount) > 0) && channelcount?Channels.Count() - channelcount:0;
|
||||
+ s->numChannels = cChannels::MaxNumber();
|
||||
+ s->newChannels = (NewChannels.Count() > cChannels::MaxNumber()) ? NewChannels.Count() - cChannels::MaxNumber():0;
|
||||
s->nextTransponders = nextTransponders;
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -1,38 +1,38 @@
|
||||
--- a/countries.c 2016-07-31 10:25:01.000000000 +0200
|
||||
+++ b/countries.c 2021-01-21 18:02:54.336375432 +0100
|
||||
@@ -557,7 +557,7 @@ int atsc_is_qam(int atsc) {
|
||||
struct cCountry country_list[] = {
|
||||
/*- ISO 3166-1 - unique id - long country name alpha-3 numeric */
|
||||
{"AF", AF, "AFGHANISTAN"}, /*AFG, 4 },*/
|
||||
- {"AX", AX, "ÅLAND ISLANDS"}, /*ALA, 248},*/
|
||||
+ {"AX", AX, "Ã…LAND ISLANDS"}, /*ALA, 248},*/
|
||||
{"AL", AL, "ALBANIA"}, /*ALB, 8 },*/
|
||||
{"DZ", DZ, "ALGERIA"}, /*DZA, 12 },*/
|
||||
{"AS", AS, "AMERICAN SAMOA"}, /*ASM, 16 },*/
|
||||
struct cCountry country_list[] = {
|
||||
/*- ISO 3166-1 - unique id - long country name alpha-3 numeric */
|
||||
{"AF", AF, "AFGHANISTAN"}, /*AFG, 4 },*/
|
||||
- {"AX", AX, "ÅLAND ISLANDS"}, /*ALA, 248},*/
|
||||
+ {"AX", AX, "Ã…LAND ISLANDS"}, /*ALA, 248},*/
|
||||
{"AL", AL, "ALBANIA"}, /*ALB, 8 },*/
|
||||
{"DZ", DZ, "ALGERIA"}, /*DZA, 12 },*/
|
||||
{"AS", AS, "AMERICAN SAMOA"}, /*ASM, 16 },*/
|
||||
@@ -610,10 +610,10 @@ struct cCountry country_list[] = {
|
||||
{"CD", CD, "CONGO, THE DEMOCRATIC REPUBLIC OF THE"}, /*COD, 180},*/
|
||||
{"CK", CK, "COOK ISLANDS"}, /*COK, 184},*/
|
||||
{"CR", CR, "COSTA RICA"}, /*CRI, 188},*/
|
||||
- {"CI", CI, "CÔTE D'IVOIRE"}, /*CIV, 384},*/
|
||||
+ {"CI", CI, "CÔTE D'IVOIRE"}, /*CIV, 384},*/
|
||||
{"HR", HR, "CROATIA"}, /*HRV, 191},*/
|
||||
{"CU", CU, "CUBA"}, /*CUB, 192},*/
|
||||
- {"CW", CW, "CURAÇAO"}, /*CUW, 531},*/
|
||||
+ {"CW", CW, "CURAÇAO"}, /*CUW, 531},*/
|
||||
{"CY", CY, "CYPRUS"}, /*CYP, 196},*/
|
||||
{"CZ", CZ, "CZECH REPUBLIC"}, /*CZE, 203},*/
|
||||
{"DK", DK, "DENMARK"}, /*DNK, 208},*/
|
||||
{"CD", CD, "CONGO, THE DEMOCRATIC REPUBLIC OF THE"}, /*COD, 180},*/
|
||||
{"CK", CK, "COOK ISLANDS"}, /*COK, 184},*/
|
||||
{"CR", CR, "COSTA RICA"}, /*CRI, 188},*/
|
||||
- {"CI", CI, "CÔTE D'IVOIRE"}, /*CIV, 384},*/
|
||||
+ {"CI", CI, "CÔTE D'IVOIRE"}, /*CIV, 384},*/
|
||||
{"HR", HR, "CROATIA"}, /*HRV, 191},*/
|
||||
{"CU", CU, "CUBA"}, /*CUB, 192},*/
|
||||
- {"CW", CW, "CURAÇAO"}, /*CUW, 531},*/
|
||||
+ {"CW", CW, "CURAÇAO"}, /*CUW, 531},*/
|
||||
{"CY", CY, "CYPRUS"}, /*CYP, 196},*/
|
||||
{"CZ", CZ, "CZECH REPUBLIC"}, /*CZE, 203},*/
|
||||
{"DK", DK, "DENMARK"}, /*DNK, 208},*/
|
||||
@@ -736,11 +736,11 @@ struct cCountry country_list[] = {
|
||||
{"PT", PT, "PORTUGAL"}, /*PRT, 620},*/
|
||||
{"PR", PR, "PUERTO RICO"}, /*PRI, 630},*/
|
||||
{"QA", QA, "QATA"}, /*QAT, 634},*/
|
||||
- {"RE", RE, "RÉUNION"}, /*REU, 638},*/
|
||||
+ {"RE", RE, "RÉUNION"}, /*REU, 638},*/
|
||||
{"RO", RO, "ROMANIA"}, /*ROU, 642},*/
|
||||
{"RU", RU, "RUSSIAN FEDERATION"}, /*RUS, 643},*/
|
||||
{"RW", RW, "RWANDA"}, /*RWA, 646},*/
|
||||
- {"BL", BL, "SAINT BARTHÉLEMY"}, /*BLM, 652},*/
|
||||
+ {"BL", BL, "SAINT BARTHÉLEMY"}, /*BLM, 652},*/
|
||||
{"SH", SH, "SAINT HELENA"}, /*SHN, 654},*/
|
||||
{"KN", KN, "SAINT KITTS AND NEVIS"}, /*KNA, 659},*/
|
||||
{"LC", LC, "SAINT LUCIA"}, /*LCA, 662},*/
|
||||
{"PT", PT, "PORTUGAL"}, /*PRT, 620},*/
|
||||
{"PR", PR, "PUERTO RICO"}, /*PRI, 630},*/
|
||||
{"QA", QA, "QATA"}, /*QAT, 634},*/
|
||||
- {"RE", RE, "RÉUNION"}, /*REU, 638},*/
|
||||
+ {"RE", RE, "RÉUNION"}, /*REU, 638},*/
|
||||
{"RO", RO, "ROMANIA"}, /*ROU, 642},*/
|
||||
{"RU", RU, "RUSSIAN FEDERATION"}, /*RUS, 643},*/
|
||||
{"RW", RW, "RWANDA"}, /*RWA, 646},*/
|
||||
- {"BL", BL, "SAINT BARTHÉLEMY"}, /*BLM, 652},*/
|
||||
+ {"BL", BL, "SAINT BARTHÉLEMY"}, /*BLM, 652},*/
|
||||
{"SH", SH, "SAINT HELENA"}, /*SHN, 654},*/
|
||||
{"KN", KN, "SAINT KITTS AND NEVIS"}, /*KNA, 659},*/
|
||||
{"LC", LC, "SAINT LUCIA"}, /*LCA, 662},*/
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user