[SCM] kodi-pvr-hts/master: prefix log levels with LEVEL_ to avoid naming collision with a macro on Windows
tiber-guest at users.alioth.debian.org
tiber-guest at users.alioth.debian.org
Wed Mar 2 23:01:56 UTC 2016
The following commit has been merged in the master branch:
commit 92d84cc40affad5a2826d5210d13592c3cfec87f
Author: Sam Stenvall <sam.stenvall at nordsoftware.com>
Date: Mon Jan 4 14:52:24 2016 +0200
prefix log levels with LEVEL_ to avoid naming collision with a
macro on Windows
diff --git a/src/AutoRecordings.cpp b/src/AutoRecordings.cpp
index 4e03dde..d9c4680 100644
--- a/src/AutoRecordings.cpp
+++ b/src/AutoRecordings.cpp
@@ -134,7 +134,7 @@ const unsigned int AutoRecordings::GetTimerIntIdFromStringId(const std::string &
if (tit->second.GetStringId() == strId)
return tit->second.GetId();
}
- Logger::Log(LogLevel::ERROR, "Autorec: Unable to obtain int id for string id %s", strId.c_str());
+ Logger::Log(LogLevel::LEVEL_ERROR, "Autorec: Unable to obtain int id for string id %s", strId.c_str());
return 0;
}
@@ -146,7 +146,7 @@ const std::string AutoRecordings::GetTimerStringIdFromIntId(int intId) const
return tit->second.GetStringId();
}
- Logger::Log(LogLevel::ERROR, "Autorec: Unable to obtain string id for int id %s", intId);
+ Logger::Log(LogLevel::LEVEL_ERROR, "Autorec: Unable to obtain string id for int id %s", intId);
return "";
}
@@ -292,7 +292,7 @@ PVR_ERROR AutoRecordings::SendAutorecAddOrUpdate(const PVR_TIMER &timer, bool up
/* Check for error */
if (htsmsg_get_u32(m, "success", &u32))
{
- Logger::Log(LogLevel::ERROR, "malformed %s response: 'success' missing", method.c_str());
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed %s response: 'success' missing", method.c_str());
u32 = PVR_ERROR_FAILED;
}
htsmsg_destroy(m);
@@ -323,7 +323,7 @@ PVR_ERROR AutoRecordings::SendAutorecDelete(const PVR_TIMER &timer)
/* Check for error */
if (htsmsg_get_u32(m, "success", &u32))
{
- Logger::Log(LogLevel::ERROR, "malformed deleteAutorecEntry response: 'success' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed deleteAutorecEntry response: 'success' missing");
}
htsmsg_destroy(m);
@@ -340,7 +340,7 @@ bool AutoRecordings::ParseAutorecAddOrUpdate(htsmsg_t *msg, bool bAdd)
/* Validate/set mandatory fields */
if ((str = htsmsg_get_str(msg, "id")) == NULL)
{
- Logger::Log(LogLevel::ERROR, "malformed autorecEntryAdd/autorecEntryUpdate: 'id' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed autorecEntryAdd/autorecEntryUpdate: 'id' missing");
return false;
}
@@ -357,7 +357,7 @@ bool AutoRecordings::ParseAutorecAddOrUpdate(htsmsg_t *msg, bool bAdd)
}
else if (bAdd)
{
- Logger::Log(LogLevel::ERROR, "malformed autorecEntryAdd: 'enabled' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed autorecEntryAdd: 'enabled' missing");
return false;
}
@@ -369,7 +369,7 @@ bool AutoRecordings::ParseAutorecAddOrUpdate(htsmsg_t *msg, bool bAdd)
}
else if (bAdd)
{
- Logger::Log(LogLevel::ERROR, "malformed autorecEntryAdd: 'removal' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed autorecEntryAdd: 'removal' missing");
return false;
}
}
@@ -381,7 +381,7 @@ bool AutoRecordings::ParseAutorecAddOrUpdate(htsmsg_t *msg, bool bAdd)
}
else if (bAdd)
{
- Logger::Log(LogLevel::ERROR, "malformed autorecEntryAdd: 'retention' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed autorecEntryAdd: 'retention' missing");
return false;
}
}
@@ -392,7 +392,7 @@ bool AutoRecordings::ParseAutorecAddOrUpdate(htsmsg_t *msg, bool bAdd)
}
else if (bAdd)
{
- Logger::Log(LogLevel::ERROR, "malformed autorecEntryAdd: 'daysOfWeek' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed autorecEntryAdd: 'daysOfWeek' missing");
return false;
}
@@ -402,7 +402,7 @@ bool AutoRecordings::ParseAutorecAddOrUpdate(htsmsg_t *msg, bool bAdd)
}
else if (bAdd)
{
- Logger::Log(LogLevel::ERROR, "malformed autorecEntryAdd: 'priority' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed autorecEntryAdd: 'priority' missing");
return false;
}
@@ -412,7 +412,7 @@ bool AutoRecordings::ParseAutorecAddOrUpdate(htsmsg_t *msg, bool bAdd)
}
else if (bAdd)
{
- Logger::Log(LogLevel::ERROR, "malformed autorecEntryAdd: 'start' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed autorecEntryAdd: 'start' missing");
return false;
}
@@ -422,7 +422,7 @@ bool AutoRecordings::ParseAutorecAddOrUpdate(htsmsg_t *msg, bool bAdd)
}
else if (bAdd)
{
- Logger::Log(LogLevel::ERROR, "malformed autorecEntryAdd: 'startWindow' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed autorecEntryAdd: 'startWindow' missing");
return false;
}
@@ -432,7 +432,7 @@ bool AutoRecordings::ParseAutorecAddOrUpdate(htsmsg_t *msg, bool bAdd)
}
else if (bAdd)
{
- Logger::Log(LogLevel::ERROR, "malformed autorecEntryAdd: 'startExtra' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed autorecEntryAdd: 'startExtra' missing");
return false;
}
@@ -442,7 +442,7 @@ bool AutoRecordings::ParseAutorecAddOrUpdate(htsmsg_t *msg, bool bAdd)
}
else if (bAdd)
{
- Logger::Log(LogLevel::ERROR, "malformed autorecEntryAdd: 'stopExtra' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed autorecEntryAdd: 'stopExtra' missing");
return false;
}
@@ -452,7 +452,7 @@ bool AutoRecordings::ParseAutorecAddOrUpdate(htsmsg_t *msg, bool bAdd)
}
else if (bAdd && (m_conn.GetProtocol() >= 20))
{
- Logger::Log(LogLevel::ERROR, "malformed autorecEntryAdd: 'dupDetect' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed autorecEntryAdd: 'dupDetect' missing");
return false;
}
@@ -504,10 +504,10 @@ bool AutoRecordings::ParseAutorecDelete(htsmsg_t *msg)
/* Validate/set mandatory fields */
if ((id = htsmsg_get_str(msg, "id")) == NULL)
{
- Logger::Log(LogLevel::ERROR, "malformed autorecEntryDelete: 'id' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed autorecEntryDelete: 'id' missing");
return false;
}
- Logger::Log(LogLevel::TRACE, "delete autorec entry %s", id);
+ Logger::Log(LogLevel::LEVEL_TRACE, "delete autorec entry %s", id);
/* Erase */
m_autoRecordings.erase(std::string(id));
diff --git a/src/HTSPConnection.cpp b/src/HTSPConnection.cpp
index a22ace6..aec1296 100644
--- a/src/HTSPConnection.cpp
+++ b/src/HTSPConnection.cpp
@@ -134,7 +134,7 @@ std::string CHTSPConnection::GetWebURL ( const char *fmt, ... )
bool CHTSPConnection::WaitForConnection ( void )
{
if (!m_ready) {
- Logger::Log(LogLevel::TRACE, "waiting for registration...");
+ Logger::Log(LogLevel::LEVEL_TRACE, "waiting for registration...");
m_regCond.Wait(m_mutex, m_ready, Settings::GetInstance().GetConnectTimeout());
}
return m_ready;
@@ -171,7 +171,7 @@ void CHTSPConnection::OnSleep ( void )
{
CLockObject lock(m_mutex);
- Logger::Log(LogLevel::TRACE, "going to sleep (OnSleep)");
+ Logger::Log(LogLevel::LEVEL_TRACE, "going to sleep (OnSleep)");
/* close connection, prevent reconnect while suspending/suspended */
m_suspended = true;
@@ -181,7 +181,7 @@ void CHTSPConnection::OnWake ( void )
{
CLockObject lock(m_mutex);
- Logger::Log(LogLevel::TRACE, "waking up (OnWake)");
+ Logger::Log(LogLevel::LEVEL_TRACE, "waking up (OnWake)");
/* recreate connection */
m_suspended = false;
@@ -233,7 +233,7 @@ bool CHTSPConnection::ReadMessage ( void )
r = m_socket->Read((char*)buf + cnt, len - cnt, Settings::GetInstance().GetResponseTimeout());
if (r < 0)
{
- Logger::Log(LogLevel::ERROR, "failed to read packet (%s)",
+ Logger::Log(LogLevel::LEVEL_ERROR, "failed to read packet (%s)",
m_socket->GetError().c_str());
free(buf);
return false;
@@ -245,14 +245,14 @@ bool CHTSPConnection::ReadMessage ( void )
if (!(msg = htsmsg_binary_deserialize(buf, len, buf)))
{
/* Do not free buf here. Already done by htsmsg_binary_deserialize. */
- Logger::Log(LogLevel::ERROR, "failed to decode message");
+ Logger::Log(LogLevel::LEVEL_ERROR, "failed to decode message");
return false;
}
/* Sequence number - response */
if (htsmsg_get_u32(msg, "seq", &seq) == 0)
{
- Logger::Log(LogLevel::TRACE, "received response [%d]", seq);
+ Logger::Log(LogLevel::LEVEL_TRACE, "received response [%d]", seq);
CLockObject lock(m_mutex);
CHTSPResponseList::iterator it;
if ((it = m_messages.find(seq)) != m_messages.end())
@@ -265,11 +265,11 @@ bool CHTSPConnection::ReadMessage ( void )
/* Get method */
if (!(method = htsmsg_get_str(msg, "method")))
{
- Logger::Log(LogLevel::ERROR, "message without a method");
+ Logger::Log(LogLevel::LEVEL_ERROR, "message without a method");
htsmsg_destroy(msg);
return true;
}
- Logger::Log(LogLevel::TRACE, "receive message [%s]", method);
+ Logger::Log(LogLevel::LEVEL_TRACE, "receive message [%s]", method);
/* Pass (if return is true, message is finished) */
if (tvh->ProcessMessage(method, msg))
@@ -292,11 +292,11 @@ bool CHTSPConnection::SendMessage0 ( const char *method, htsmsg_t *msg )
if (!htsmsg_get_u32(msg, "seq", &seq))
{
- Logger::Log(LogLevel::TRACE, "sending message [%s : %d]", method, seq);
+ Logger::Log(LogLevel::LEVEL_TRACE, "sending message [%s : %d]", method, seq);
}
else
{
- Logger::Log(LogLevel::TRACE, "sending message [%s]", method);
+ Logger::Log(LogLevel::LEVEL_TRACE, "sending message [%s]", method);
}
htsmsg_add_str(msg, "method", method);
@@ -311,7 +311,7 @@ bool CHTSPConnection::SendMessage0 ( const char *method, htsmsg_t *msg )
free(buf);
if (c != (ssize_t)len)
{
- Logger::Log(LogLevel::ERROR, "failed to write (%s)",
+ Logger::Log(LogLevel::LEVEL_ERROR, "failed to write (%s)",
m_socket->GetError().c_str());
if (!m_suspended)
Disconnect();
@@ -341,7 +341,7 @@ htsmsg_t *CHTSPConnection::SendAndWait0 ( const char *method, htsmsg_t *msg, int
if (!SendMessage0(method, msg))
{
m_messages.erase(seq);
- Logger::Log(LogLevel::ERROR, "failed to transmit");
+ Logger::Log(LogLevel::LEVEL_ERROR, "failed to transmit");
return NULL;
}
@@ -351,7 +351,7 @@ htsmsg_t *CHTSPConnection::SendAndWait0 ( const char *method, htsmsg_t *msg, int
if (!msg)
{
//XBMC->QueueNotification(QUEUE_ERROR, "Command %s failed: No response received", method);
- Logger::Log(LogLevel::ERROR, "Command %s failed: No response received", method);
+ Logger::Log(LogLevel::LEVEL_ERROR, "Command %s failed: No response received", method);
if (!m_suspended)
Disconnect();
return NULL;
@@ -363,7 +363,7 @@ htsmsg_t *CHTSPConnection::SendAndWait0 ( const char *method, htsmsg_t *msg, int
{
// access denied
//XBMC->QueueNotification(QUEUE_ERROR, "Command %s failed: Access denied", method);
- Logger::Log(LogLevel::ERROR, "Command %s failed: Access denied", method);
+ Logger::Log(LogLevel::LEVEL_ERROR, "Command %s failed: Access denied", method);
htsmsg_destroy(msg);
return NULL;
}
@@ -373,7 +373,7 @@ htsmsg_t *CHTSPConnection::SendAndWait0 ( const char *method, htsmsg_t *msg, int
if((strError = htsmsg_get_str(msg, "error")) != NULL)
{
//XBMC->QueueNotification(QUEUE_ERROR, "Command %s failed: %s", method, strError);
- Logger::Log(LogLevel::ERROR, "Command %s failed: %s", method, strError);
+ Logger::Log(LogLevel::LEVEL_ERROR, "Command %s failed: %s", method, strError);
htsmsg_destroy(msg);
return NULL;
}
@@ -418,7 +418,7 @@ bool CHTSPConnection::SendHello ( void )
m_serverVersion = htsmsg_get_str(msg, "serverversion");
m_htspVersion = htsmsg_get_u32_or_default(msg, "htspversion", 0);
m_webRoot = webroot ? webroot : "";
- Logger::Log(LogLevel::DEBUG, "connected to %s / %s (HTSPv%d)",
+ Logger::Log(LogLevel::LEVEL_DEBUG, "connected to %s / %s (HTSPv%d)",
m_serverName.c_str(), m_serverVersion.c_str(), m_htspVersion);
/* Capabilities */
@@ -482,16 +482,16 @@ void CHTSPConnection::Register ( void )
CLockObject lock(m_mutex);
/* Send Greeting */
- Logger::Log(LogLevel::DEBUG, "sending hello");
+ Logger::Log(LogLevel::LEVEL_DEBUG, "sending hello");
if (!SendHello()) {
- Logger::Log(LogLevel::ERROR, "failed to send hello");
+ Logger::Log(LogLevel::LEVEL_ERROR, "failed to send hello");
goto fail;
}
/* Check htsp server version against client minimum htsp version */
if (m_htspVersion < HTSP_MIN_SERVER_VERSION)
{
- Logger::Log(LogLevel::ERROR, "server htsp version (v%d) does not match minimum htsp version required by client (v%d)", m_htspVersion, HTSP_MIN_SERVER_VERSION);
+ Logger::Log(LogLevel::LEVEL_ERROR, "server htsp version (v%d) does not match minimum htsp version required by client (v%d)", m_htspVersion, HTSP_MIN_SERVER_VERSION);
Disconnect();
m_ready = false;
m_regCond.Broadcast();
@@ -499,17 +499,17 @@ void CHTSPConnection::Register ( void )
}
/* Send Auth */
- Logger::Log(LogLevel::DEBUG, "sending auth");
+ Logger::Log(LogLevel::LEVEL_DEBUG, "sending auth");
if (!SendAuth(user, pass))
goto fail;
/* Rebuild state */
- Logger::Log(LogLevel::DEBUG, "rebuilding state");
+ Logger::Log(LogLevel::LEVEL_DEBUG, "rebuilding state");
if (!tvh->Connected())
goto fail;
- Logger::Log(LogLevel::DEBUG, "registered");
+ Logger::Log(LogLevel::LEVEL_DEBUG, "registered");
m_ready = true;
m_regCond.Broadcast();
return;
@@ -531,7 +531,7 @@ void* CHTSPConnection::Process ( void )
while (!IsStopped())
{
- Logger::Log(LogLevel::DEBUG, "new connection requested");
+ Logger::Log(LogLevel::LEVEL_DEBUG, "new connection requested");
std::string host = settings.GetHostname();
int port, timeout;
@@ -555,7 +555,7 @@ void* CHTSPConnection::Process ( void )
while (m_suspended)
{
- Logger::Log(LogLevel::DEBUG, "suspended. Waiting for wakeup...");
+ Logger::Log(LogLevel::LEVEL_DEBUG, "suspended. Waiting for wakeup...");
/* Wait for wakeup */
Sleep(1000);
@@ -563,20 +563,20 @@ void* CHTSPConnection::Process ( void )
if (!log)
{
- Logger::Log(LogLevel::DEBUG, "connecting to %s:%d", host.c_str(), port);
+ Logger::Log(LogLevel::LEVEL_DEBUG, "connecting to %s:%d", host.c_str(), port);
log = true;
}
else
{
- Logger::Log(LogLevel::TRACE, "connecting to %s:%d", host.c_str(), port);
+ Logger::Log(LogLevel::LEVEL_TRACE, "connecting to %s:%d", host.c_str(), port);
}
/* Connect */
- Logger::Log(LogLevel::TRACE, "waiting for connection...");
+ Logger::Log(LogLevel::LEVEL_TRACE, "waiting for connection...");
if (!m_socket->Open(timeout))
{
/* Unable to connect */
- Logger::Log(LogLevel::ERROR, "unable to connect to %s:%d", host.c_str(), port);
+ Logger::Log(LogLevel::LEVEL_ERROR, "unable to connect to %s:%d", host.c_str(), port);
// Retry a few times with a short interval, after that with the default timeout
if (++retryAttempt <= FAST_RECONNECT_ATTEMPTS)
@@ -586,7 +586,7 @@ void* CHTSPConnection::Process ( void )
continue;
}
- Logger::Log(LogLevel::DEBUG, "connected");
+ Logger::Log(LogLevel::LEVEL_DEBUG, "connected");
log = false;
retryAttempt = 0;
@@ -598,7 +598,7 @@ void* CHTSPConnection::Process ( void )
{
if (!ReadMessage())
{
- Logger::Log(LogLevel::DEBUG, "attempting reconnect");
+ Logger::Log(LogLevel::LEVEL_DEBUG, "attempting reconnect");
break;
}
}
diff --git a/src/HTSPDemuxer.cpp b/src/HTSPDemuxer.cpp
index b641c54..9098470 100644
--- a/src/HTSPDemuxer.cpp
+++ b/src/HTSPDemuxer.cpp
@@ -48,7 +48,7 @@ void CHTSPDemuxer::Connected ( void )
/* Re-subscribe */
if (m_subscription.IsActive())
{
- Logger::Log(LogLevel::DEBUG, "demux re-starting stream");
+ Logger::Log(LogLevel::LEVEL_DEBUG, "demux re-starting stream");
m_subscription.SendSubscribe(0, 0, true);
m_subscription.SendSpeed(0, true);
@@ -84,7 +84,7 @@ void CHTSPDemuxer::Abort0 ( void )
bool CHTSPDemuxer::Open ( uint32_t channelId, enum eSubscriptionWeight weight )
{
CLockObject lock(m_conn.Mutex());
- Logger::Log(LogLevel::DEBUG, "demux open");
+ Logger::Log(LogLevel::LEVEL_DEBUG, "demux open");
/* Close current stream */
Close0();
@@ -109,7 +109,7 @@ void CHTSPDemuxer::Close ( void )
{
CLockObject lock(m_conn.Mutex());
Close0();
- Logger::Log(LogLevel::DEBUG, "demux close");
+ Logger::Log(LogLevel::LEVEL_DEBUG, "demux close");
}
DemuxPacket *CHTSPDemuxer::Read ( void )
@@ -117,11 +117,11 @@ DemuxPacket *CHTSPDemuxer::Read ( void )
DemuxPacket *pkt = NULL;
m_lastUse = time(NULL);
if (m_pktBuffer.Pop(pkt, 1000)) {
- Logger::Log(LogLevel::TRACE, "demux read idx :%d pts %lf len %lld",
+ Logger::Log(LogLevel::LEVEL_TRACE, "demux read idx :%d pts %lf len %lld",
pkt->iStreamId, pkt->pts, (long long)pkt->iSize);
return pkt;
}
- Logger::Log(LogLevel::TRACE, "demux read nothing");
+ Logger::Log(LogLevel::LEVEL_TRACE, "demux read nothing");
return PVR->AllocateDemuxPacket(0);
}
@@ -129,7 +129,7 @@ DemuxPacket *CHTSPDemuxer::Read ( void )
void CHTSPDemuxer::Flush ( void )
{
DemuxPacket *pkt;
- Logger::Log(LogLevel::TRACE, "demux flush");
+ Logger::Log(LogLevel::LEVEL_TRACE, "demux flush");
while (m_pktBuffer.Pop(pkt))
PVR->FreeDemuxPacket(pkt);
}
@@ -138,7 +138,7 @@ void CHTSPDemuxer::Trim ( void )
{
DemuxPacket *pkt;
- Logger::Log(LogLevel::TRACE, "demux trim");
+ Logger::Log(LogLevel::LEVEL_TRACE, "demux trim");
/* reduce used buffer space to what is needed for DVDPlayer to resume
* playback without buffering. This depends on the bitrate, so we don't set
* this too small. */
@@ -148,7 +148,7 @@ void CHTSPDemuxer::Trim ( void )
void CHTSPDemuxer::Abort ( void )
{
- Logger::Log(LogLevel::TRACE, "demux abort");
+ Logger::Log(LogLevel::LEVEL_TRACE, "demux abort");
CLockObject lock(m_conn.Mutex());
Abort0();
}
@@ -165,7 +165,7 @@ bool CHTSPDemuxer::Seek
/* Wait for time */
if (!m_seekCond.Wait(m_conn.Mutex(), m_seekTime, Settings::GetInstance().GetResponseTimeout()))
{
- Logger::Log(LogLevel::ERROR, "failed to get subscriptionSeek response");
+ Logger::Log(LogLevel::LEVEL_ERROR, "failed to get subscriptionSeek response");
return false;
}
@@ -174,7 +174,7 @@ bool CHTSPDemuxer::Seek
/* Store */
*startpts = TVH_TO_DVD_TIME(m_seekTime);
- Logger::Log(LogLevel::TRACE, "demux seek startpts = %lf", *startpts);
+ Logger::Log(LogLevel::LEVEL_TRACE, "demux seek startpts = %lf", *startpts);
return true;
}
@@ -259,7 +259,7 @@ bool CHTSPDemuxer::ProcessMessage ( const char *method, htsmsg_t *m )
else if (!strcmp("subscriptionSpeed", method))
ParseSubscriptionSpeed(m);
else
- Logger::Log(LogLevel::DEBUG, "demux unhandled subscription message [%s]",
+ Logger::Log(LogLevel::LEVEL_DEBUG, "demux unhandled subscription message [%s]",
method);
return true;
@@ -278,7 +278,7 @@ void CHTSPDemuxer::ParseMuxPacket ( htsmsg_t *m )
/* Ignore packets while switching channels */
if (!m_subscription.IsActive())
{
- Logger::Log(LogLevel::DEBUG, "Ignored mux packet due to channel switch");
+ Logger::Log(LogLevel::LEVEL_DEBUG, "Ignored mux packet due to channel switch");
return;
}
@@ -286,7 +286,7 @@ void CHTSPDemuxer::ParseMuxPacket ( htsmsg_t *m )
if (htsmsg_get_u32(m, "stream", &idx) ||
htsmsg_get_bin(m, "payload", &bin, &binlen))
{
- Logger::Log(LogLevel::ERROR, "malformed muxpkt: 'stream'/'payload' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed muxpkt: 'stream'/'payload' missing");
return;
}
@@ -296,7 +296,7 @@ void CHTSPDemuxer::ParseMuxPacket ( htsmsg_t *m )
/* Drop packets for unknown streams */
if (-1 == (iStreamId = m_streams.GetStreamId(idx)))
{
- Logger::Log(LogLevel::DEBUG, "Dropped packet with unknown stream index %i", idx);
+ Logger::Log(LogLevel::LEVEL_DEBUG, "Dropped packet with unknown stream index %i", idx);
return;
}
@@ -328,7 +328,7 @@ void CHTSPDemuxer::ParseMuxPacket ( htsmsg_t *m )
if (!type)
type = '_';
- Logger::Log(LogLevel::TRACE, "demux pkt idx %d:%d type %c pts %lf len %lld",
+ Logger::Log(LogLevel::LEVEL_TRACE, "demux pkt idx %d:%d type %c pts %lf len %lld",
idx, pkt->iStreamId, type, pkt->pts, (long long)binlen);
/* Store */
@@ -345,7 +345,7 @@ void CHTSPDemuxer::ParseSubscriptionStart ( htsmsg_t *m )
/* Validate */
if ((l = htsmsg_get_list(m, "streams")) == NULL)
{
- Logger::Log(LogLevel::ERROR, "malformed subscriptionStart: 'streams' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed subscriptionStart: 'streams' missing");
return;
}
m_streamStat.clear();
@@ -367,7 +367,7 @@ void CHTSPDemuxer::ParseSubscriptionStart ( htsmsg_t *m )
/* Find stream */
m_streamStat[idx] = 0;
m_streams.GetStreamData(idx, &stream);
- Logger::Log(LogLevel::DEBUG, "demux subscription start");
+ Logger::Log(LogLevel::LEVEL_DEBUG, "demux subscription start");
CodecDescriptor codecDescriptor = CodecDescriptor::GetCodecByName(type);
xbmc_codec_t codec = codecDescriptor.Codec();
@@ -419,7 +419,7 @@ void CHTSPDemuxer::ParseSubscriptionStart ( htsmsg_t *m )
some versions of tvheadend and is here for backward compatibility. */
if (stream.iWidth == 0 || stream.iHeight == 0)
{
- Logger::Log(LogLevel::DEBUG, "Ignoring subscriptionStart, stream details missing");
+ Logger::Log(LogLevel::LEVEL_DEBUG, "Ignoring subscriptionStart, stream details missing");
return;
}
@@ -434,12 +434,12 @@ void CHTSPDemuxer::ParseSubscriptionStart ( htsmsg_t *m )
}
streams.push_back(stream);
- Logger::Log(LogLevel::DEBUG, " id: %d, type %s, codec: %u", idx, type, stream.iCodecId);
+ Logger::Log(LogLevel::LEVEL_DEBUG, " id: %d, type %s, codec: %u", idx, type, stream.iCodecId);
}
}
/* Update streams */
- Logger::Log(LogLevel::DEBUG, "demux stream change");
+ Logger::Log(LogLevel::LEVEL_DEBUG, "demux stream change");
m_streams.UpdateStreams(streams);
pkt = PVR->AllocateDemuxPacket(0);
pkt->iStreamId = DMX_SPECIALID_STREAMCHANGE;
@@ -456,41 +456,41 @@ void CHTSPDemuxer::ParseSourceInfo ( htsmsg_t *m )
/* Ignore */
if (!m) return;
- Logger::Log(LogLevel::TRACE, "demux sourceInfo:");
+ Logger::Log(LogLevel::LEVEL_TRACE, "demux sourceInfo:");
/* include position in mux name
* as users might receive multiple satellite positions */
m_sourceInfo.si_mux.clear();
if ((str = htsmsg_get_str(m, "satpos")) != NULL)
{
- Logger::Log(LogLevel::TRACE, " satpos : %s", str);
+ Logger::Log(LogLevel::LEVEL_TRACE, " satpos : %s", str);
m_sourceInfo.si_mux.append(str);
m_sourceInfo.si_mux.append(": ");
}
if ((str = htsmsg_get_str(m, "mux")) != NULL)
{
- Logger::Log(LogLevel::TRACE, " mux : %s", str);
+ Logger::Log(LogLevel::LEVEL_TRACE, " mux : %s", str);
m_sourceInfo.si_mux.append(str);
}
if ((str = htsmsg_get_str(m, "adapter")) != NULL)
{
- Logger::Log(LogLevel::TRACE, " adapter : %s", str);
+ Logger::Log(LogLevel::LEVEL_TRACE, " adapter : %s", str);
m_sourceInfo.si_adapter = str;
}
if ((str = htsmsg_get_str(m, "network")) != NULL)
{
- Logger::Log(LogLevel::TRACE, " network : %s", str);
+ Logger::Log(LogLevel::LEVEL_TRACE, " network : %s", str);
m_sourceInfo.si_network = str;
}
if ((str = htsmsg_get_str(m, "provider")) != NULL)
{
- Logger::Log(LogLevel::TRACE, " provider : %s", str);
+ Logger::Log(LogLevel::LEVEL_TRACE, " provider : %s", str);
m_sourceInfo.si_provider = str;
}
if ((str = htsmsg_get_str(m, "service")) != NULL)
{
- Logger::Log(LogLevel::TRACE, " service : %s", str);
+ Logger::Log(LogLevel::LEVEL_TRACE, " service : %s", str);
m_sourceInfo.si_service = str;
}
}
@@ -515,30 +515,30 @@ void CHTSPDemuxer::ParseSubscriptionSpeed ( htsmsg_t *m )
{
uint32_t u32;
if (!htsmsg_get_u32(m, "speed", &u32))
- Logger::Log(LogLevel::TRACE, "recv speed %d", u32);
+ Logger::Log(LogLevel::LEVEL_TRACE, "recv speed %d", u32);
}
void CHTSPDemuxer::ParseQueueStatus ( htsmsg_t *_unused(m) )
{
uint32_t u32;
map<int,int>::const_iterator it;
- Logger::Log(LogLevel::TRACE, "stream stats:");
+ Logger::Log(LogLevel::LEVEL_TRACE, "stream stats:");
for (it = m_streamStat.begin(); it != m_streamStat.end(); ++it)
- Logger::Log(LogLevel::TRACE, " idx:%d num:%d", it->first, it->second);
+ Logger::Log(LogLevel::LEVEL_TRACE, " idx:%d num:%d", it->first, it->second);
- Logger::Log(LogLevel::TRACE, "queue stats:");
+ Logger::Log(LogLevel::LEVEL_TRACE, "queue stats:");
if (!htsmsg_get_u32(m, "packets", &u32))
- Logger::Log(LogLevel::TRACE, " pkts %d", u32);
+ Logger::Log(LogLevel::LEVEL_TRACE, " pkts %d", u32);
if (!htsmsg_get_u32(m, "bytes", &u32))
- Logger::Log(LogLevel::TRACE, " bytes %d", u32);
+ Logger::Log(LogLevel::LEVEL_TRACE, " bytes %d", u32);
if (!htsmsg_get_u32(m, "delay", &u32))
- Logger::Log(LogLevel::TRACE, " delay %d", u32);
+ Logger::Log(LogLevel::LEVEL_TRACE, " delay %d", u32);
if (!htsmsg_get_u32(m, "Idrops", &u32))
- Logger::Log(LogLevel::TRACE, " Idrop %d", u32);
+ Logger::Log(LogLevel::LEVEL_TRACE, " Idrop %d", u32);
if (!htsmsg_get_u32(m, "Pdrops", &u32))
- Logger::Log(LogLevel::TRACE, " Pdrop %d", u32);
+ Logger::Log(LogLevel::LEVEL_TRACE, " Pdrop %d", u32);
if (!htsmsg_get_u32(m, "Bdrops", &u32))
- Logger::Log(LogLevel::TRACE, " Bdrop %d", u32);
+ Logger::Log(LogLevel::LEVEL_TRACE, " Bdrop %d", u32);
}
void CHTSPDemuxer::ParseSignalStatus ( htsmsg_t *m )
@@ -550,34 +550,34 @@ void CHTSPDemuxer::ParseSignalStatus ( htsmsg_t *m )
m_signalInfo.Clear();
/* Parse */
- Logger::Log(LogLevel::TRACE, "signalStatus:");
+ Logger::Log(LogLevel::LEVEL_TRACE, "signalStatus:");
if ((str = htsmsg_get_str(m, "feStatus")) != NULL)
{
- Logger::Log(LogLevel::TRACE, " status : %s", str);
+ Logger::Log(LogLevel::LEVEL_TRACE, " status : %s", str);
m_signalInfo.fe_status = str;
}
else
{
- Logger::Log(LogLevel::ERROR, "malformed signalStatus: 'feStatus' missing, ignoring");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed signalStatus: 'feStatus' missing, ignoring");
}
if (!htsmsg_get_u32(m, "feSNR", &u32))
{
- Logger::Log(LogLevel::TRACE, " snr : %d", u32);
+ Logger::Log(LogLevel::LEVEL_TRACE, " snr : %d", u32);
m_signalInfo.fe_snr = u32;
}
if (!htsmsg_get_u32(m, "feBER", &u32))
{
- Logger::Log(LogLevel::TRACE, " ber : %d", u32);
+ Logger::Log(LogLevel::LEVEL_TRACE, " ber : %d", u32);
m_signalInfo.fe_ber = u32;
}
if (!htsmsg_get_u32(m, "feUNC", &u32))
{
- Logger::Log(LogLevel::TRACE, " unc : %d", u32);
+ Logger::Log(LogLevel::LEVEL_TRACE, " unc : %d", u32);
m_signalInfo.fe_unc = u32;
}
if (!htsmsg_get_u32(m, "feSignal", &u32))
{
- Logger::Log(LogLevel::TRACE, " signal : %d", u32);
+ Logger::Log(LogLevel::LEVEL_TRACE, " signal : %d", u32);
m_signalInfo.fe_signal = u32;
}
}
@@ -588,33 +588,33 @@ void CHTSPDemuxer::ParseTimeshiftStatus ( htsmsg_t *m )
int64_t s64;
/* Parse */
- Logger::Log(LogLevel::TRACE, "timeshiftStatus:");
+ Logger::Log(LogLevel::LEVEL_TRACE, "timeshiftStatus:");
if (!htsmsg_get_u32(m, "full", &u32))
{
- Logger::Log(LogLevel::TRACE, " full : %d", u32);
+ Logger::Log(LogLevel::LEVEL_TRACE, " full : %d", u32);
m_timeshiftStatus.full = (bool)u32;
}
else
{
- Logger::Log(LogLevel::ERROR, "malformed timeshiftStatus: 'full' missing, ignoring");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed timeshiftStatus: 'full' missing, ignoring");
}
if (!htsmsg_get_s64(m, "shift", &s64))
{
- Logger::Log(LogLevel::TRACE, " shift : %lld", s64);
+ Logger::Log(LogLevel::LEVEL_TRACE, " shift : %lld", s64);
m_timeshiftStatus.shift = s64;
}
else
{
- Logger::Log(LogLevel::ERROR, "malformed timeshiftStatus: 'shift' missing, ignoring");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed timeshiftStatus: 'shift' missing, ignoring");
}
if (!htsmsg_get_s64(m, "start", &s64))
{
- Logger::Log(LogLevel::TRACE, " start : %lld", s64);
+ Logger::Log(LogLevel::LEVEL_TRACE, " start : %lld", s64);
m_timeshiftStatus.start = s64;
}
if (!htsmsg_get_s64(m, "end", &s64))
{
- Logger::Log(LogLevel::TRACE, " end : %lld", s64);
+ Logger::Log(LogLevel::LEVEL_TRACE, " end : %lld", s64);
m_timeshiftStatus.end = s64;
}
}
diff --git a/src/HTSPVFS.cpp b/src/HTSPVFS.cpp
index 0c482f8..0463f56 100644
--- a/src/HTSPVFS.cpp
+++ b/src/HTSPVFS.cpp
@@ -50,10 +50,10 @@ void CHTSPVFS::Connected ( void )
/* Re-open */
if (m_fileId != 0)
{
- Logger::Log(LogLevel::DEBUG, "vfs re-open file");
+ Logger::Log(LogLevel::LEVEL_DEBUG, "vfs re-open file");
if (!SendFileOpen(true) || !SendFileSeek(m_offset, SEEK_SET, true))
{
- Logger::Log(LogLevel::ERROR, "vfs failed to re-open file");
+ Logger::Log(LogLevel::LEVEL_ERROR, "vfs failed to re-open file");
Close();
}
}
@@ -74,7 +74,7 @@ bool CHTSPVFS::Open ( const PVR_RECORDING &rec )
/* Send open */
if (!SendFileOpen())
{
- Logger::Log(LogLevel::ERROR, "vfs failed to open file");
+ Logger::Log(LogLevel::LEVEL_ERROR, "vfs failed to open file");
return false;
}
@@ -133,7 +133,7 @@ long long CHTSPVFS::Size ( void )
m = htsmsg_create_map();
htsmsg_add_u32(m, "id", m_fileId);
- Logger::Log(LogLevel::TRACE, "vfs stat id=%d", m_fileId);
+ Logger::Log(LogLevel::LEVEL_TRACE, "vfs stat id=%d", m_fileId);
/* Send */
{
@@ -148,7 +148,7 @@ long long CHTSPVFS::Size ( void )
if (htsmsg_get_s64(m, "size", &ret))
ret = -1;
else
- Logger::Log(LogLevel::TRACE, "vfs stat size=%lld", (long long)ret);
+ Logger::Log(LogLevel::LEVEL_TRACE, "vfs stat size=%lld", (long long)ret);
htsmsg_destroy(m);
@@ -167,7 +167,7 @@ bool CHTSPVFS::SendFileOpen ( bool force )
m = htsmsg_create_map();
htsmsg_add_str(m, "file", m_path.c_str());
- Logger::Log(LogLevel::DEBUG, "vfs open file=%s", m_path.c_str());
+ Logger::Log(LogLevel::LEVEL_DEBUG, "vfs open file=%s", m_path.c_str());
/* Send */
{
@@ -185,11 +185,11 @@ bool CHTSPVFS::SendFileOpen ( bool force )
/* Get ID */
if (htsmsg_get_u32(m, "id", &m_fileId))
{
- Logger::Log(LogLevel::ERROR, "malformed fileOpen response: 'id' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed fileOpen response: 'id' missing");
m_fileId = 0;
}
else
- Logger::Log(LogLevel::TRACE, "vfs opened id=%d", m_fileId);
+ Logger::Log(LogLevel::LEVEL_TRACE, "vfs opened id=%d", m_fileId);
htsmsg_destroy(m);
return m_fileId > 0;
@@ -203,7 +203,7 @@ void CHTSPVFS::SendFileClose ( void )
m = htsmsg_create_map();
htsmsg_add_u32(m, "id", m_fileId);
- Logger::Log(LogLevel::DEBUG, "vfs close id=%d", m_fileId);
+ Logger::Log(LogLevel::LEVEL_DEBUG, "vfs close id=%d", m_fileId);
/* Send */
{
@@ -229,7 +229,7 @@ long long CHTSPVFS::SendFileSeek ( int64_t pos, int whence, bool force )
else if (whence == SEEK_END)
htsmsg_add_str(m, "whence", "SEEK_END");
- Logger::Log(LogLevel::TRACE, "vfs seek id=%d whence=%d pos=%lld",
+ Logger::Log(LogLevel::LEVEL_TRACE, "vfs seek id=%d whence=%d pos=%lld",
m_fileId, whence, (long long)pos);
/* Send */
@@ -244,7 +244,7 @@ long long CHTSPVFS::SendFileSeek ( int64_t pos, int whence, bool force )
if (m == NULL)
{
- Logger::Log(LogLevel::ERROR, "vfs fileSeek failed");
+ Logger::Log(LogLevel::LEVEL_ERROR, "vfs fileSeek failed");
return -1;
}
@@ -252,13 +252,13 @@ long long CHTSPVFS::SendFileSeek ( int64_t pos, int whence, bool force )
if (htsmsg_get_s64(m, "offset", &ret))
{
ret = -1;
- Logger::Log(LogLevel::ERROR, "vfs fileSeek response: 'offset' missing'");
+ Logger::Log(LogLevel::LEVEL_ERROR, "vfs fileSeek response: 'offset' missing'");
/* Update */
}
else
{
- Logger::Log(LogLevel::TRACE, "vfs seek offset=%lld", (long long)ret);
+ Logger::Log(LogLevel::LEVEL_TRACE, "vfs seek offset=%lld", (long long)ret);
m_offset = ret;
}
@@ -279,7 +279,7 @@ ssize_t CHTSPVFS::SendFileRead(unsigned char *buf, unsigned int len)
htsmsg_add_u32(m, "id", m_fileId);
htsmsg_add_s64(m, "size", len);
- Logger::Log(LogLevel::TRACE, "vfs read id=%d size=%d",
+ Logger::Log(LogLevel::LEVEL_TRACE, "vfs read id=%d size=%d",
m_fileId, len);
/* Send */
@@ -290,14 +290,14 @@ ssize_t CHTSPVFS::SendFileRead(unsigned char *buf, unsigned int len)
if (m == NULL)
{
- Logger::Log(LogLevel::ERROR, "vfs fileRead failed");
+ Logger::Log(LogLevel::LEVEL_ERROR, "vfs fileRead failed");
return -1;
}
/* Get Data */
if (htsmsg_get_bin(m, "data", &buffer, reinterpret_cast<size_t *>(&read)))
{
- Logger::Log(LogLevel::ERROR, "malformed fileRead response: 'data' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed fileRead response: 'data' missing");
read = -1;
/* Store */
diff --git a/src/TimeRecordings.cpp b/src/TimeRecordings.cpp
index 5c8a307..2ccaeac 100644
--- a/src/TimeRecordings.cpp
+++ b/src/TimeRecordings.cpp
@@ -109,7 +109,7 @@ const unsigned int TimeRecordings::GetTimerIntIdFromStringId(const std::string &
if (tit->second.GetStringId() == strId)
return tit->second.GetId();
}
- Logger::Log(LogLevel::ERROR, "Timerec: Unable to obtain int id for string id %s", strId.c_str());
+ Logger::Log(LogLevel::LEVEL_ERROR, "Timerec: Unable to obtain int id for string id %s", strId.c_str());
return 0;
}
@@ -121,7 +121,7 @@ const std::string TimeRecordings::GetTimerStringIdFromIntId(int intId) const
return tit->second.GetStringId();
}
- Logger::Log(LogLevel::ERROR, "Timerec: Unable to obtain string id for int id %s", intId);
+ Logger::Log(LogLevel::LEVEL_ERROR, "Timerec: Unable to obtain string id for int id %s", intId);
return "";
}
@@ -209,7 +209,7 @@ PVR_ERROR TimeRecordings::SendTimerecAddOrUpdate(const PVR_TIMER &timer, bool up
/* Check for error */
if (htsmsg_get_u32(m, "success", &u32))
{
- Logger::Log(LogLevel::ERROR, "malformed %s response: 'success' missing", method.c_str());
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed %s response: 'success' missing", method.c_str());
u32 = PVR_ERROR_FAILED;
}
htsmsg_destroy(m);
@@ -240,7 +240,7 @@ PVR_ERROR TimeRecordings::SendTimerecDelete(const PVR_TIMER &timer)
/* Check for error */
if (htsmsg_get_u32(m, "success", &u32))
{
- Logger::Log(LogLevel::ERROR, "malformed deleteTimerecEntry response: 'success' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed deleteTimerecEntry response: 'success' missing");
}
htsmsg_destroy(m);
@@ -256,7 +256,7 @@ bool TimeRecordings::ParseTimerecAddOrUpdate(htsmsg_t *msg, bool bAdd)
/* Validate/set mandatory fields */
if ((str = htsmsg_get_str(msg, "id")) == NULL)
{
- Logger::Log(LogLevel::ERROR, "malformed timerecEntryAdd/timerecEntryUpdate: 'id' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed timerecEntryAdd/timerecEntryUpdate: 'id' missing");
return false;
}
@@ -273,7 +273,7 @@ bool TimeRecordings::ParseTimerecAddOrUpdate(htsmsg_t *msg, bool bAdd)
}
else if (bAdd)
{
- Logger::Log(LogLevel::ERROR, "malformed timerecEntryAdd: 'enabled' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed timerecEntryAdd: 'enabled' missing");
return false;
}
@@ -283,7 +283,7 @@ bool TimeRecordings::ParseTimerecAddOrUpdate(htsmsg_t *msg, bool bAdd)
}
else if (bAdd)
{
- Logger::Log(LogLevel::ERROR, "malformed timerecEntryAdd: 'daysOfWeek' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed timerecEntryAdd: 'daysOfWeek' missing");
return false;
}
@@ -295,7 +295,7 @@ bool TimeRecordings::ParseTimerecAddOrUpdate(htsmsg_t *msg, bool bAdd)
}
else if (bAdd)
{
- Logger::Log(LogLevel::ERROR, "malformed timerecEntryAdd: 'removal' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed timerecEntryAdd: 'removal' missing");
return false;
}
}
@@ -307,7 +307,7 @@ bool TimeRecordings::ParseTimerecAddOrUpdate(htsmsg_t *msg, bool bAdd)
}
else if (bAdd)
{
- Logger::Log(LogLevel::ERROR, "malformed timerecEntryAdd: 'retention' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed timerecEntryAdd: 'retention' missing");
return false;
}
}
@@ -318,7 +318,7 @@ bool TimeRecordings::ParseTimerecAddOrUpdate(htsmsg_t *msg, bool bAdd)
}
else if (bAdd)
{
- Logger::Log(LogLevel::ERROR, "malformed timerecEntryAdd: 'priority' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed timerecEntryAdd: 'priority' missing");
return false;
}
@@ -328,7 +328,7 @@ bool TimeRecordings::ParseTimerecAddOrUpdate(htsmsg_t *msg, bool bAdd)
}
else if (bAdd)
{
- Logger::Log(LogLevel::ERROR, "malformed timerecEntryAdd: 'start' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed timerecEntryAdd: 'start' missing");
return false;
}
@@ -338,7 +338,7 @@ bool TimeRecordings::ParseTimerecAddOrUpdate(htsmsg_t *msg, bool bAdd)
}
else if (bAdd)
{
- Logger::Log(LogLevel::ERROR, "malformed timerecEntryAdd: 'stop' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed timerecEntryAdd: 'stop' missing");
return false;
}
@@ -391,10 +391,10 @@ bool TimeRecordings::ParseTimerecDelete(htsmsg_t *msg)
/* Validate/set mandatory fields */
if ((id = htsmsg_get_str(msg, "id")) == NULL)
{
- Logger::Log(LogLevel::ERROR, "malformed timerecEntryDelete: 'id' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed timerecEntryDelete: 'id' missing");
return false;
}
- Logger::Log(LogLevel::TRACE, "delete timerec entry %s", id);
+ Logger::Log(LogLevel::LEVEL_TRACE, "delete timerec entry %s", id);
/* Erase */
m_timeRecordings.erase(std::string(id));
diff --git a/src/Tvheadend.cpp b/src/Tvheadend.cpp
index 7671a94..2beee74 100644
--- a/src/Tvheadend.cpp
+++ b/src/Tvheadend.cpp
@@ -92,7 +92,7 @@ PVR_ERROR CTvheadend::GetDriveSpace ( long long *total, long long *used )
error:
htsmsg_destroy(m);
- Logger::Log(LogLevel::ERROR, "malformed getDiskSpace response: 'totaldiskspace'/'freediskspace' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed getDiskSpace response: 'totaldiskspace'/'freediskspace' missing");
return PVR_ERROR_SERVER_ERROR;
}
@@ -131,7 +131,7 @@ void CTvheadend::QueryAvailableProfiles()
if ((l = htsmsg_get_list(m, "profiles")) == NULL)
{
- Logger::Log(LogLevel::ERROR, "malformed getProfiles: 'profiles' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed getProfiles: 'profiles' missing");
htsmsg_destroy(m);
return;
}
@@ -149,7 +149,7 @@ void CTvheadend::QueryAvailableProfiles()
if ((str = htsmsg_get_str(&f->hmf_msg, "comment")) != NULL)
profile.SetComment(str);
- Logger::Log(LogLevel::DEBUG, "profile name: %s, comment: %s added",
+ Logger::Log(LogLevel::LEVEL_DEBUG, "profile name: %s, comment: %s added",
profile.GetName().c_str(), profile.GetComment().c_str());
m_profiles.push_back(profile);
@@ -359,7 +359,7 @@ PVR_ERROR CTvheadend::SendDvrDelete ( uint32_t id, const char *method )
/* Check for error */
if (htsmsg_get_u32(m, "success", &u32))
{
- Logger::Log(LogLevel::ERROR, "malformed deleteDvrEntry/cancelDvrEntry response: 'success' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed deleteDvrEntry/cancelDvrEntry response: 'success' missing");
u32 = PVR_ERROR_FAILED;
}
htsmsg_destroy(m);
@@ -383,7 +383,7 @@ PVR_ERROR CTvheadend::SendDvrUpdate( htsmsg_t* m )
/* Check for error */
if (htsmsg_get_u32(m, "success", &u32))
{
- Logger::Log(LogLevel::ERROR, "malformed updateDvrEntry response: 'success' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed updateDvrEntry response: 'success' missing");
u32 = PVR_ERROR_FAILED;
}
htsmsg_destroy(m);
@@ -506,7 +506,7 @@ PVR_ERROR CTvheadend::GetRecordingEdl
htsmsg_t *m = htsmsg_create_map();
htsmsg_add_u32(m, "id", atoi(rec.strRecordingId));
- Logger::Log(LogLevel::DEBUG, "dvr get cutpoints id=%s", rec.strRecordingId);
+ Logger::Log(LogLevel::LEVEL_DEBUG, "dvr get cutpoints id=%s", rec.strRecordingId);
/* Send and Wait */
{
@@ -542,7 +542,7 @@ PVR_ERROR CTvheadend::GetRecordingEdl
htsmsg_get_u32(&f->hmf_msg, "end", &end) ||
htsmsg_get_u32(&f->hmf_msg, "type", &type))
{
- Logger::Log(LogLevel::ERROR, "malformed getDvrCutpoints response: invalid EDL entry, will ignore");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed getDvrCutpoints response: invalid EDL entry, will ignore");
continue;
}
@@ -567,7 +567,7 @@ PVR_ERROR CTvheadend::GetRecordingEdl
}
idx++;
- Logger::Log(LogLevel::DEBUG, "edl start:%d end:%d action:%d", start, end, type);
+ Logger::Log(LogLevel::LEVEL_DEBUG, "edl start:%d end:%d action:%d", start, end, type);
}
*num = idx;
@@ -1022,7 +1022,7 @@ PVR_ERROR CTvheadend::AddTimer ( const PVR_TIMER &timer )
/* Check for error */
if (htsmsg_get_u32(m, "success", &u32))
{
- Logger::Log(LogLevel::ERROR, "malformed addDvrEntry response: 'success' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed addDvrEntry response: 'success' missing");
u32 = PVR_ERROR_FAILED;
}
htsmsg_destroy(m);
@@ -1042,7 +1042,7 @@ PVR_ERROR CTvheadend::AddTimer ( const PVR_TIMER &timer )
else
{
/* unknown timer */
- Logger::Log(LogLevel::ERROR, "unknown timer type");
+ Logger::Log(LogLevel::LEVEL_ERROR, "unknown timer type");
return PVR_ERROR_INVALID_PARAMETERS;
}
}
@@ -1078,14 +1078,14 @@ PVR_ERROR CTvheadend::DeleteTimer
}
else
{
- Logger::Log(LogLevel::ERROR, "timer is read-only");
+ Logger::Log(LogLevel::LEVEL_ERROR, "timer is read-only");
return PVR_ERROR_INVALID_PARAMETERS;
}
}
else
{
/* unknown timer */
- Logger::Log(LogLevel::ERROR, "unknown timer type");
+ Logger::Log(LogLevel::LEVEL_ERROR, "unknown timer type");
return PVR_ERROR_INVALID_PARAMETERS;
}
}
@@ -1111,13 +1111,13 @@ PVR_ERROR CTvheadend::UpdateTimer ( const PVR_TIMER &timer )
const auto &it = m_recordings.find(timer.iClientIndex);
if (it == m_recordings.end())
{
- Logger::Log(LogLevel::ERROR, "cannot find the timer to update");
+ Logger::Log(LogLevel::LEVEL_ERROR, "cannot find the timer to update");
return PVR_ERROR_INVALID_PARAMETERS;
}
if (it->second.GetChannel() != static_cast<uint32_t>(timer.iClientChannelUid))
{
- Logger::Log(LogLevel::ERROR, "updating channels of one-shot timers not supported by HTSP v%d", m_conn.GetProtocol());
+ Logger::Log(LogLevel::LEVEL_ERROR, "updating channels of one-shot timers not supported by HTSP v%d", m_conn.GetProtocol());
return PVR_ERROR_NOT_IMPLEMENTED;
}
}
@@ -1180,13 +1180,13 @@ PVR_ERROR CTvheadend::UpdateTimer ( const PVR_TIMER &timer )
}
}
- Logger::Log(LogLevel::ERROR, "timer is read-only");
+ Logger::Log(LogLevel::LEVEL_ERROR, "timer is read-only");
return PVR_ERROR_INVALID_PARAMETERS;
}
else
{
/* unknown timer */
- Logger::Log(LogLevel::ERROR, "unknown timer type");
+ Logger::Log(LogLevel::LEVEL_ERROR, "unknown timer type");
return PVR_ERROR_INVALID_PARAMETERS;
}
}
@@ -1239,7 +1239,7 @@ PVR_ERROR CTvheadend::GetEpg
htsmsg_field_t *f;
int n = 0;
- Logger::Log(LogLevel::TRACE, "get epg channel %d start %ld stop %ld", chn.iUniqueId,
+ Logger::Log(LogLevel::LEVEL_TRACE, "get epg channel %d start %ld stop %ld", chn.iUniqueId,
(long long)start, (long long)end);
/* Async transfer */
@@ -1285,7 +1285,7 @@ PVR_ERROR CTvheadend::GetEpg
if (!(l = htsmsg_get_list(msg, "events")))
{
htsmsg_destroy(msg);
- Logger::Log(LogLevel::ERROR, "malformed getEvents response: 'events' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed getEvents response: 'events' missing");
return PVR_ERROR_SERVER_ERROR;
}
HTSMSG_FOREACH(f, l)
@@ -1304,7 +1304,7 @@ PVR_ERROR CTvheadend::GetEpg
htsmsg_destroy(msg);
}
- Logger::Log(LogLevel::TRACE, "get epg channel %d events %d", chn.iUniqueId, n);
+ Logger::Log(LogLevel::LEVEL_TRACE, "get epg channel %d events %d", chn.iUniqueId, n);
return PVR_ERROR_NO_ERROR;
}
@@ -1352,7 +1352,7 @@ bool CTvheadend::Connected ( void )
return false;
htsmsg_destroy(msg);
- Logger::Log(LogLevel::DEBUG, "async updates requested");
+ Logger::Log(LogLevel::LEVEL_DEBUG, "async updates requested");
return true;
}
@@ -1473,7 +1473,7 @@ void* CTvheadend::Process ( void )
/* Unknown */
else
- Logger::Log(LogLevel::DEBUG, "unhandled message [%s]", method);
+ Logger::Log(LogLevel::LEVEL_DEBUG, "unhandled message [%s]", method);
/* make a copy of events list to process it without lock. */
eventsCopy = m_events;
@@ -1630,7 +1630,7 @@ void CTvheadend::ParseTagAddOrUpdate ( htsmsg_t *msg, bool bAdd )
/* Validate */
if (htsmsg_get_u32(msg, "tagId", &u32))
{
- Logger::Log(LogLevel::ERROR, "malformed tagAdd/tagUpdate: 'tagId' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed tagAdd/tagUpdate: 'tagId' missing");
return;
}
@@ -1651,7 +1651,7 @@ void CTvheadend::ParseTagAddOrUpdate ( htsmsg_t *msg, bool bAdd )
tag.SetName(str);
else if (bAdd)
{
- Logger::Log(LogLevel::ERROR, "malformed tagAdd: 'tagName' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed tagAdd: 'tagName' missing");
return;
}
@@ -1675,7 +1675,7 @@ void CTvheadend::ParseTagAddOrUpdate ( htsmsg_t *msg, bool bAdd )
{
existingTag = tag;
- Logger::Log(LogLevel::DEBUG, "tag updated id:%u, name:%s",
+ Logger::Log(LogLevel::LEVEL_DEBUG, "tag updated id:%u, name:%s",
existingTag.GetId(), existingTag.GetName().c_str());
if (m_asyncState.GetState() > ASYNC_CHN)
TriggerChannelGroupsUpdate();
@@ -1689,10 +1689,10 @@ void CTvheadend::ParseTagDelete ( htsmsg_t *msg )
/* Validate */
if (htsmsg_get_u32(msg, "tagId", &u32))
{
- Logger::Log(LogLevel::ERROR, "malformed tagDelete: 'tagId' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed tagDelete: 'tagId' missing");
return;
}
- Logger::Log(LogLevel::DEBUG, "delete tag %u", u32);
+ Logger::Log(LogLevel::LEVEL_DEBUG, "delete tag %u", u32);
/* Erase */
m_tags.erase(u32);
@@ -1708,7 +1708,7 @@ void CTvheadend::ParseChannelAddOrUpdate ( htsmsg_t *msg, bool bAdd )
/* Validate */
if (htsmsg_get_u32(msg, "channelId", &u32))
{
- Logger::Log(LogLevel::ERROR, "malformed channelAdd/channelUpdate: 'channelId' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed channelAdd/channelUpdate: 'channelId' missing");
return;
}
@@ -1723,7 +1723,7 @@ void CTvheadend::ParseChannelAddOrUpdate ( htsmsg_t *msg, bool bAdd )
channel.SetName(str);
else if (bAdd)
{
- Logger::Log(LogLevel::ERROR, "malformed channelAdd: 'channelName' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed channelAdd: 'channelName' missing");
return;
}
@@ -1736,7 +1736,7 @@ void CTvheadend::ParseChannelAddOrUpdate ( htsmsg_t *msg, bool bAdd )
}
else if (bAdd)
{
- Logger::Log(LogLevel::ERROR, "malformed channelAdd: 'channelNumber' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed channelAdd: 'channelNumber' missing");
return;
}
else if (!channel.GetNum())
@@ -1780,7 +1780,7 @@ void CTvheadend::ParseChannelAddOrUpdate ( htsmsg_t *msg, bool bAdd )
/* Update Kodi */
if (channel != comparison)
{
- Logger::Log(LogLevel::DEBUG, "channel %s id:%u, name:%s",
+ Logger::Log(LogLevel::LEVEL_DEBUG, "channel %s id:%u, name:%s",
(bAdd ? "added" : "updated"), channel.GetId(), channel.GetName().c_str());
if (bAdd)
@@ -1800,10 +1800,10 @@ void CTvheadend::ParseChannelDelete ( htsmsg_t *msg )
/* Validate */
if (htsmsg_get_u32(msg, "channelId", &u32))
{
- Logger::Log(LogLevel::ERROR, "malformed channelDelete: 'channelId' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed channelDelete: 'channelId' missing");
return;
}
- Logger::Log(LogLevel::DEBUG, "delete channel %u", u32);
+ Logger::Log(LogLevel::LEVEL_DEBUG, "delete channel %u", u32);
/* Erase */
m_channels.erase(u32);
@@ -1823,25 +1823,25 @@ void CTvheadend::ParseRecordingAddOrUpdate ( htsmsg_t *msg, bool bAdd )
/* Validate */
if (htsmsg_get_u32(msg, "id", &id))
{
- Logger::Log(LogLevel::ERROR, "malformed dvrEntryAdd/dvrEntryUpdate: 'id' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed dvrEntryAdd/dvrEntryUpdate: 'id' missing");
return;
}
if (htsmsg_get_s64(msg, "start", &start) && bAdd)
{
- Logger::Log(LogLevel::ERROR, "malformed dvrEntryAdd: 'start' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed dvrEntryAdd: 'start' missing");
return;
}
if (htsmsg_get_s64(msg, "stop", &stop) && bAdd)
{
- Logger::Log(LogLevel::ERROR, "malformed dvrEntryAdd: 'stop' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed dvrEntryAdd: 'stop' missing");
return;
}
if (((state = htsmsg_get_str(msg, "state")) == NULL) && bAdd)
{
- Logger::Log(LogLevel::ERROR, "malformed dvrEntryAdd: 'state' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed dvrEntryAdd: 'state' missing");
return;
}
@@ -1861,7 +1861,7 @@ void CTvheadend::ParseRecordingAddOrUpdate ( htsmsg_t *msg, bool bAdd )
rec.SetStartExtra(startExtra);
else if (bAdd)
{
- Logger::Log(LogLevel::ERROR, "malformed dvrEntryAdd: 'startExtra' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed dvrEntryAdd: 'startExtra' missing");
return;
}
@@ -1869,7 +1869,7 @@ void CTvheadend::ParseRecordingAddOrUpdate ( htsmsg_t *msg, bool bAdd )
rec.SetStopExtra(stopExtra);
else if (bAdd)
{
- Logger::Log(LogLevel::ERROR, "malformed dvrEntryAdd: 'stopExtra' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed dvrEntryAdd: 'stopExtra' missing");
return;
}
@@ -1879,7 +1879,7 @@ void CTvheadend::ParseRecordingAddOrUpdate ( htsmsg_t *msg, bool bAdd )
rec.SetLifetime(removal);
else if (bAdd)
{
- Logger::Log(LogLevel::ERROR, "malformed dvrEntryAdd: 'removal' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed dvrEntryAdd: 'removal' missing");
return;
}
}
@@ -1889,7 +1889,7 @@ void CTvheadend::ParseRecordingAddOrUpdate ( htsmsg_t *msg, bool bAdd )
rec.SetLifetime(retention);
else if (bAdd)
{
- Logger::Log(LogLevel::ERROR, "malformed dvrEntryAdd: 'retention' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed dvrEntryAdd: 'retention' missing");
return;
}
}
@@ -1906,13 +1906,13 @@ void CTvheadend::ParseRecordingAddOrUpdate ( htsmsg_t *msg, bool bAdd )
rec.SetPriority(priority);
break;
default:
- Logger::Log(LogLevel::ERROR, "malformed dvrEntryAdd/dvrEntryUpdate: unknown priority value %d", priority);
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed dvrEntryAdd/dvrEntryUpdate: unknown priority value %d", priority);
return;
}
}
else if (bAdd)
{
- Logger::Log(LogLevel::ERROR, "malformed dvrEntryAdd: 'priority' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed dvrEntryAdd: 'priority' missing");
return;
}
@@ -1981,7 +1981,7 @@ void CTvheadend::ParseRecordingAddOrUpdate ( htsmsg_t *msg, bool bAdd )
{
std::string error = rec.GetError().empty() ? "none" : rec.GetError();
- Logger::Log(LogLevel::DEBUG, "recording id:%d, state:%s, title:%s, desc:%s, error:%s",
+ Logger::Log(LogLevel::LEVEL_DEBUG, "recording id:%d, state:%s, title:%s, desc:%s, error:%s",
rec.GetId(), state, rec.GetTitle().c_str(), rec.GetDescription().c_str(),
error.c_str());
@@ -2000,10 +2000,10 @@ void CTvheadend::ParseRecordingDelete ( htsmsg_t *msg )
/* Validate */
if (htsmsg_get_u32(msg, "id", &u32))
{
- Logger::Log(LogLevel::ERROR, "malformed dvrEntryDelete: 'id' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed dvrEntryDelete: 'id' missing");
return;
}
- Logger::Log(LogLevel::DEBUG, "delete recording %u", u32);
+ Logger::Log(LogLevel::LEVEL_DEBUG, "delete recording %u", u32);
/* Erase */
m_recordings.erase(u32);
@@ -2025,25 +2025,25 @@ bool CTvheadend::ParseEvent ( htsmsg_t *msg, bool bAdd, Event &evt )
/* Validate */
if (htsmsg_get_u32(msg, "eventId", &id))
{
- Logger::Log(LogLevel::ERROR, "malformed eventAdd/eventUpdate: 'eventId' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed eventAdd/eventUpdate: 'eventId' missing");
return false;
}
if (htsmsg_get_u32(msg, "channelId", &channel) && bAdd)
{
- Logger::Log(LogLevel::ERROR, "malformed eventAdd: 'channelId' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed eventAdd: 'channelId' missing");
return false;
}
if (htsmsg_get_s64(msg, "start", &start) && bAdd)
{
- Logger::Log(LogLevel::ERROR, "malformed eventAdd: 'start' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed eventAdd: 'start' missing");
return false;
}
if (htsmsg_get_s64(msg, "stop", &stop) && bAdd)
{
- Logger::Log(LogLevel::ERROR, "malformed eventAdd: 'stop' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed eventAdd: 'stop' missing");
return false;
}
@@ -2118,7 +2118,7 @@ void CTvheadend::ParseEventAddOrUpdate ( htsmsg_t *msg, bool bAdd )
/* Update */
if (evt != comparison)
{
- Logger::Log(LogLevel::TRACE, "event id:%d channel:%d start:%d stop:%d title:%s desc:%s",
+ Logger::Log(LogLevel::LEVEL_TRACE, "event id:%d channel:%d start:%d stop:%d title:%s desc:%s",
evt.GetId(), evt.GetChannel(), (int)evt.GetStart(), (int)evt.GetStop(),
evt.GetTitle().c_str(), evt.GetDesc().c_str());
@@ -2134,10 +2134,10 @@ void CTvheadend::ParseEventDelete ( htsmsg_t *msg )
/* Validate */
if (htsmsg_get_u32(msg, "eventId", &u32))
{
- Logger::Log(LogLevel::ERROR, "malformed eventDelete: 'eventId' missing");
+ Logger::Log(LogLevel::LEVEL_ERROR, "malformed eventDelete: 'eventId' missing");
return;
}
- Logger::Log(LogLevel::TRACE, "delete event %u", u32);
+ Logger::Log(LogLevel::LEVEL_TRACE, "delete event %u", u32);
/* Erase */
for (auto &entry : m_schedules)
@@ -2150,7 +2150,7 @@ void CTvheadend::ParseEventDelete ( htsmsg_t *msg )
if (eit != events.end())
{
- Logger::Log(LogLevel::TRACE, "deleted event %d from channel %d", u32, schedule.GetId());
+ Logger::Log(LogLevel::LEVEL_TRACE, "deleted event %d from channel %d", u32, schedule.GetId());
events.erase(eit);
TriggerEpgUpdate(schedule.GetId());
return;
@@ -2182,7 +2182,7 @@ void CTvheadend::TuneOnOldest( uint32_t channelId )
}
if (oldest)
{
- Logger::Log(LogLevel::TRACE, "pretuning channel %u on subscription %u",
+ Logger::Log(LogLevel::LEVEL_TRACE, "pretuning channel %u on subscription %u",
m_channels[channelId].GetNum(), oldest->GetSubscriptionId());
oldest->Open(channelId, SUBSCRIPTION_WEIGHT_PRETUNING);
}
@@ -2222,7 +2222,7 @@ bool CTvheadend::DemuxOpen( const PVR_CHANNEL &chn )
{
if (dmx != m_dmx_active && dmx->GetChannelId() == chn.iUniqueId)
{
- Logger::Log(LogLevel::TRACE, "retuning channel %u on subscription %u",
+ Logger::Log(LogLevel::LEVEL_TRACE, "retuning channel %u on subscription %u",
m_channels[chn.iUniqueId].GetNum(), dmx->GetSubscriptionId());
/* Lower the priority on the current subscrption */
@@ -2243,7 +2243,7 @@ bool CTvheadend::DemuxOpen( const PVR_CHANNEL &chn )
/* If we don't have an existing subscription for the channel we create one
* on the oldest demuxer */
- Logger::Log(LogLevel::TRACE, "tuning channel %u on subscription %u",
+ Logger::Log(LogLevel::LEVEL_TRACE, "tuning channel %u on subscription %u",
m_channels[chn.iUniqueId].GetNum(), oldest->GetSubscriptionId());
prevId = m_dmx_active->GetChannelId();
@@ -2282,7 +2282,7 @@ DemuxPacket* CTvheadend::DemuxRead ( void )
if (dmx->GetChannelId() && Settings::GetInstance().GetPreTunerCloseDelay() &&
dmx->GetLastUse() + Settings::GetInstance().GetPreTunerCloseDelay() < time(NULL))
{
- Logger::Log(LogLevel::TRACE, "untuning channel %u on subscription %u",
+ Logger::Log(LogLevel::LEVEL_TRACE, "untuning channel %u on subscription %u",
m_channels[dmx->GetChannelId()].GetNum(), dmx->GetSubscriptionId());
dmx->Close();
}
diff --git a/src/client.cpp b/src/client.cpp
index 6d855f4..94d2db9 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -91,10 +91,10 @@ ADDON_STATUS ADDON_Create(void* hdl, void* _unused(props))
switch (level)
{
- case LogLevel::ERROR:
+ case LogLevel::LEVEL_ERROR:
addonLevel = addon_log_t::LOG_ERROR;
break;
- case LogLevel::INFO:
+ case LogLevel::LEVEL_INFO:
addonLevel = addon_log_t::LOG_INFO;
break;
default:
@@ -102,7 +102,7 @@ ADDON_STATUS ADDON_Create(void* hdl, void* _unused(props))
}
/* Don't log trace messages unless told so */
- if (level == LogLevel::TRACE && !Settings::GetInstance().GetTraceDebug())
+ if (level == LogLevel::LEVEL_TRACE && !Settings::GetInstance().GetTraceDebug())
return;
XBMC->Log(addonLevel, "%s", message);
@@ -110,7 +110,7 @@ ADDON_STATUS ADDON_Create(void* hdl, void* _unused(props))
Logger::GetInstance().SetPrefix("pvr.hts");
- Logger::Log(LogLevel::INFO, "starting PVR client");
+ Logger::Log(LogLevel::LEVEL_INFO, "starting PVR client");
ADDON_ReadSettings();
@@ -195,7 +195,7 @@ void ADDON_Announce
(const char *flag, const char *sender, const char *message,
const void *_unused(data))
{
- Logger::Log(LogLevel::DEBUG, "Announce(flag=%s, sender=%s, message=%s)", flag, sender, message);
+ Logger::Log(LogLevel::LEVEL_DEBUG, "Announce(flag=%s, sender=%s, message=%s)", flag, sender, message);
/* XBMC/System */
if (!strcmp(sender, "xbmc") && !strcmp(flag, "System"))
diff --git a/src/tvheadend/Settings.cpp b/src/tvheadend/Settings.cpp
index 579aa47..38c4d9e 100644
--- a/src/tvheadend/Settings.cpp
+++ b/src/tvheadend/Settings.cpp
@@ -149,7 +149,7 @@ ADDON_STATUS Settings::SetSetting(const std::string &key, const void *value)
return SetIntSetting(GetDvrDupdetect(), value);
else
{
- Logger::Log(LogLevel::ERROR, "Settings::SetSetting - unknown setting '%s'", key.c_str());
+ Logger::Log(LogLevel::LEVEL_ERROR, "Settings::SetSetting - unknown setting '%s'", key.c_str());
return ADDON_STATUS_UNKNOWN;
}
}
diff --git a/src/tvheadend/Subscription.cpp b/src/tvheadend/Subscription.cpp
index c805135..182ca7f 100644
--- a/src/tvheadend/Subscription.cpp
+++ b/src/tvheadend/Subscription.cpp
@@ -139,7 +139,7 @@ void Subscription::SendSubscribe(uint32_t channelId, uint32_t weight, bool resta
if (!GetProfile().empty())
htsmsg_add_str(m, "profile", GetProfile().c_str());
- Logger::Log(LogLevel::DEBUG, "demux subscribe to %d", GetChannelId());
+ Logger::Log(LogLevel::LEVEL_DEBUG, "demux subscribe to %d", GetChannelId());
/* Send and Wait for response */
if (restart)
@@ -152,7 +152,7 @@ void Subscription::SendSubscribe(uint32_t channelId, uint32_t weight, bool resta
htsmsg_destroy(m);
SetState(SUBSCRIPTION_STARTING);
- Logger::Log(LogLevel::DEBUG, "demux successfully subscribed to channel id %d, subscription id %d", GetChannelId(), GetId());
+ Logger::Log(LogLevel::LEVEL_DEBUG, "demux successfully subscribed to channel id %d, subscription id %d", GetChannelId(), GetId());
}
void Subscription::SendUnsubscribe(void)
@@ -160,7 +160,7 @@ void Subscription::SendUnsubscribe(void)
/* Build message */
htsmsg_t *m = htsmsg_create_map();
htsmsg_add_u32(m, "subscriptionId", GetId());
- Logger::Log(LogLevel::DEBUG, "demux unsubscribe from %d", GetChannelId());
+ Logger::Log(LogLevel::LEVEL_DEBUG, "demux unsubscribe from %d", GetChannelId());
/* Mark subscription as inactive immediately in case this command fails */
SetState(SUBSCRIPTION_STOPPED);
@@ -170,7 +170,7 @@ void Subscription::SendUnsubscribe(void)
return;
htsmsg_destroy(m);
- Logger::Log(LogLevel::DEBUG, "demux successfully unsubscribed from channel id %d, subscription id %d", GetChannelId(), GetId());
+ Logger::Log(LogLevel::LEVEL_DEBUG, "demux successfully unsubscribed from channel id %d, subscription id %d", GetChannelId(), GetId());
}
bool Subscription::SendSeek(int time)
@@ -180,7 +180,7 @@ bool Subscription::SendSeek(int time)
htsmsg_add_u32(m, "subscriptionId", GetId());
htsmsg_add_s64(m, "time", static_cast<int64_t>(time * 1000LL));
htsmsg_add_u32(m, "absolute", 1);
- Logger::Log(LogLevel::DEBUG, "demux send seek %d", time);
+ Logger::Log(LogLevel::LEVEL_DEBUG, "demux send seek %d", time);
/* Send and Wait */
{
@@ -206,7 +206,7 @@ void Subscription::SendSpeed(int32_t speed, bool restart)
htsmsg_t *m = htsmsg_create_map();
htsmsg_add_u32(m, "subscriptionId", GetId());
htsmsg_add_s32(m, "speed", GetSpeed() / 10); // Kodi uses values an order of magnitude larger than tvheadend
- Logger::Log(LogLevel::DEBUG, "demux send speed %d", GetSpeed() / 10);
+ Logger::Log(LogLevel::LEVEL_DEBUG, "demux send speed %d", GetSpeed() / 10);
if (restart)
m = m_conn.SendAndWait0("subscriptionSpeed", m);
@@ -225,7 +225,7 @@ void Subscription::SendWeight(uint32_t weight)
htsmsg_t *m = htsmsg_create_map();
htsmsg_add_u32(m, "subscriptionId", GetId());
htsmsg_add_s32(m, "weight", GetWeight());
- Logger::Log(LogLevel::DEBUG, "demux send weight %u", GetWeight());
+ Logger::Log(LogLevel::LEVEL_DEBUG, "demux send weight %u", GetWeight());
/* Send and Wait */
{
diff --git a/src/tvheadend/utilities/Logger.h b/src/tvheadend/utilities/Logger.h
index c17f63c..8a04674 100644
--- a/src/tvheadend/utilities/Logger.h
+++ b/src/tvheadend/utilities/Logger.h
@@ -34,10 +34,10 @@ namespace tvheadend
*/
enum LogLevel
{
- ERROR,
- INFO,
- DEBUG,
- TRACE
+ LEVEL_ERROR,
+ LEVEL_INFO,
+ LEVEL_DEBUG,
+ LEVEL_TRACE
};
/**
--
kodi-pvr-hts packaging
More information about the pkg-multimedia-commits
mailing list