mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-31 01:11:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

zapit/src/capmt.cpp, zapit/src/femanager.cpp: fix warnings

Browse Source
This commit is contained in:
[CST] Focus
2014-03-31 13:49:23 +04:00
parent 88a622a0ad
commit 96ea43f420
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/zapit/src/capmt.cpp
View File

@@ -40,7 +40,7 @@ CCam::CCam()
{ {
camask = 0; camask = 0;
demuxes = new int[MAX_DMX_UNITS]; demuxes = new int[MAX_DMX_UNITS];
for(int i = 0; i < MAX_DMX_UNITS; i++) for(unsigned i = 0; i < MAX_DMX_UNITS; i++)
demuxes[i] = 0; demuxes[i] = 0;
source_demux = -1; source_demux = -1;
calen = 0; calen = 0;
@@ -157,7 +157,7 @@ int CCam::makeMask(int demux, bool add)
else if(demuxes[demux] > 0) else if(demuxes[demux] > 0)
demuxes[demux]--; demuxes[demux]--;
for(int i = 0; i < MAX_DMX_UNITS; i++) { for(unsigned i = 0; i < MAX_DMX_UNITS; i++) {
if(demuxes[i] > 0) if(demuxes[i] > 0)
mask |= 1 << i; mask |= 1 << i;
} }

8
src/zapit/src/femanager.cpp
View File

@@ -112,7 +112,7 @@ bool CFEManager::Init()
delete fe; delete fe;
} }
} }
for (int i = 0; i < MAX_DMX_UNITS; i++) for (unsigned i = 0; i < MAX_DMX_UNITS; i++)
dmap.push_back(CFeDmx(i)); dmap.push_back(CFeDmx(i));
INFO("found %d frontends, %d demuxes\n", (int)femap.size(), (int)dmap.size()); INFO("found %d frontends, %d demuxes\n", (int)femap.size(), (int)dmap.size());
@@ -394,7 +394,7 @@ void CFEManager::linkFrontends(bool init)
enabled_count = 0; enabled_count = 0;
unused_demux = 0; unused_demux = 0;
int demuxes[MAX_DMX_UNITS]; int demuxes[MAX_DMX_UNITS];
for(int i = 0; i < MAX_DMX_UNITS; i++) for(unsigned i = 0; i < MAX_DMX_UNITS; i++)
demuxes[i] = 0; demuxes[i] = 0;
demuxes[0] = 1; demuxes[0] = 1;
for(fe_map_iterator_t it = femap.begin(); it != femap.end(); it++) { for(fe_map_iterator_t it = femap.begin(); it != femap.end(); it++) {
@@ -446,11 +446,11 @@ void CFEManager::linkFrontends(bool init)
fe->Init(); fe->Init();
if (femode != CFrontend::FE_MODE_UNUSED) { if (femode != CFrontend::FE_MODE_UNUSED) {
enabled_count++; enabled_count++;
if ((fe->fenumber + 1) < MAX_DMX_UNITS) if ((fe->fenumber + 1) < (int) MAX_DMX_UNITS)
demuxes[fe->fenumber + 1] = 1; demuxes[fe->fenumber + 1] = 1;
} }
} }
for(int i = 0; i < MAX_DMX_UNITS; i++) { for(unsigned i = 0; i < MAX_DMX_UNITS; i++) {
if (demuxes[i] == 0) { if (demuxes[i] == 0) {
unused_demux = i; unused_demux = i;
INFO("pip demux: %d\n", unused_demux); INFO("pip demux: %d\n", unused_demux);