diff options
| author | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2005-11-22 14:07:44 +0000 |
|---|---|---|
| committer | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2005-11-22 14:07:44 +0000 |
| commit | 87625f1aa211991c803ecbb5980972238136ac57 (patch) | |
| tree | a25fb07de18f1075b58b3618a8ba037e65526835 /lib/dvb/pmt.cpp | |
| parent | 2884810419e8c4d220c91a0bba1e40e67a2fe158 (diff) | |
| download | enigma2-87625f1aa211991c803ecbb5980972238136ac57.tar.gz enigma2-87625f1aa211991c803ecbb5980972238136ac57.zip | |
rename method
Diffstat (limited to 'lib/dvb/pmt.cpp')
| -rw-r--r-- | lib/dvb/pmt.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp index c9ff3cb6..c886c39a 100644 --- a/lib/dvb/pmt.cpp +++ b/lib/dvb/pmt.cpp @@ -25,7 +25,7 @@ eDVBServicePMTHandler::~eDVBServicePMTHandler() m_demux->getCADemuxID(demux_num); ePtr<eTable<ProgramMapSection> > ptr; m_PMT.getCurrent(ptr); - eDVBCAService::unregister_demux(m_reference, demux_num, ptr); + eDVBCAService::unregister_service(m_reference, demux_num, ptr); } } @@ -73,7 +73,7 @@ void eDVBServicePMTHandler::PMTready(int error) { uint8_t demux_num; m_demux->getCADemuxID(demux_num); - eDVBCAService::register_demux(m_reference, demux_num, m_ca_servicePtr); + eDVBCAService::register_service(m_reference, demux_num, m_ca_servicePtr); } if (m_ca_servicePtr) { @@ -286,7 +286,7 @@ eDVBCAService::~eDVBCAService() ::close(m_sock); } -RESULT eDVBCAService::register_demux( const eServiceReferenceDVB &ref, int demux_num, eDVBCAService *&caservice ) +RESULT eDVBCAService::register_service( const eServiceReferenceDVB &ref, int demux_num, eDVBCAService *&caservice ) { CAServiceMap::iterator it = exist.find(ref); if ( it != exist.end() ) @@ -316,7 +316,7 @@ RESULT eDVBCAService::register_demux( const eServiceReferenceDVB &ref, int demux return 0; } -RESULT eDVBCAService::unregister_demux( const eServiceReferenceDVB &ref, int demux_num, eTable<ProgramMapSection> *ptr ) +RESULT eDVBCAService::unregister_service( const eServiceReferenceDVB &ref, int demux_num, eTable<ProgramMapSection> *ptr ) { CAServiceMap::iterator it = exist.find(ref); if ( it == exist.end() ) @@ -394,6 +394,7 @@ void eDVBCAService::buildCAPMT(eTable<ProgramMapSection> *ptr) uint8_t demux_mask = 0; uint8_t first_demux_num = 0xFF; +#if 1 int iter=0, max_demux_slots = sizeof(m_used_demux); while ( iter < max_demux_slots ) { @@ -405,6 +406,10 @@ void eDVBCAService::buildCAPMT(eTable<ProgramMapSection> *ptr) } ++iter; } +#else + demux_mask = 3; + first_demux_num = 0; +#endif if ( first_demux_num == 0xFF ) { @@ -446,8 +451,8 @@ void eDVBCAService::buildCAPMT(eTable<ProgramMapSection> *ptr) tmp[0] = 0x82; // demux tmp[1] = 0x02; - tmp[3] = first_demux_num; // read section data from demux number tmp[2] = demux_mask; // descramble bitmask + tmp[3] = first_demux_num; // read section data from demux number capmt.injectDescriptor(tmp, false); tmp[0] = 0x81; // dvbnamespace |