minisatip8 fixes

This commit is contained in:
Jaroslav Kysela 2018-01-30 19:06:21 +01:00
parent f356862959
commit 446acbadbc

View File

@ -1,5 +1,5 @@
diff --git a/src/adapter.c b/src/adapter.c diff --git a/src/adapter.c b/src/adapter.c
index 0baf965..99ff0a6 100644 index 0baf965..37fb791 100644
--- a/src/adapter.c --- a/src/adapter.c
+++ b/src/adapter.c +++ b/src/adapter.c
@@ -515,7 +515,7 @@ int getAdaptersCount() @@ -515,7 +515,7 @@ int getAdaptersCount()
@ -24,10 +24,32 @@ index 0baf965..99ff0a6 100644
} }
#ifndef DISABLE_PMT #ifndef DISABLE_PMT
- p = find_pid(aid, 0); - p = find_pid(aid, 0);
+ SPid p = find_pid(aid, 0); + SPid *p = find_pid(aid, 0);
SPid *p_all = find_pid(aid, 8192); SPid *p_all = find_pid(aid, 8192);
if ((!p || p->flags == 3) && (!p_all || p_all->flags == 3)) // add pid 0 if not explicitly added if ((!p || p->flags == 3) && (!p_all || p_all->flags == 3)) // add pid 0 if not explicitly added
{ {
diff --git a/src/axe.c b/src/axe.c
index c4f2c6d..9383d7c 100644
--- a/src/axe.c
+++ b/src/axe.c
@@ -669,14 +669,14 @@ fe_delivery_system_t axe_delsys(int aid, int fd, fe_delivery_system_t *sys)
void axe_get_signal(adapter *ad)
{
- uint16_t strength = 0, snr = 0;
- uint32_t status = 0, ber = 0, tmp;
+ int strength = 0, snr = 0;
+ int status = 0, ber = 0, tmp;
get_signal(ad, &status, &ber, &strength, &snr);
strength = strength * 240 / 24000;
if (strength > 240)
strength = 240;
- tmp = (uint32_t)snr * 255 / 54000;
+ tmp = snr * 255 / 54000;
if (tmp > 255)
tmp = 255;
if (tmp <= 15)
diff --git a/src/minisatip.c b/src/minisatip.c diff --git a/src/minisatip.c b/src/minisatip.c
index 5f369ff..909072a 100644 index 5f369ff..909072a 100644
--- a/src/minisatip.c --- a/src/minisatip.c