git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix comments
[enigma2.git]
/
lib
/
dvb
/
pmt.cpp
diff --git
a/lib/dvb/pmt.cpp
b/lib/dvb/pmt.cpp
index 300add41c42e638d35dca22308ced1b77ec8b3b2..19e6cf9cf510ca9c93e8d5637e860212a7960b83 100644
(file)
--- a/
lib/dvb/pmt.cpp
+++ b/
lib/dvb/pmt.cpp
@@
-350,7
+350,7
@@
RESULT eDVBCAService::register_service( const eServiceReferenceDVB &ref, int dem
{
caservice = (exist[ref]=new eDVBCAService());
caservice->m_service = ref;
{
caservice = (exist[ref]=new eDVBCAService());
caservice->m_service = ref;
- eDebug("[eDVBCA
Handler
] new service %s", ref.toString().c_str() );
+ eDebug("[eDVBCA
Service
] new service %s", ref.toString().c_str() );
}
// search free demux entry
int iter=0, max_demux_slots = sizeof(caservice->m_used_demux);
}
// search free demux entry
int iter=0, max_demux_slots = sizeof(caservice->m_used_demux);
@@
-361,11
+361,11
@@
RESULT eDVBCAService::register_service( const eServiceReferenceDVB &ref, int dem
if ( iter < max_demux_slots )
{
caservice->m_used_demux[iter] = demux_num & 0xFF;
if ( iter < max_demux_slots )
{
caservice->m_used_demux[iter] = demux_num & 0xFF;
- eDebug("[eDVBCA
Handler
] add demux %d to slot %d service %s", demux_num, iter, ref.toString().c_str());
+ eDebug("[eDVBCA
Service
] add demux %d to slot %d service %s", demux_num, iter, ref.toString().c_str());
}
else
{
}
else
{
- eDebug("[eDVBCA
Handler
] no more demux slots free for service %s!!", ref.toString().c_str());
+ eDebug("[eDVBCA
Service
] no more demux slots free for service %s!!", ref.toString().c_str());
return -1;
}
return 0;
return -1;
}
return 0;
@@
-376,7
+376,7
@@
RESULT eDVBCAService::unregister_service( const eServiceReferenceDVB &ref, int d
CAServiceMap::iterator it = exist.find(ref);
if ( it == exist.end() )
{
CAServiceMap::iterator it = exist.find(ref);
if ( it == exist.end() )
{
- eDebug("[eDVBCA
Handler
] try to unregister non registered %s", ref.toString().c_str());
+ eDebug("[eDVBCA
Service
] try to unregister non registered %s", ref.toString().c_str());
return -1;
}
else
return -1;
}
else
@@
-416,7
+416,7
@@
RESULT eDVBCAService::unregister_service( const eServiceReferenceDVB &ref, int d
if (ptr)
it->second->buildCAPMT(ptr);
else
if (ptr)
it->second->buildCAPMT(ptr);
else
- eDebug("[eDVBCA
Handler
] can not send updated demux info");
+ eDebug("[eDVBCA
Service
] can not send updated demux info");
}
}
return 0;
}
}
return 0;
@@
-559,7
+559,7
@@
void eDVBCAService::sendCAPMT()
if ( write(m_sock, m_capmt, wp) == wp )
{
m_sendstate=0xFFFFFFFF;
if ( write(m_sock, m_capmt, wp) == wp )
{
m_sendstate=0xFFFFFFFF;
- eDebug("[eDVBCA
Handler
] send %d bytes",wp);
+ eDebug("[eDVBCA
Service
] send %d bytes",wp);
#if 1
for(int i=0;i<wp;i++)
eDebugNoNewLine("%02x ", m_capmt[i]);
#if 1
for(int i=0;i<wp;i++)
eDebugNoNewLine("%02x ", m_capmt[i]);
@@
-573,11
+573,11
@@
void eDVBCAService::sendCAPMT()
case 0xFFFFFFFF:
++m_sendstate;
m_retryTimer.start(0,true);
case 0xFFFFFFFF:
++m_sendstate;
m_retryTimer.start(0,true);
-// eDebug("[eDVBCA
Handler
] send failed .. immediate retry");
+// eDebug("[eDVBCA
Service
] send failed .. immediate retry");
break;
default:
m_retryTimer.start(5000,true);
break;
default:
m_retryTimer.start(5000,true);
-// eDebug("[eDVBCA
Handler
] send failed .. retry in 5 sec");
+// eDebug("[eDVBCA
Service
] send failed .. retry in 5 sec");
break;
}
++m_sendstate;
break;
}
++m_sendstate;