removed debug

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

diff --git a/lib/dvb/db.cpp b/lib/dvb/db.cpp
index 4e0332bac37df3fbfc329142eca498d5ce29f1e0..a380ad0c6ea20f2e949f5f941ca2fe0a05e2139d 100644 (file)
--- a/lib/dvb/db.cpp
+++ b/lib/dvb/db.cpp
@@ -2,6 +2,7 @@
 #include <lib/dvb/db.h>
 #include <lib/dvb/frontend.h>
 #include <lib/base/eerror.h>
+#include <lib/base/estring.h>
 #include <lib/dvb_si/sdt.h>
 #include <lib/dvb_si/descriptor_tag.h>
 #include <lib/dvb_si/service_descriptor.h>
@@ -29,7 +30,13 @@ eDVBService &eDVBService::operator=(const eDVBService &s)
 
 RESULT eDVBService::getName(const eServiceReference &ref, std::string &name)
 {
-       name = m_service_name;
+       name = convertDVBUTF8(m_service_name);
+       return 0;
+}
+
+int eDVBService::getLength(const eServiceReference &ref)
+{
+       return -1;
 }
 
 int eDVBService::checkFilter(const eServiceReferenceDVB &ref, const eDVBChannelQuery &query)
@@ -73,9 +80,22 @@ int eDVBService::checkFilter(const eServiceReferenceDVB &ref, const eDVBChannelQ
                return res;
 }
 
+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;
+}
+
+void eDVBService::setCachePID(cacheID id, int pid)
+{
+       m_cache[id] = pid;
+}
+
 DEFINE_REF(eDVBDB);
 
-eDVBDB::eDVBDB()
+void eDVBDB::load()
 {
        eDebug("---- opening lame channel db");
        FILE *f=fopen("lamedb", "rt");
@@ -95,7 +115,7 @@ eDVBDB::eDVBDB()
                fclose(f);
                return;
        }
-       
+
        // clear all transponders
 
        while (!feof(f))
@@ -109,10 +129,10 @@ eDVBDB::eDVBDB()
                if (original_network_id == -1)
                        continue;
                eDVBChannelID channelid = eDVBChannelID(
-                       eDVBNamespace(dvb_namespace), 
-                       eTransportStreamID(transport_stream_id), 
+                       eDVBNamespace(dvb_namespace),
+                       eTransportStreamID(transport_stream_id),
                        eOriginalNetworkID(original_network_id));
-               
+
                ePtr<eDVBFrontendParameters> feparm = new eDVBFrontendParameters;
                while (!feof(f))
                {
@@ -149,9 +169,9 @@ eDVBDB::eDVBDB()
                eDebug("services invalid, no services");
                return;
        }
-       
+
        // clear all services
-       
+
        int count=0;
 
        while (!feof(f))
@@ -166,7 +186,7 @@ eDVBDB::eDVBDB()
                if (service_number == -1)
                        continue;
                ePtr<eDVBService> s = new eDVBService;
-               eServiceReferenceDVB ref = 
+               eServiceReferenceDVB ref =
                                                eServiceReferenceDVB(
                                                eDVBNamespace(dvb_namespace),
                                                eTransportStreamID(transport_stream_id),
@@ -224,18 +244,17 @@ eDVBDB::eDVBDB()
        }
 
        eDebug("loaded %d services", count);
-       
+
        fclose(f);
-       
 }
 
-eDVBDB::~eDVBDB()
+void eDVBDB::save()
 {
        eDebug("---- saving lame channel db");
        FILE *f=fopen("lamedb", "wt");
        int channels=0, services=0;
        if (!f)
-               eFatal("couldn't save lame channel db!"); 
+               eFatal("couldn't save lame channel db!");
        fprintf(f, "eDVB services /3/\n");
        fprintf(f, "transponders\n");
        for (std::map<eDVBChannelID, channel>::const_iterator i(m_channels.begin());
@@ -243,13 +262,13 @@ eDVBDB::~eDVBDB()
        {
                const eDVBChannelID &chid = i->first;
                const channel &ch = i->second;
-               
+
                fprintf(f, "%08x:%04x:%04x\n", chid.dvbnamespace.get(),
                                chid.transport_stream_id.get(), chid.original_network_id.get());
                eDVBFrontendParametersSatellite sat;
                if (!ch.m_frontendParameters->getDVBS(sat))
                {
-                       fprintf(f, "\ts %d:%d:%d:%d:%d:%d\n", 
+                       fprintf(f, "\ts %d:%d:%d:%d:%d:%d\n",
                                sat.frequency, sat.symbol_rate,
                                sat.polarisation, sat.fec, sat.inversion,
                                sat.orbital_position);
@@ -258,22 +277,30 @@ eDVBDB::~eDVBDB()
                channels++;
        }
        fprintf(f, "end\nservices\n");
-       
+
        for (std::map<eServiceReferenceDVB, ePtr<eDVBService> >::iterator i(m_services.begin());
                i != m_services.end(); ++i)
        {
                const eServiceReferenceDVB &s = i->first;
-               fprintf(f, "%04x:%08x:%04x:%04x:%d:%d\n", 
-                               s.getServiceID().get(), s.getDVBNamespace().get(), 
-                               s.getTransportStreamID().get(),s.getOriginalNetworkID().get(), 
+               fprintf(f, "%04x:%08x:%04x:%04x:%d:%d\n",
+                               s.getServiceID().get(), s.getDVBNamespace().get(),
+                               s.getTransportStreamID().get(),s.getOriginalNetworkID().get(),
                                s.getServiceType(),
                                0);
-               
+
                fprintf(f, "%s\n", i->second->m_service_name.c_str());
                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);
+
+               // 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);
+
                fprintf(f, "\n");
                services++;
        }
@@ -282,6 +309,16 @@ eDVBDB::~eDVBDB()
        fclose(f);
 }
 
+eDVBDB::eDVBDB()
+{
+       load();
+}
+
+eDVBDB::~eDVBDB()
+{
+//     save();
+}
+
 RESULT eDVBDB::addChannelToList(const eDVBChannelID &id, iDVBFrontendParameters *feparm)
 {
        channel ch;
@@ -330,14 +367,15 @@ RESULT eDVBDB::getService(const eServiceReferenceDVB &reference, ePtr<eDVBServic
 
 RESULT eDVBDB::startQuery(ePtr<iDVBChannelListQuery> &query, eDVBChannelQuery *q)
 {
-       query = new eDVBDBQuery(this, q);
+       query = new eDVBDBQuery(this, eServiceReference(), q);
        return 0;
 }
 
 DEFINE_REF(eDVBDBQuery);
 
-eDVBDBQuery::eDVBDBQuery(eDVBDB *db, eDVBChannelQuery *query): m_db(db), m_query(query)
+eDVBDBQuery::eDVBDBQuery(eDVBDB *db, const eServiceReference &source, eDVBChannelQuery *query): m_db(db), m_query(query)
 {
+               // TODO: use SOURCE ...
        m_cursor = m_db->m_services.begin();
 }
 
@@ -486,12 +524,10 @@ RESULT parseExpression(ePtr<eDVBChannelQuery> &res, std::list<std::string>::cons
        return 0;
 }
 
-RESULT eDVBChannelQuery::compile(ePtr<eDVBChannelQuery> &res, const eServiceReferenceDVB &source, std::string query)
+RESULT eDVBChannelQuery::compile(ePtr<eDVBChannelQuery> &res, std::string query)
 {
        std::list<std::string> tokens;
        
-       m_source = source;
-       
        std::string current_token;
        
 //     eDebug("splitting %s....", query.c_str());