mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 00:41:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

femanager: remove old hack after merge

Browse Source 
Origin commit data
------------------
Commit: 0cd237b23c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-26 (Fri, 26 Dec 2014)
This commit is contained in:
Stefan Seyfried
2014-12-26 17:39:59 +01:00
parent 6ab92a35ce
commit 16a6a71192
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,7 +2,7 @@
Neutrino-GUI - DBoxII-Project Neutrino-GUI - DBoxII-Project
Copyright (C) 2011 CoolStream International Ltd Copyright (C) 2011 CoolStream International Ltd
Copyright (C) 2012,2013 Stefan Seyfried Copyright (C) 2012,2013,2014 Stefan Seyfried
License: GPLv2 License: GPLv2
@@ -403,7 +403,6 @@ void CFEManager::linkFrontends(bool init)
INFO("linking.."); INFO("linking..");
OpenThreads::ScopedLock<OpenThreads::Mutex> m_lock(mutex); OpenThreads::ScopedLock<OpenThreads::Mutex> m_lock(mutex);
enabled_count = 0; enabled_count = 0;
have_sat = have_cable = have_terr = false;
unused_demux = 0; unused_demux = 0;
int demuxes[MAX_DMX_UNITS]; int demuxes[MAX_DMX_UNITS];
for(unsigned i = 0; i < MAX_DMX_UNITS; i++) for(unsigned i = 0; i < MAX_DMX_UNITS; i++)
@@ -459,13 +458,6 @@ void CFEManager::linkFrontends(bool init)
if (femode != CFrontend::FE_MODE_UNUSED) if (femode != CFrontend::FE_MODE_UNUSED)
{ {
enabled_count++; enabled_count++;
delivery_system_t d = fe->getCurrentDeliverySystem();
if (fe->isSat(d))
have_sat = true;
else if (fe->isCable(d))
have_cable = true;
else if (fe->isTerr(d))
have_terr = true;
if ((fe->fenumber + 1) < (int) MAX_DMX_UNITS) if ((fe->fenumber + 1) < (int) MAX_DMX_UNITS)
demuxes[fe->fenumber + 1] = 1; demuxes[fe->fenumber + 1] = 1;
} }