frodovdr/vdr-plugin-satip
1
0
Fork 0
mirror of https://github.com/rofafor/vdr-plugin-satip.git synced 2023-10-10 13:37:42 +02:00
Code Issues Releases Wiki Activity

Get rid of pointers.

Browse Source
This commit is contained in:
Rolf Ahrenberg 2014-11-17 22:33:38 +02:00
parent f5015bcfba
commit 54f8b4f0a6
2 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
discover.c
View File

@ -124,7 +124,7 @@ cSatipDiscover::cSatipDiscover()
handleM(curl_easy_init()), handleM(curl_easy_init()),
sleepM(), sleepM(),
probeIntervalM(0), probeIntervalM(0),
serversM(new cSatipServers()) serversM()
{ {
debug("cSatipDiscover::%s()", __FUNCTION__); debug("cSatipDiscover::%s()", __FUNCTION__);
} }
@ -135,7 +135,6 @@ cSatipDiscover::~cSatipDiscover()
Deactivate(); Deactivate();
cMutexLock MutexLock(&mutexM); cMutexLock MutexLock(&mutexM);
// Free allocated memory // Free allocated memory
DELETENULL(serversM);
if (handleM) if (handleM)
curl_easy_cleanup(handleM); curl_easy_cleanup(handleM);
handleM = NULL; handleM = NULL;
@ -170,8 +169,7 @@ void cSatipDiscover::Action(void)
probeIntervalM.Set(eProbeIntervalMs); probeIntervalM.Set(eProbeIntervalMs);
msearchM.Probe(); msearchM.Probe();
mutexM.Lock(); mutexM.Lock();
if (serversM) serversM.Cleanup(eProbeIntervalMs * 2);
serversM->Cleanup(eProbeIntervalMs * 2);
mutexM.Unlock(); mutexM.Unlock();
} }
mutexM.Lock(); mutexM.Lock();
@ -242,79 +240,75 @@ void cSatipDiscover::AddServer(const char *addrP, const char *modelP, const char
{ {
debug("cSatipDiscover::%s(%s, %s, %s)", __FUNCTION__, addrP, modelP, descP); debug("cSatipDiscover::%s(%s, %s, %s)", __FUNCTION__, addrP, modelP, descP);
cMutexLock MutexLock(&mutexM); cMutexLock MutexLock(&mutexM);
if (serversM) { cSatipServer *tmp = new cSatipServer(addrP, modelP, descP);
cSatipServer *tmp = new cSatipServer(addrP, modelP, descP); // Validate against existing servers
// Validate against existing servers if (!serversM.Update(tmp)) {
if (!serversM->Update(tmp)) { info("Adding device '%s|%s|%s'", tmp->Address(), tmp->Model(), tmp->Description());
info("Adding device '%s|%s|%s'", tmp->Address(), tmp->Model(), tmp->Description()); serversM.Add(tmp);
serversM->Add(tmp);
}
else
DELETENULL(tmp);
} }
else
DELETENULL(tmp);
} }
int cSatipDiscover::GetServerCount(void) int cSatipDiscover::GetServerCount(void)
{ {
//debug("cSatipDiscover::%s()", __FUNCTION__); //debug("cSatipDiscover::%s()", __FUNCTION__);
cMutexLock MutexLock(&mutexM); cMutexLock MutexLock(&mutexM);
return serversM ? serversM->Count() : -1; return serversM.Count();
} }
cSatipServer *cSatipDiscover::GetServer(int sourceP, int transponderP, int systemP) cSatipServer *cSatipDiscover::GetServer(int sourceP, int transponderP, int systemP)
{ {
//debug("cSatipDiscover::%s(%d, %d, %d)", __FUNCTION__, sourceP, transponderP, systemP); //debug("cSatipDiscover::%s(%d, %d, %d)", __FUNCTION__, sourceP, transponderP, systemP);
cMutexLock MutexLock(&mutexM); cMutexLock MutexLock(&mutexM);
return serversM ? serversM->Find(sourceP, transponderP, systemP) : NULL; return serversM.Find(sourceP, transponderP, systemP);
} }
cSatipServer *cSatipDiscover::GetServer(cSatipServer *serverP) cSatipServer *cSatipDiscover::GetServer(cSatipServer *serverP)
{ {
//debug("cSatipDiscover::%s()", __FUNCTION__); //debug("cSatipDiscover::%s()", __FUNCTION__);
cMutexLock MutexLock(&mutexM); cMutexLock MutexLock(&mutexM);
return serversM ? serversM->Find(serverP) : NULL; return serversM.Find(serverP);
} }
cSatipServers *cSatipDiscover::GetServers(void) cSatipServers *cSatipDiscover::GetServers(void)
{ {
//debug("cSatipDiscover::%s()", __FUNCTION__); //debug("cSatipDiscover::%s()", __FUNCTION__);
cMutexLock MutexLock(&mutexM); cMutexLock MutexLock(&mutexM);
return serversM; return &serversM;
} }
cString cSatipDiscover::GetServerString(cSatipServer *serverP) cString cSatipDiscover::GetServerString(cSatipServer *serverP)
{ {
//debug("cSatipDiscover::%s()", __FUNCTION__); //debug("cSatipDiscover::%s()", __FUNCTION__);
cMutexLock MutexLock(&mutexM); cMutexLock MutexLock(&mutexM);
return serversM ? serversM->GetString(serverP) : ""; return serversM.GetString(serverP);
} }
cString cSatipDiscover::GetServerList(void) cString cSatipDiscover::GetServerList(void)
{ {
//debug("cSatipDiscover::%s()", __FUNCTION__); //debug("cSatipDiscover::%s()", __FUNCTION__);
cMutexLock MutexLock(&mutexM); cMutexLock MutexLock(&mutexM);
return serversM ? serversM->List() : ""; return serversM.List();
} }
void cSatipDiscover::SetTransponder(cSatipServer *serverP, int transponderP) void cSatipDiscover::SetTransponder(cSatipServer *serverP, int transponderP)
{ {
//debug("cSatipDiscover::%s(%d)", __FUNCTION__, transponderP); //debug("cSatipDiscover::%s(%d)", __FUNCTION__, transponderP);
cMutexLock MutexLock(&mutexM); cMutexLock MutexLock(&mutexM);
if (serversM) serversM.SetTransponder(serverP, transponderP);
serversM->SetTransponder(serverP, transponderP);
} }
void cSatipDiscover::UseServer(cSatipServer *serverP, bool onOffP) void cSatipDiscover::UseServer(cSatipServer *serverP, bool onOffP)
{ {
//debug("cSatipDiscover::%s(%d)", __FUNCTION__, onOffP); //debug("cSatipDiscover::%s(%d)", __FUNCTION__, onOffP);
cMutexLock MutexLock(&mutexM); cMutexLock MutexLock(&mutexM);
if (serversM) serversM.Use(serverP, onOffP);
serversM->Use(serverP, onOffP);
} }
int cSatipDiscover::NumProvidedSystems(void) int cSatipDiscover::NumProvidedSystems(void)
{ {
//debug("cSatipDiscover::%s()", __FUNCTION__); //debug("cSatipDiscover::%s()", __FUNCTION__);
cMutexLock MutexLock(&mutexM); cMutexLock MutexLock(&mutexM);
return serversM ? serversM->NumProvidedSystems() : 0; return serversM.NumProvidedSystems();
} }

2
discover.h
View File

@ -52,7 +52,7 @@ private:
CURL *handleM; CURL *handleM;
cCondWait sleepM; cCondWait sleepM;
cTimeMs probeIntervalM; cTimeMs probeIntervalM;
cSatipServers *serversM; cSatipServers serversM;
void Activate(void); void Activate(void);
void Deactivate(void); void Deactivate(void);
void AddServer(const char *addrP, const char *modelP, const char *descP); void AddServer(const char *addrP, const char *modelP, const char *descP);