don't shut down enigma 2 when deleting a timer which has an after event "shutdown...

[enigma2.git] / lib / dvb / db.cpp

diff --git a/lib/dvb/db.cpp b/lib/dvb/db.cpp
index e8500b23f25c6e8aa2957e612f167ccc7d409138..64ef6ed7bf818ecb7068c1ddedb8420eee130849 100644 (file)
--- a/lib/dvb/db.cpp
+++ b/lib/dvb/db.cpp
@@ -116,20 +116,29 @@ RESULT eBouquet::setListName(const std::string &name)
 eDVBService::eDVBService()
        :m_flags(0)
 {
+       memset(m_cache, -1, sizeof(m_cache));
 }
 
 eDVBService::~eDVBService()
 {
 }
 
+bool eDVBService::cacheEmpty()
+{
+       for (int i=0; i < cacheMax; ++i)
+               if (m_cache[i] != -1)
+                       return false;
+       return true;
+}
+
 eDVBService &eDVBService::operator=(const eDVBService &s)
 {
        m_service_name = s.m_service_name;
        m_service_name_sort = s.m_service_name_sort;
        m_provider_name = s.m_provider_name;
        m_flags = s.m_flags;
-       m_ca = s.m_ca;
-       m_cache = s.m_cache;
+//     m_ca = s.m_ca;
+       memcpy(m_cache, s.m_cache, sizeof(m_cache));
        return *this;
 }
 
@@ -225,17 +234,14 @@ int eDVBService::checkFilter(const eServiceReferenceDVB &ref, const eDVBChannelQ
 
 int eDVBService::getCachePID(cacheID id)
 {
-       std::map<int, int>::iterator it = m_cache.find(id);
-       if ( it != m_cache.end() )
-               return it->second;
-       return -1;
+       if (id >= cacheMax)
+               return -1;
+       return m_cache[id];
 }
 
 void eDVBService::setCachePID(cacheID id, int pid)
 {
-       if (pid == -1)
-               m_cache.erase(id);
-       else
+       if (id < cacheMax)
                m_cache[id] = pid;
 }
 
@@ -300,8 +306,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 +318,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')
                        {
@@ -415,12 +427,12 @@ void eDVBDB::reloadServicelist()
                                        int cid, val;
                                        sscanf(v.c_str(), "%02d%04x", &cid, &val);
                                        s->m_cache[cid]=val;
-                               } else if (p == 'C')
+                               }/* else if (p == 'C')
                                {
                                        int val;
                                        sscanf(v.c_str(), "%04x", &val);
                                        s->m_ca.insert(val);
-                               }
+                               }*/
                        }
                addService(ref, s);
        }
@@ -452,11 +464,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,14 +516,16 @@ void eDVBDB::saveServicelist()
                fprintf(f, "p:%s", i->second->m_provider_name.c_str());
 
                // write cached pids
-               for (std::map<int,int>::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)
+                       if (i->second->m_cache[x] != -1)
+                               fprintf(f, ",c:%02d%04x", x, i->second->m_cache[x]);
 
+/*
                // write cached ca pids
                for (std::set<int>::const_iterator ca(i->second->m_ca.begin());
                        ca != i->second->m_ca.end(); ++ca)
                        fprintf(f, ",C:%04x", *ca);
+*/
 
                if (i->second->m_flags)
                        fprintf(f, ",f:%x", i->second->m_flags);
@@ -670,17 +698,26 @@ eDVBDB::~eDVBDB()
        instance=NULL;
 }
 
-RESULT eDVBDB::removeService(eServiceReferenceDVB service)
+RESULT eDVBDB::removeService(const eServiceReference &ref)
 {
-       std::map<eServiceReferenceDVB, ePtr<eDVBService> >::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<eServiceReferenceDVB, ePtr<eDVBService> >::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 +747,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 +775,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<eServiceReferenceDVB, ePtr<eDVBService> >::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<eServiceReferenceDVB, ePtr<eDVBService> >::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<eServiceReferenceDVB, ePtr<eDVBService> >::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<eServiceReferenceDVB, ePtr<eDVBService> >::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 +852,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 +883,7 @@ RESULT eDVBDB::addService(const eServiceReferenceDVB &serviceref, eDVBService *s
 {
        std::map<eServiceReferenceDVB, ePtr<eDVBService> >::iterator it(m_services.find(serviceref));
        if (it == m_services.end())
-       {
-               service->m_flags |= eDVBService::dxNewFound;
                m_services.insert(std::pair<eServiceReferenceDVB, ePtr<eDVBService> >(serviceref, service));
-       }
-       else
-               it->second->m_flags &= ~eDVBService::dxNewFound;
        return 0;
 }