vdr-plugin-wirbelscancontrol: update to 0.0.3

This commit is contained in:
Rudi Heitbaum 2023-11-10 12:59:53 +00:00
parent 5a4db493ff
commit 8c66a5a0dc
2 changed files with 4 additions and 61 deletions

View File

@ -3,8 +3,8 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="vdr-plugin-wirbelscancontrol"
PKG_VERSION="0.0.2"
PKG_SHA256="178c5768dd47355a42409a2cb2629f0762da1297865e3a84963684649145cb13"
PKG_VERSION="0.0.3"
PKG_SHA256="93418d31bb757cccea9f81edd13a3e84ca0cf239c30252afbf0ced68e9ef6bd5"
PKG_LICENSE="GPL"
PKG_SITE="https://www.gen2vdr.de/wirbel/wirbelscancontrol/index2.html"
PKG_URL="https://www.gen2vdr.de/wirbel/wirbelscancontrol/${PKG_NAME/-plugin/}-${PKG_VERSION}.tgz"
@ -17,11 +17,13 @@ PKG_BUILD_FLAGS="+pic"
pre_build_target() {
WIRBELSCAN_DIR=$(get_build_dir vdr-plugin-wirbelscan)
ln -sf ${WIRBELSCAN_DIR}/wirbelscan_services.h ${PKG_BUILD}
ln -sf $(get_build_dir vdr) ${PKG_BUILD}/vdr
}
make_target() {
VDR_DIR=$(get_build_dir vdr)
make VDRDIR=${VDR_DIR} \
INCLUDES="-I." \
LIBDIR="." \
LOCALEDIR="./locale"
}

View File

@ -1,59 +0,0 @@
--- a/scanmenu.c
+++ b/scanmenu.c
@@ -255,6 +255,9 @@
{
eOSState state = cOsdMenu::ProcessKey(Key);
int direction = 0;
+#if APIVERSNUM >= 20301
+ LOCK_CHANNELS_READ;
+#endif
switch (Key) {
case kLeft: direction = -1;
break;
@@ -268,7 +271,11 @@
case SETSCAN:
osdstatus = SCANNING;
start = time(NULL);
+#if APIVERSNUM < 20301
channelcount0 = Channels.Count();
+#else
+ channelcount0 = Channels->Count();
+#endif
SetHelp(tr("Stop"), NULL, NULL, NULL);
TransferSetup();
PutCommand(CmdStartScan);
@@ -655,7 +662,8 @@
sbuf = cString::sprintf("%s (%d%% transponders from scan list + %u queued)", buf, status.progress, status.nextTransponders);
ProgressBar->SetText(*sbuf);
- if (TV1 && TV2 && TV3 && TV4 && TV5)
+#if APIVERSNUM < 20301
+ if (TV1 && TV2 && TV3 && TV4 && TV5) {
switch (Channels.Count() - channelcount0) {
default:;
case 5: TV5->SetText(Channels.GetByNumber(Channels.Count()-4)->Name());
@@ -665,8 +673,23 @@
case 1: TV1->SetText(Channels.GetByNumber(Channels.Count()-0)->Name());
case 0:;
}
-
+ }
sbuf = cString::sprintf("%s%d", tr("New channels: "), Channels.Count() - channelcount0);
+#else
+ LOCK_CHANNELS_READ;
+ if (TV1 && TV2 && TV3 && TV4 && TV5) {
+ switch (Channels->Count() - channelcount0) {
+ default:;
+ case 5: TV5->SetText(Channels->GetByNumber(Channels->Count()-4)->Name());
+ case 4: TV4->SetText(Channels->GetByNumber(Channels->Count()-3)->Name());
+ case 3: TV3->SetText(Channels->GetByNumber(Channels->Count()-2)->Name());
+ case 2: TV2->SetText(Channels->GetByNumber(Channels->Count()-1)->Name());
+ case 1: TV1->SetText(Channels->GetByNumber(Channels->Count()-0)->Name());
+ case 0:;
+ }
+ }
+ sbuf = cString::sprintf("%s%d", tr("New channels: "), Channels->Count() - channelcount0);
+#endif
if (CH) CH->SetText(*sbuf);
Display();