Skip to content

Commit

Permalink
'[dvbci]' use eSimpleConfig instead of eConfigManager
Browse files Browse the repository at this point in the history
  • Loading branch information
jbleyel authored and fairbird committed Feb 4, 2024
1 parent ff57aaf commit ad7b785
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions lib/dvb_ci/dvbci.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

#include <lib/base/eerror.h>
#include <lib/base/nconfig.h> // access to python config
#include <lib/base/esimpleconfig.h>
#include <lib/dvb/db.h>
#include <lib/dvb/pmt.h>
#include <lib/dvb_ci/dvbci.h>
Expand Down Expand Up @@ -398,7 +399,7 @@ bool eDVBCIInterfaces::canDescrambleMultipleServices(eDVBCISlot* slot)
singleLock s(m_slot_lock);
char configStr[255];
snprintf(configStr, 255, "config.ci.%d.canDescrambleMultipleServices", slot->getSlotID());
std::string str = eConfigManager::getConfigValue(configStr);
std::string str = eSimpleConfig::getString(configStr, "auto");
if ( str == "auto" )
{
if (slot->getAppManager())
Expand Down Expand Up @@ -1330,10 +1331,10 @@ eDVBCISlot::eDVBCISlot(eMainloop *context, int nr):
m_context = context;
state = stateDisabled;
snprintf(configStr, 255, "config.ci.%d.enabled", slotid);
bool enabled = eConfigManager::getConfigBoolValue(configStr, true);
int bootDelay = eConfigManager::getConfigIntValue("config.cimisc.bootDelay");
bool enabled = eSimpleConfig::getBool(configStr, true);
if (enabled)
{
int bootDelay = eSimpleConfig::getInt("config.cimisc.bootDelay", 5);
if (bootDelay)
{
CONNECT(startup_timeout->timeout, eDVBCISlot::openDevice);
Expand Down

0 comments on commit ad7b785

Please sign in to comment.