X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/185319be599e9f42cd695da14c01499fc79f68d5..db7917f04df76583bb8949283b45e2c4f5c9d48b:/lib/dvb/db.cpp diff --git a/lib/dvb/db.cpp b/lib/dvb/db.cpp index e8500b23..eb0721b6 100644 --- a/lib/dvb/db.cpp +++ b/lib/dvb/db.cpp @@ -114,12 +114,13 @@ RESULT eBouquet::setListName(const std::string &name) } eDVBService::eDVBService() - :m_flags(0) + :m_cache(0), m_flags(0) { } eDVBService::~eDVBService() { + delete [] m_cache; } eDVBService &eDVBService::operator=(const eDVBService &s) @@ -129,7 +130,7 @@ eDVBService &eDVBService::operator=(const eDVBService &s) m_provider_name = s.m_provider_name; m_flags = s.m_flags; m_ca = s.m_ca; - m_cache = s.m_cache; + copyCache(s.m_cache); return *this; } @@ -223,19 +224,48 @@ int eDVBService::checkFilter(const eServiceReferenceDVB &ref, const eDVBChannelQ return res; } -int eDVBService::getCachePID(cacheID id) +bool eDVBService::cacheEmpty() { - std::map::iterator it = m_cache.find(id); - if ( it != m_cache.end() ) - return it->second; - return -1; + if (m_cache) + for (int i=0; i < cacheMax; ++i) + if (m_cache[i] != -1) + return false; + return true; +} + +void eDVBService::initCache() +{ + m_cache = new int[cacheMax]; + memset(m_cache, -1, sizeof(int) * cacheMax); } -void eDVBService::setCachePID(cacheID id, int pid) +void eDVBService::copyCache(int *source) { - if (pid == -1) - m_cache.erase(id); + if (source) + { + if (!m_cache) + m_cache = new int[cacheMax]; + memcpy(m_cache, source, cacheMax * sizeof(int)); + } else + { + delete [] m_cache; + m_cache = 0; + } +} + +int eDVBService::getCacheEntry(cacheID id) +{ + if (id >= cacheMax || !m_cache) + return -1; + return m_cache[id]; +} + +void eDVBService::setCacheEntry(cacheID id, int pid) +{ + if (!m_cache) + initCache(); + if (id < cacheMax) m_cache[id] = pid; } @@ -300,8 +330,11 @@ void eDVBDB::reloadServicelist() if (line[1]=='s') { eDVBFrontendParametersSatellite sat; - int frequency, symbol_rate, polarisation, fec, orbital_position, inversion; - sscanf(line+2, "%d:%d:%d:%d:%d:%d", &frequency, &symbol_rate, &polarisation, &fec, &orbital_position, &inversion); + int frequency, symbol_rate, polarisation, fec, orbital_position, inversion, + system=eDVBFrontendParametersSatellite::System::DVB_S, + modulation=eDVBFrontendParametersSatellite::Modulation::QPSK, + rolloff=eDVBFrontendParametersSatellite::RollOff::alpha_auto; + sscanf(line+2, "%d:%d:%d:%d:%d:%d:%d:%d:%d", &frequency, &symbol_rate, &polarisation, &fec, &orbital_position, &inversion, &system, &modulation, &rolloff); sat.frequency = frequency; sat.symbol_rate = symbol_rate; sat.polarisation = polarisation; @@ -309,6 +342,9 @@ void eDVBDB::reloadServicelist() sat.orbital_position = orbital_position < 0 ? orbital_position + 3600 : orbital_position; sat.inversion = inversion; + sat.system = system; + sat.modulation = modulation; + sat.roll_off = rolloff; feparm->setDVBS(sat); } else if (line[1]=='t') { @@ -414,12 +450,12 @@ void eDVBDB::reloadServicelist() { int cid, val; sscanf(v.c_str(), "%02d%04x", &cid, &val); - s->m_cache[cid]=val; + s->setCacheEntry((eDVBService::cacheID)cid,val); } else if (p == 'C') { int val; sscanf(v.c_str(), "%04x", &val); - s->m_ca.insert(val); + s->m_ca.push_front((uint16_t)val); } } addService(ref, s); @@ -452,11 +488,25 @@ void eDVBDB::saveServicelist() eDVBFrontendParametersCable cab; if (!ch.m_frontendParameters->getDVBS(sat)) { - fprintf(f, "\ts %d:%d:%d:%d:%d:%d\n", - sat.frequency, sat.symbol_rate, - sat.polarisation, sat.fec, - sat.orbital_position > 1800 ? sat.orbital_position - 3600 : sat.orbital_position, - sat.inversion); + if (sat.system == eDVBFrontendParametersSatellite::System::DVB_S2) + { + fprintf(f, "\ts %d:%d:%d:%d:%d:%d:%d:%d:%d\n", + sat.frequency, sat.symbol_rate, + sat.polarisation, sat.fec, + sat.orbital_position > 1800 ? sat.orbital_position - 3600 : sat.orbital_position, + sat.inversion, + sat.system, + sat.modulation, + sat.roll_off); + } + else + { + fprintf(f, "\ts %d:%d:%d:%d:%d:%d\n", + sat.frequency, sat.symbol_rate, + sat.polarisation, sat.fec, + sat.orbital_position > 1800 ? sat.orbital_position - 3600 : sat.orbital_position, + sat.inversion); + } } if (!ch.m_frontendParameters->getDVBT(ter)) { @@ -490,12 +540,15 @@ void eDVBDB::saveServicelist() fprintf(f, "p:%s", i->second->m_provider_name.c_str()); // write cached pids - for (std::map::const_iterator ca(i->second->m_cache.begin()); - ca != i->second->m_cache.end(); ++ca) - fprintf(f, ",c:%02d%04x", ca->first, ca->second); + for (int x=0; x < eDVBService::cacheMax; ++x) + { + int entry = i->second->getCacheEntry((eDVBService::cacheID)x); + if (entry != -1) + fprintf(f, ",c:%02d%04x", x, entry); + } // write cached ca pids - for (std::set::const_iterator ca(i->second->m_ca.begin()); + for (CAID_LIST::const_iterator ca(i->second->m_ca.begin()); ca != i->second->m_ca.end(); ++ca) fprintf(f, ",C:%04x", *ca); @@ -670,17 +723,26 @@ eDVBDB::~eDVBDB() instance=NULL; } -RESULT eDVBDB::removeService(eServiceReferenceDVB service) +RESULT eDVBDB::removeService(const eServiceReference &ref) { - std::map >::iterator it(m_services.find(service)); - if (it != m_services.end()) + if (ref.type == eServiceReference::idDVB) { - m_services.erase(it); - return 0; + eServiceReferenceDVB &service = (eServiceReferenceDVB&)ref; + std::map >::iterator it(m_services.find(service)); + if (it != m_services.end()) + { + m_services.erase(it); + return 0; + } } return -1; } +RESULT eDVBDB::removeServices(int dvb_namespace, int tsid, int onid, unsigned int orb_pos) +{ + return removeServices(eDVBChannelID(eDVBNamespace(dvb_namespace), eTransportStreamID(tsid), eOriginalNetworkID(onid)), orb_pos); +} + RESULT eDVBDB::removeServices(eDVBChannelID chid, unsigned int orbpos) { RESULT ret=-1; @@ -710,6 +772,10 @@ RESULT eDVBDB::removeServices(eDVBChannelID chid, unsigned int orbpos) remove=false; if ( remove ) { + eDebug("remove %08x %04x %04x", + ch.dvbnamespace.get(), + ch.original_network_id.get(), + ch.transport_stream_id.get()); removed_chids.insert(it->first); m_channels.erase(it++); } @@ -734,22 +800,35 @@ RESULT eDVBDB::removeServices(eDVBChannelID chid, unsigned int orbpos) return ret; } -RESULT eDVBDB::addFlag(eServiceReferenceDVB service, unsigned int flagmask) +RESULT eDVBDB::addFlag(const eServiceReference &ref, unsigned int flagmask) { - std::map >::iterator it(m_services.find(service)); - if (it != m_services.end()) + if (ref.type == eServiceReference::idDVB) { - it->second->m_flags |= ~flagmask; + eServiceReferenceDVB &service = (eServiceReferenceDVB&)ref; + std::map >::iterator it(m_services.find(service)); + if (it != m_services.end()) + it->second->m_flags |= ~flagmask; + return 0; } - return 0; + return -1; } -RESULT eDVBDB::removeFlag(eServiceReferenceDVB service, unsigned int flagmask) +RESULT eDVBDB::removeFlag(const eServiceReference &ref, unsigned int flagmask) { - std::map >::iterator it(m_services.find(service)); - if (it != m_services.end()) - it->second->m_flags &= ~flagmask; - return 0; + if (ref.type == eServiceReference::idDVB) + { + eServiceReferenceDVB &service = (eServiceReferenceDVB&)ref; + std::map >::iterator it(m_services.find(service)); + if (it != m_services.end()) + it->second->m_flags &= ~flagmask; + return 0; + } + return -1; +} + +RESULT eDVBDB::removeFlags(unsigned int flagmask, int dvb_namespace, int tsid, int onid, unsigned int orb_pos) +{ + return removeFlags(flagmask, eDVBChannelID(eDVBNamespace(dvb_namespace), eTransportStreamID(tsid), eOriginalNetworkID(onid)), orb_pos); } RESULT eDVBDB::removeFlags(unsigned int flagmask, eDVBChannelID chid, unsigned int orbpos) @@ -798,7 +877,6 @@ RESULT eDVBDB::removeFlags(unsigned int flagmask, eDVBChannelID chid, unsigned i return 0; } - RESULT eDVBDB::addChannelToList(const eDVBChannelID &id, iDVBFrontendParameters *feparm) { channel ch; @@ -830,12 +908,7 @@ RESULT eDVBDB::addService(const eServiceReferenceDVB &serviceref, eDVBService *s { std::map >::iterator it(m_services.find(serviceref)); if (it == m_services.end()) - { - service->m_flags |= eDVBService::dxNewFound; m_services.insert(std::pair >(serviceref, service)); - } - else - it->second->m_flags &= ~eDVBService::dxNewFound; return 0; }