From 16a6a71192ff189d8b5c438390211da198b58b51 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Fri, 26 Dec 2014 17:39:59 +0100 Subject: [PATCH] femanager: remove old hack after merge Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/0cd237b23c0bfeec422882d92f8acf205c40805f Author: Stefan Seyfried Date: 2014-12-26 (Fri, 26 Dec 2014) --- src/zapit/src/femanager.cpp | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/zapit/src/femanager.cpp b/src/zapit/src/femanager.cpp index 5c1fa8a9f..d08a9072c 100644 --- a/src/zapit/src/femanager.cpp +++ b/src/zapit/src/femanager.cpp @@ -2,7 +2,7 @@ Neutrino-GUI - DBoxII-Project Copyright (C) 2011 CoolStream International Ltd - Copyright (C) 2012,2013 Stefan Seyfried + Copyright (C) 2012,2013,2014 Stefan Seyfried License: GPLv2 @@ -403,7 +403,6 @@ void CFEManager::linkFrontends(bool init) INFO("linking.."); OpenThreads::ScopedLock m_lock(mutex); enabled_count = 0; - have_sat = have_cable = have_terr = false; unused_demux = 0; int demuxes[MAX_DMX_UNITS]; for(unsigned i = 0; i < MAX_DMX_UNITS; i++) @@ -459,13 +458,6 @@ void CFEManager::linkFrontends(bool init) if (femode != CFrontend::FE_MODE_UNUSED) { 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) demuxes[fe->fenumber + 1] = 1; }