diff options
| author | Klaus Schmidinger <vdr@tvdr.de> | 2014-01-01 14:26:26 +0100 |
|---|---|---|
| committer | Klaus Schmidinger <vdr@tvdr.de> | 2014-01-01 14:26:26 +0100 |
| commit | 9dbd953cc239afaf833b977a42f78420ec0fe45a (patch) | |
| tree | c6348e771215a57c064da7f16474b17f84ed8630 | |
| parent | ea613e6b2651bedacce9413df0a9e3c80afb6c1c (diff) | |
| download | vdr-9dbd953cc239afaf833b977a42f78420ec0fe45a.tar.gz vdr-9dbd953cc239afaf833b977a42f78420ec0fe45a.tar.bz2 | |
Eliminated MAXDVBDEVICES
| -rw-r--r-- | CONTRIBUTORS | 1 | ||||
| -rw-r--r-- | HISTORY | 1 | ||||
| -rw-r--r-- | dvbdevice.c | 15 | ||||
| -rw-r--r-- | dvbdevice.h | 3 |
4 files changed, 12 insertions, 8 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index dd621261..4e71fcce 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -704,6 +704,7 @@ Oliver Endriss <o.endriss@gmx.de> for reporting a problem with resuming replay of PES recordings for suggesting to make all bonded devices (except for the master) turn off their LNB power completely to avoid problems when receiving vertically polarized transponders + for suggesting to eliminate MAXDVBDEVICES Reinhard Walter Buchner <rw.buchner@freenet.de> for adding some satellites to 'sources.conf' @@ -8109,3 +8109,4 @@ Video Disk Recorder Revision History Plugin authors may want to apply the following change to their Makefile: -PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc)) +PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell PKG_CONFIG_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr)) +- Eliminated MAXDVBDEVICES (suggested by Oliver Endriss). diff --git a/dvbdevice.c b/dvbdevice.c index 3f70f20b..481489b3 100644 --- a/dvbdevice.c +++ b/dvbdevice.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: dvbdevice.c 3.6 2013/12/28 13:21:37 kls Exp $ + * $Id: dvbdevice.c 3.7 2014/01/01 14:14:32 kls Exp $ */ #include "dvbdevice.h" @@ -1204,8 +1204,8 @@ bool cDvbDevice::Initialize(void) } } } - int Checked = 0; int Found = 0; + int Used = 0; if (Nodes.Size() > 0) { Nodes.Sort(); for (int i = 0; i < Nodes.Size(); i++) { @@ -1213,10 +1213,11 @@ bool cDvbDevice::Initialize(void) int Frontend; if (2 == sscanf(Nodes[i], "%d %d", &Adapter, &Frontend)) { if (Exists(Adapter, Frontend)) { - if (Checked++ < MAXDVBDEVICES) { + if (Found < MAXDEVICES) { + Found++; if (UseDevice(NextCardIndex())) { if (Probe(Adapter, Frontend)) - Found++; + Used++; } else NextCardIndex(1); // skips this one @@ -1225,9 +1226,11 @@ bool cDvbDevice::Initialize(void) } } } - NextCardIndex(MAXDVBDEVICES - Checked); // skips the rest - if (Found > 0) + if (Found > 0) { isyslog("found %d DVB device%s", Found, Found > 1 ? "s" : ""); + if (Used != Found) + isyslog("using only %d DVB device%s", Used, Used > 1 ? "s" : ""); + } else isyslog("no DVB device found"); return Found > 0; diff --git a/dvbdevice.h b/dvbdevice.h index 7a54d8cf..0a76d9df 100644 --- a/dvbdevice.h +++ b/dvbdevice.h @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: dvbdevice.h 3.2 2013/06/01 11:36:18 kls Exp $ + * $Id: dvbdevice.h 3.3 2014/01/01 14:00:56 kls Exp $ */ #ifndef __DVBDEVICE_H @@ -67,7 +67,6 @@ enum { // --- End of definitions for older DVB API versions ------------------------- -#define MAXDVBDEVICES 8 #define MAXDELIVERYSYSTEMS 8 #define DEV_VIDEO "/dev/video" |