Changed logging to to use SATIP instead of SAT>IP.

This commit is contained in:
Rolf Ahrenberg 2014-12-06 00:37:55 +02:00
parent 796a047401
commit 23dce9e205
5 changed files with 8 additions and 8 deletions

View File

@ -26,9 +26,9 @@ cSatipDevice::cSatipDevice(unsigned int indexP)
{ {
unsigned int bufsize = (unsigned int)SATIP_BUFFER_SIZE; unsigned int bufsize = (unsigned int)SATIP_BUFFER_SIZE;
bufsize -= (bufsize % TS_SIZE); bufsize -= (bufsize % TS_SIZE);
info("Creating SAT>IP CardIndex=%d [device %u]", CardIndex(), deviceIndexM); info("Creating SATIP device CardIndex=%d [device %u]", CardIndex(), deviceIndexM);
tsBufferM = new cRingBufferLinear(bufsize + 1, TS_SIZE, false, tsBufferM = new cRingBufferLinear(bufsize + 1, TS_SIZE, false,
*cString::sprintf("SAT>IP TS %d", deviceIndexM)); *cString::sprintf("SATIP %d TS", deviceIndexM));
if (tsBufferM) { if (tsBufferM) {
tsBufferM->SetTimeouts(10, 10); tsBufferM->SetTimeouts(10, 10);
tsBufferM->SetIoThrottle(); tsBufferM->SetIoThrottle();
@ -317,7 +317,7 @@ bool cSatipDevice::SetChannelDevice(const cChannel *channelP, bool liveViewP)
cDvbTransponderParameters dtp(channelP->Parameters()); cDvbTransponderParameters dtp(channelP->Parameters());
cString params = GetTransponderUrlParameters(channelP); cString params = GetTransponderUrlParameters(channelP);
if (isempty(params)) { if (isempty(params)) {
error("Unrecognized SAT>IP channel parameters: %s", channelP->Parameters()); error("Unrecognized SATIP channel parameters: %s", channelP->Parameters());
return false; return false;
} }
cString address; cString address;

View File

@ -118,7 +118,7 @@ int cSatipDiscover::DebugCallback(CURL *handleP, curl_infotype typeP, char *data
} }
cSatipDiscover::cSatipDiscover() cSatipDiscover::cSatipDiscover()
: cThread("SAT>IP discover"), : cThread("SATIP discover"),
mutexM(), mutexM(),
msearchM(*this), msearchM(*this),
probeUrlListM(), probeUrlListM(),

View File

@ -39,7 +39,7 @@ void cSatipPoller::Destroy(void)
} }
cSatipPoller::cSatipPoller() cSatipPoller::cSatipPoller()
: cThread("SAT>IP poller"), : cThread("SATIP poller"),
mutexM(), mutexM(),
fdM(epoll_create(eMaxFileDescriptors)) fdM(epoll_create(eMaxFileDescriptors))
{ {

View File

@ -232,8 +232,8 @@ bool cSatipSectionFilter::Send(void)
cSatipSectionFilterHandler::cSatipSectionFilterHandler(int deviceIndexP, unsigned int bufferLenP) cSatipSectionFilterHandler::cSatipSectionFilterHandler(int deviceIndexP, unsigned int bufferLenP)
: cThread(cString::sprintf("SAT>IP %d section handler", deviceIndexP)), : cThread(cString::sprintf("SATIP %d section handler", deviceIndexP)),
ringBufferM(new cRingBufferLinear(bufferLenP, TS_SIZE, false, *cString::sprintf("SAT>IP SECTION HANDLER %d", deviceIndexP))), ringBufferM(new cRingBufferLinear(bufferLenP, TS_SIZE, false, *cString::sprintf("SATIP %d section handler", deviceIndexP))),
mutexM(), mutexM(),
deviceIndexM(deviceIndexP) deviceIndexM(deviceIndexP)
{ {

View File

@ -13,7 +13,7 @@
#include "tuner.h" #include "tuner.h"
cSatipTuner::cSatipTuner(cSatipDeviceIf &deviceP, unsigned int packetLenP) cSatipTuner::cSatipTuner(cSatipDeviceIf &deviceP, unsigned int packetLenP)
: cThread(cString::sprintf("SAT>IP %d tuner", deviceP.GetId())), : cThread(cString::sprintf("SATIP %d tuner", deviceP.GetId())),
sleepM(), sleepM(),
deviceM(&deviceP), deviceM(&deviceP),
deviceIdM(deviceP.GetId()), deviceIdM(deviceP.GetId()),