small optimizations and cleanups by Moritz Venn
[enigma2.git] / lib / dvb / db.cpp
index 2a3de6a4fa12f18cc177fe2180ea4f2b8a74a619..110cedd8c3bc96ece8a4ea74fb3fc0dac3ce677d 100644 (file)
@@ -5,6 +5,7 @@
 #include <lib/dvb/epgcache.h>
 #include <lib/base/eerror.h>
 #include <lib/base/estring.h>
+#include <xmlccwrap/xmlccwrap.h>
 #include <dvbsi++/service_description_section.h>
 #include <dvbsi++/descriptor_tag.h>
 #include <dvbsi++/service_descriptor.h>
@@ -81,24 +82,6 @@ RESULT eBouquet::flushChanges()
        {
                eServiceReference tmp = *i;
                std::string str = tmp.path;
-               if ( (i->flags&eServiceReference::flagDirectory) == eServiceReference::flagDirectory )
-               {
-                       unsigned int p1 = str.find("FROM BOUQUET \"");
-                       if (p1 == std::string::npos)
-                       {
-                               eDebug("doof... kaputt");
-                               continue;
-                       }
-                       str.erase(0, p1+14);
-                       p1 = str.find("\"");
-                       if (p1 == std::string::npos)
-                       {
-                               eDebug("doof2... kaputt");
-                               continue;
-                       }
-                       str.erase(p1);
-                       tmp.path=str;
-               }
                if ( fprintf(f, "#SERVICE %s\r\n", tmp.toString().c_str()) < 0 )
                        goto err;
                if ( i->name.length() )
@@ -168,7 +151,7 @@ RESULT eDVBService::getEvent(const eServiceReference &ref, ePtr<eServiceEvent> &
        return eEPGCache::getInstance()->lookupEventTime(ref, start_time, ptr);
 }
 
-bool eDVBService::isPlayable(const eServiceReference &ref, const eServiceReference &ignore)
+int eDVBService::isPlayable(const eServiceReference &ref, const eServiceReference &ignore, bool simulate)
 {
        ePtr<eDVBResourceManager> res_mgr;
        if ( eDVBResourceManager::getInstance( res_mgr ) )
@@ -178,9 +161,9 @@ bool eDVBService::isPlayable(const eServiceReference &ref, const eServiceReferen
                eDVBChannelID chid, chid_ignore;
                ((const eServiceReferenceDVB&)ref).getChannelID(chid);
                ((const eServiceReferenceDVB&)ignore).getChannelID(chid_ignore);
-               return res_mgr->canAllocateChannel(chid, chid_ignore);
+               return res_mgr->canAllocateChannel(chid, chid_ignore, simulate);
        }
-       return false;
+       return 0;
 }
 
 int eDVBService::checkFilter(const eServiceReferenceDVB &ref, const eDVBChannelQuery &query)
@@ -277,12 +260,17 @@ void eDVBService::setCacheEntry(cacheID id, int pid)
 
 DEFINE_REF(eDVBDB);
 
-       /* THIS CODE IS BAD. it should be replaced by somethine better. */
 void eDVBDB::reloadServicelist()
+{
+       loadServicelist(CONFIGDIR"/enigma2/lamedb");
+}
+
+       /* THIS CODE IS BAD. it should be replaced by somethine better. */
+void eDVBDB::loadServicelist(const char *file)
 {
        eDebug("---- opening lame channel db");
-       FILE *f=fopen(CONFIGDIR"/enigma2/lamedb", "rt");
-       if (!f)
+       FILE *f=fopen(file, "rt");
+       if (!f && strcmp(file, CONFIGDIR"/enigma2/lamedb") == 0)
        {
                struct stat s;
                if ( !stat("lamedb", &s) )
@@ -296,13 +284,14 @@ void eDVBDB::reloadServicelist()
                return;
        }
        char line[256];
-       if ((!fgets(line, 256, f)) || strncmp(line, "eDVB services", 13))
+       int version=3;
+       if ((!fgets(line, 256, f)) || sscanf(line, "eDVB services /%d/", &version) != 1)
        {
-               eDebug("not a servicefile");
+               eDebug("not a valid servicefile");
                fclose(f);
                return;
        }
-       eDebug("reading services");
+       eDebug("reading services (version %d)", version);
        if ((!fgets(line, 256, f)) || strcmp(line, "transponders\n"))
        {
                eDebug("services invalid, no transponders");
@@ -337,10 +326,15 @@ void eDVBDB::reloadServicelist()
                        {
                                eDVBFrontendParametersSatellite sat;
                                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);
+                                       flags=0,
+                                       system=eDVBFrontendParametersSatellite::System_DVB_S,
+                                       modulation=eDVBFrontendParametersSatellite::Modulation_QPSK,
+                                       rolloff=eDVBFrontendParametersSatellite::RollOff_alpha_0_35,
+                                       pilot=eDVBFrontendParametersSatellite::Pilot_Unknown;
+                               if (version == 3)
+                                       sscanf(line+3, "%d:%d:%d:%d:%d:%d:%d:%d:%d:%d", &frequency, &symbol_rate, &polarisation, &fec, &orbital_position, &inversion, &system, &modulation, &rolloff, &pilot);
+                               else
+                                       sscanf(line+3, "%d:%d:%d:%d:%d:%d:%d:%d:%d:%d:%d", &frequency, &symbol_rate, &polarisation, &fec, &orbital_position, &inversion, &flags, &system, &modulation, &rolloff, &pilot);
                                sat.frequency = frequency;
                                sat.symbol_rate = symbol_rate;
                                sat.polarisation = polarisation;
@@ -350,13 +344,15 @@ void eDVBDB::reloadServicelist()
                                sat.inversion = inversion;
                                sat.system = system;
                                sat.modulation = modulation;
-                               sat.roll_off = rolloff;
+                               sat.rolloff = rolloff;
+                               sat.pilot = pilot;
                                feparm->setDVBS(sat);
+                               feparm->setFlags(flags);
                        } else if (line[1]=='t')
                        {
                                eDVBFrontendParametersTerrestrial ter;
-                               int frequency, bandwidth, code_rate_HP, code_rate_LP, modulation, transmission_mode, guard_interval, hierarchy, inversion;
-                               sscanf(line+2, "%d:%d:%d:%d:%d:%d:%d:%d:%d", &frequency, &bandwidth, &code_rate_HP, &code_rate_LP, &modulation, &transmission_mode, &guard_interval, &hierarchy, &inversion);
+                               int frequency, bandwidth, code_rate_HP, code_rate_LP, modulation, transmission_mode, guard_interval, hierarchy, inversion, flags=0;
+                               sscanf(line+3, "%d:%d:%d:%d:%d:%d:%d:%d:%d:%d", &frequency, &bandwidth, &code_rate_HP, &code_rate_LP, &modulation, &transmission_mode, &guard_interval, &hierarchy, &inversion, &flags);
                                ter.frequency = frequency;
                                ter.bandwidth = bandwidth;
                                ter.code_rate_HP = code_rate_HP;
@@ -367,20 +363,23 @@ void eDVBDB::reloadServicelist()
                                ter.hierarchy = hierarchy;
                                ter.inversion = inversion;
                                feparm->setDVBT(ter);
+                               feparm->setFlags(flags);
                        } else if (line[1]=='c')
                        {
                                eDVBFrontendParametersCable cab;
                                int frequency, symbol_rate,
-                                       inversion=eDVBFrontendParametersCable::Inversion::Unknown,
-                                       modulation=eDVBFrontendParametersCable::Modulation::Auto,
-                                       fec_inner=eDVBFrontendParametersCable::FEC::fAuto;
-                               sscanf(line+2, "%d:%d:%d:%d:%d", &frequency, &symbol_rate, &inversion, &modulation, &fec_inner);
+                                       inversion=eDVBFrontendParametersCable::Inversion_Unknown,
+                                       modulation=eDVBFrontendParametersCable::Modulation_Auto,
+                                       fec_inner=eDVBFrontendParametersCable::FEC_Auto,
+                                       flags=0;
+                               sscanf(line+3, "%d:%d:%d:%d:%d:%d", &frequency, &symbol_rate, &inversion, &modulation, &fec_inner, &flags);
                                cab.frequency = frequency;
                                cab.fec_inner = fec_inner;
                                cab.inversion = inversion;
                                cab.symbol_rate = symbol_rate;
                                cab.modulation = modulation;
                                feparm->setDVBC(cab);
+                               feparm->setFlags(flags);
                        }
                }
                addChannelToList(channelid, feparm);
@@ -434,7 +433,7 @@ void eDVBDB::reloadServicelist()
                } else
                        while ((!str.empty()) && str[1]==':') // new: p:, f:, c:%02d...
                        {
-                               unsigned int c=str.find(',');
+                               size_t c=str.find(',');
                                char p=str[0];
                                std::string v;
                                if (c == std::string::npos)
@@ -472,14 +471,14 @@ void eDVBDB::reloadServicelist()
        fclose(f);
 }
 
-void eDVBDB::saveServicelist()
+void eDVBDB::saveServicelist(const char *file)
 {
        eDebug("---- saving lame channel db");
-       FILE *f=fopen(CONFIGDIR"/enigma2/lamedb", "w");
+       FILE *f=fopen(file, "w");
        int channels=0, services=0;
        if (!f)
                eFatal("couldn't save lame channel db!");
-       fprintf(f, "eDVB services /3/\n");
+       fprintf(f, "eDVB services /4/\n");
        fprintf(f, "transponders\n");
        for (std::map<eDVBChannelID, channel>::const_iterator i(m_channels.begin());
                        i != m_channels.end(); ++i)
@@ -492,39 +491,43 @@ void eDVBDB::saveServicelist()
                eDVBFrontendParametersSatellite sat;
                eDVBFrontendParametersTerrestrial ter;
                eDVBFrontendParametersCable cab;
+               unsigned int flags;  // flagOnlyFree yet..
+               ch.m_frontendParameters->getFlags(flags);
                if (!ch.m_frontendParameters->getDVBS(sat))
                {
-                       if (sat.system == eDVBFrontendParametersSatellite::System::DVB_S2)
+                       if (sat.system == eDVBFrontendParametersSatellite::System_DVB_S2)
                        {
-                               fprintf(f, "\ts %d:%d:%d:%d:%d:%d:%d:%d:%d\n",
+                               fprintf(f, "\ts %d:%d:%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,
+                                       flags,
                                        sat.system,
                                        sat.modulation,
-                                       sat.roll_off);
+                                       sat.rolloff,
+                                       sat.pilot);
                        }
                        else
                        {
-                               fprintf(f, "\ts %d:%d:%d:%d:%d:%d\n",
+                               fprintf(f, "\ts %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.inversion, flags);
                        }
                }
-               if (!ch.m_frontendParameters->getDVBT(ter))
+               else if (!ch.m_frontendParameters->getDVBT(ter))
                {
-                       fprintf(f, "\tt %d:%d:%d:%d:%d:%d:%d:%d:%d\n",
+                       fprintf(f, "\tt %d:%d:%d:%d:%d:%d:%d:%d:%d:%d\n",
                                ter.frequency, ter.bandwidth, ter.code_rate_HP,
                                ter.code_rate_LP, ter.modulation, ter.transmission_mode,
-                               ter.guard_interval, ter.hierarchy, ter.inversion);
+                               ter.guard_interval, ter.hierarchy, ter.inversion, flags);
                }
-               if (!ch.m_frontendParameters->getDVBC(cab))
+               else if (!ch.m_frontendParameters->getDVBC(cab))
                {
-                       fprintf(f, "\tc %d:%d:%d:%d:%d\n",
-                               cab.frequency, cab.symbol_rate, cab.inversion, cab.modulation, cab.fec_inner);
+                       fprintf(f, "\tc %d:%d:%d:%d:%d:%d\n",
+                               cab.frequency, cab.symbol_rate, cab.inversion, cab.modulation, cab.fec_inner, flags);
                }
                fprintf(f, "/\n");
                channels++;
@@ -569,6 +572,11 @@ void eDVBDB::saveServicelist()
        fclose(f);
 }
 
+void eDVBDB::saveServicelist()
+{
+       saveServicelist(CONFIGDIR"/enigma2/lamedb");
+}
+
 void eDVBDB::loadBouquet(const char *path)
 {
        std::string bouquet_name = path;
@@ -577,7 +585,7 @@ void eDVBDB::loadBouquet(const char *path)
                eDebug("Bouquet load failed.. no path given..");
                return;
        }
-       unsigned int pos = bouquet_name.rfind('/');
+       size_t pos = bouquet_name.rfind('/');
        if ( pos != std::string::npos )
                bouquet_name.erase(0, pos+1);
        if (bouquet_name.empty())
@@ -633,7 +641,7 @@ void eDVBDB::loadBouquet(const char *path)
                        break;
                if (line[0]=='#')
                {
-                       if (!strncmp(line, "#SERVICE ", 9) || !strncmp(line, "#SERVICE: ", 10))
+                       if (!strncmp(line, "#SERVICE", 8))
                        {
                                int offs = line[8] == ':' ? 10 : 9;
                                eServiceReference tmp(line+offs);
@@ -642,29 +650,48 @@ void eDVBDB::loadBouquet(const char *path)
                                        eDebug("only DVB Bouquets supported");
                                        continue;
                                }
-                               if ( (tmp.flags&eServiceReference::flagDirectory) == eServiceReference::flagDirectory )
+                               if ( tmp.flags&eServiceReference::canDescent )
                                {
-                                       unsigned int pos = tmp.path.rfind('/');
+                                       size_t pos = tmp.path.rfind('/');
+                                       char buf[256];
+                                       std::string path = tmp.path;
                                        if ( pos != std::string::npos )
-                                               tmp.path.erase(0, pos+1);
-                                       if (tmp.path.empty())
+                                               path.erase(0, pos+1);
+                                       if (path.empty())
                                        {
                                                eDebug("Bouquet load failed.. no filename given..");
                                                continue;
                                        }
-                                       loadBouquet(tmp.path.c_str());
-                                       char buf[256];
-                                       snprintf(buf, 256, "(type == %d) FROM BOUQUET \"%s\" ORDER BY bouquet", tmp.data[0], tmp.path.c_str());
-                                       tmp.path = buf;
+                                       pos = path.find("FROM BOUQUET ");
+                                       if (pos != std::string::npos)
+                                       {
+                                               char endchr = path[pos+13];
+                                               if (endchr != '"')
+                                               {
+                                                       eDebug("ignore invalid bouquet '%s' (only \" are allowed)",
+                                                               tmp.toString().c_str());
+                                                       continue;
+                                               }
+                                               char *beg = &path[pos+14];
+                                               char *end = strchr(beg, endchr);
+                                               path.assign(beg, end - beg);
+                                       }
+                                       else
+                                       {
+                                               snprintf(buf, 256, "FROM BOUQUET \"%s\" ORDER BY bouquet", path.c_str());
+                                               tmp.path = buf;
+                                       }
+                                       loadBouquet(path.c_str());
                                }
                                list.push_back(tmp);
                                e = &list.back();
                                read_descr=true;
                                ++entries;
                        }
-                       else if (read_descr && !strncmp(line, "#DESCRIPTION ", 13))
+                       else if (read_descr && !strncmp(line, "#DESCRIPTION", 12))
                        {
-                               e->name = line+13;
+                               int offs = line[12] == ':' ? 14 : 13;
+                               e->name = line+offs;
                                read_descr=false;
                        }
                        else if (!strncmp(line, "#NAME ", 6))
@@ -693,7 +720,7 @@ void eDVBDB::reloadBouquets()
                ref.type=1;
                ref.flags=7;
                ref.data[0]=1;
-               ref.path="(type == 1) FROM BOUQUET \"userbouquet.favourites.tv\" ORDER BY bouquet";
+               ref.path="FROM BOUQUET \"userbouquet.favourites.tv\" ORDER BY bouquet";
                eBouquet &parent = m_bouquets["bouquets.tv"];
                parent.m_services.push_back(ref);
                parent.flushChanges();
@@ -709,7 +736,7 @@ void eDVBDB::reloadBouquets()
                ref.type=1;
                ref.flags=7;
                ref.data[0]=2;
-               ref.path="(type == 2) FROM BOUQUET \"userbouquet.favourites.radio\" ORDER BY bouquet";
+               ref.path="FROM BOUQUET \"userbouquet.favourites.radio\" ORDER BY bouquet";
                eBouquet &parent = m_bouquets["bouquets.radio"];
                parent.m_services.push_back(ref);
                parent.flushChanges();
@@ -718,12 +745,416 @@ void eDVBDB::reloadBouquets()
 
 eDVBDB *eDVBDB::instance;
 
+using namespace xmlcc;
+
 eDVBDB::eDVBDB()
 {
        instance = this;
        reloadServicelist();
 }
 
+PyObject *eDVBDB::readSatellites(ePyObject sat_list, ePyObject sat_dict, ePyObject tp_dict)
+{
+       if (!PyDict_Check(tp_dict)) {
+               PyErr_SetString(PyExc_StandardError,
+                       "type error");
+                       eDebug("arg 2 is not a python dict");
+               return NULL;
+       }
+       else if (!PyDict_Check(sat_dict))
+       {
+               PyErr_SetString(PyExc_StandardError,
+                       "type error");
+                       eDebug("arg 1 is not a python dict");
+               return NULL;
+       }
+       else if (!PyList_Check(sat_list))
+       {
+               PyErr_SetString(PyExc_StandardError,
+                       "type error");
+                       eDebug("arg 0 is not a python list");
+               return NULL;
+       }
+       XMLTree tree;
+       tree.setFilename("/etc/tuxbox/satellites.xml");
+       tree.read();
+       Element *root = tree.getRoot();
+       if (!root)
+       {
+               eDebug("couldn't open /etc/tuxbox/satellites.xml!!");
+               Py_INCREF(Py_False);
+               return Py_False;
+       }
+       int tmp, *dest = NULL,
+               modulation, system, freq, sr, pol, fec, inv, pilot, rolloff, tsid, onid;
+       char *end_ptr;
+       const Attribute *at;
+       std::string name;
+       const ElementList &root_elements = root->getElementList();
+       for (ElementConstIterator it(root_elements.begin()); it != root_elements.end(); ++it)
+       {
+//             eDebug("element: %s", (*it)->name().c_str());
+               const Element *el = *it;
+               const ElementList &sat_elements = el->getElementList();
+               const AttributeList &sat_attributes = el->getAttributeList();
+               ePyObject sat_name;
+               ePyObject sat_pos;
+               ePyObject sat_flags;
+               for (AttributeConstIterator it(sat_attributes.begin()); it != sat_attributes.end(); ++it)
+               {
+//                     eDebug("\tattr: %s", at->name().c_str());
+                       at = *it;
+                       name = at->name();
+                       if (name == "name")
+                               sat_name = PyString_FromString(at->value().c_str());
+                       else if (name == "flags")
+                       {
+                               tmp = strtol(at->value().c_str(), &end_ptr, 10);
+                               if (!*end_ptr)
+                                       sat_flags = PyInt_FromLong(tmp);
+                       }
+                       else if (name == "position")
+                       {
+                               tmp = strtol(at->value().c_str(), &end_ptr, 10);
+                               if (!*end_ptr)
+                               {
+                                       if (tmp < 0)
+                                               tmp = 3600 + tmp;
+                                       sat_pos = PyInt_FromLong(tmp);
+                               }
+                       }
+               }
+               if (sat_pos && sat_name)
+               {
+                       ePyObject tplist = PyList_New(0);
+                       ePyObject tuple = PyTuple_New(3);
+                       if (!sat_flags)
+                               sat_flags = PyInt_FromLong(0);
+                       PyTuple_SET_ITEM(tuple, 0, sat_pos);
+                       PyTuple_SET_ITEM(tuple, 1, sat_name);
+                       PyTuple_SET_ITEM(tuple, 2, sat_flags);
+                       PyList_Append(sat_list, tuple);
+                       Py_DECREF(tuple);
+                       PyDict_SetItem(sat_dict, sat_pos, sat_name);
+                       PyDict_SetItem(tp_dict, sat_pos, tplist);
+                       for (ElementConstIterator it(sat_elements.begin()); it != sat_elements.end(); ++it)
+                       {
+//                             eDebug("\telement: %s", (*it)->name().c_str());
+                               const AttributeList &tp_attributes = (*it)->getAttributeList();
+                               AttributeConstIterator end = tp_attributes.end();
+                               modulation = eDVBFrontendParametersSatellite::Modulation_QPSK;
+                               system = eDVBFrontendParametersSatellite::System_DVB_S;
+                               freq = 0;
+                               sr = 0;
+                               pol = -1;
+                               fec = eDVBFrontendParametersSatellite::FEC_Auto;
+                               inv = eDVBFrontendParametersSatellite::Inversion_Unknown;
+                               pilot = eDVBFrontendParametersSatellite::Pilot_Unknown;
+                               rolloff = eDVBFrontendParametersSatellite::RollOff_alpha_0_35;
+                               tsid = -1;
+                               onid = -1;
+
+                               for (AttributeConstIterator it(tp_attributes.begin()); it != end; ++it)
+                               {
+                                       //eDebug("\t\tattr: %s", at->name().c_str());
+                                       at = *it;
+                                       name = at->name();
+                                       if (name == "modulation") dest = &modulation;
+                                       else if (name == "system") dest = &system;
+                                       else if (name == "frequency") dest = &freq;
+                                       else if (name == "symbol_rate") dest = &sr;
+                                       else if (name == "polarization") dest = &pol;
+                                       else if (name == "fec_inner") dest = &fec;
+                                       else if (name == "inversion") dest = &inv;
+                                       else if (name == "rolloff") dest = &rolloff;
+                                       else if (name == "pilot") dest = &pilot;
+                                       else if (name == "tsid") dest = &tsid;
+                                       else if (name == "onid") dest = &onid;
+                                       if (dest)
+                                       {
+                                               tmp = strtol(at->value().c_str(), &end_ptr, 10);
+                                               if (!*end_ptr)
+                                                       *dest = tmp;
+                                       }
+                               }
+                               if (freq && sr && pol != -1)
+                               {
+                                       tuple = PyTuple_New(12);
+                                       PyTuple_SET_ITEM(tuple, 0, PyInt_FromLong(0));
+                                       PyTuple_SET_ITEM(tuple, 1, PyInt_FromLong(freq));
+                                       PyTuple_SET_ITEM(tuple, 2, PyInt_FromLong(sr));
+                                       PyTuple_SET_ITEM(tuple, 3, PyInt_FromLong(pol));
+                                       PyTuple_SET_ITEM(tuple, 4, PyInt_FromLong(fec));
+                                       PyTuple_SET_ITEM(tuple, 5, PyInt_FromLong(system));
+                                       PyTuple_SET_ITEM(tuple, 6, PyInt_FromLong(modulation));
+                                       PyTuple_SET_ITEM(tuple, 7, PyInt_FromLong(inv));
+                                       PyTuple_SET_ITEM(tuple, 8, PyInt_FromLong(rolloff));
+                                       PyTuple_SET_ITEM(tuple, 9, PyInt_FromLong(pilot));
+                                       PyTuple_SET_ITEM(tuple, 10, PyInt_FromLong(tsid));
+                                       PyTuple_SET_ITEM(tuple, 11, PyInt_FromLong(onid));
+                                       PyList_Append(tplist, tuple);
+                                       Py_DECREF(tuple);
+                               }
+                       }
+                       Py_DECREF(tplist);
+               }
+               else
+               {
+                       if (sat_pos)
+                               Py_DECREF(sat_pos);
+                       if (sat_name)
+                               Py_DECREF(sat_name);
+                       if (sat_flags)
+                               Py_DECREF(sat_flags);
+               }
+       }
+       Py_INCREF(Py_True);
+       return Py_True;
+}
+
+PyObject *eDVBDB::readCables(ePyObject cab_list, ePyObject tp_dict)
+{
+       if (!PyDict_Check(tp_dict)) {
+               PyErr_SetString(PyExc_StandardError,
+                       "type error");
+                       eDebug("arg 1 is not a python dict");
+               return NULL;
+       }
+       else if (!PyList_Check(cab_list))
+       {
+               PyErr_SetString(PyExc_StandardError,
+                       "type error");
+                       eDebug("arg 0 is not a python list");
+               return NULL;
+       }
+       XMLTree tree;
+       tree.setFilename("/etc/tuxbox/cables.xml");
+       tree.read();
+       Element *root = tree.getRoot();
+       if (!root)
+       {
+               eDebug("couldn't open /etc/tuxbox/cables.xml!!");
+               Py_INCREF(Py_False);
+               return Py_False;
+       }
+       const Attribute *at;
+       int tmp, *dest,
+               modulation, fec, freq, sr;
+       std::string name;
+       char *end_ptr;
+       const ElementList &root_elements = root->getElementList();
+       for (ElementConstIterator it(root_elements.begin()); it != root_elements.end(); ++it)
+       {
+//             eDebug("element: %s", el->name().c_str());
+               const Element *el = *it;
+               const ElementList &cab_elements = el->getElementList();
+               const AttributeList &cab_attributes = el->getAttributeList();
+               ePyObject cab_name;
+               ePyObject cab_flags;
+               for (AttributeConstIterator it(cab_attributes.begin()); it != cab_attributes.end(); ++it)
+               {
+//                     eDebug("\tattr: %s", at->name().c_str());
+                       at = *it;
+                       name = at->name();
+                       if (name == "name")
+                               cab_name = PyString_FromString(at->value().c_str());
+                       else if (name == "flags")
+                       {
+                               tmp = strtol(at->value().c_str(), &end_ptr, 10);
+                               if (!*end_ptr)
+                                       cab_flags = PyInt_FromLong(tmp);
+                       }
+               }
+               if (cab_name)
+               {
+                       ePyObject tplist = PyList_New(0);
+                       ePyObject tuple = PyTuple_New(2);
+                       if (!cab_flags)
+                               cab_flags = PyInt_FromLong(0);
+                       PyTuple_SET_ITEM(tuple, 0, cab_name);
+                       PyTuple_SET_ITEM(tuple, 1, cab_flags);
+                       PyList_Append(cab_list, tuple);
+                       Py_DECREF(tuple);
+                       PyDict_SetItem(tp_dict, cab_name, tplist);
+                       for (ElementConstIterator it(cab_elements.begin()); it != cab_elements.end(); ++it)
+                       {
+//                             eDebug("\telement: %s", (*it)->name().c_str());
+                               const AttributeList &tp_attributes = (*it)->getAttributeList();
+                               AttributeConstIterator end = tp_attributes.end();
+                               modulation = eDVBFrontendParametersCable::Modulation_QAM64;
+                               fec = eDVBFrontendParametersCable::FEC_Auto;
+                               freq = 0;
+                               sr = 0;
+                               for (AttributeConstIterator it(tp_attributes.begin()); it != end; ++it)
+                               {
+//                                     eDebug("\t\tattr: %s", at->name().c_str());
+                                       at = *it;
+                                       dest = 0;
+                                       name = at->name();
+                                       if (name == "modulation") dest = &modulation;
+                                       else if (name == "frequency") dest = &freq;
+                                       else if (name == "symbol_rate") dest = &sr;
+                                       else if (name == "fec_inner") dest = &fec;
+                                       if (dest)
+                                       {
+                                               tmp = strtol(at->value().c_str(), &end_ptr, 10);
+                                               if (!*end_ptr)
+                                                       *dest = tmp;
+                                       }
+                               }
+                               if (freq && sr)
+                               {
+                                       while (freq > 999999)
+                                               freq /= 10;
+                                       tuple = PyTuple_New(5);
+                                       PyTuple_SET_ITEM(tuple, 0, PyInt_FromLong(1));
+                                       PyTuple_SET_ITEM(tuple, 1, PyInt_FromLong(freq));
+                                       PyTuple_SET_ITEM(tuple, 2, PyInt_FromLong(sr));
+                                       PyTuple_SET_ITEM(tuple, 3, PyInt_FromLong(modulation));
+                                       PyTuple_SET_ITEM(tuple, 4, PyInt_FromLong(fec));
+                                       PyList_Append(tplist, tuple);
+                                       Py_DECREF(tuple);
+                               }
+                       }
+                       Py_DECREF(tplist);
+               }
+               else if (cab_flags)
+                       Py_DECREF(cab_flags);
+       }
+       Py_INCREF(Py_True);
+       return Py_True;
+}
+
+PyObject *eDVBDB::readTerrestrials(ePyObject ter_list, ePyObject tp_dict)
+{
+       if (!PyDict_Check(tp_dict)) {
+               PyErr_SetString(PyExc_StandardError,
+                       "type error");
+                       eDebug("arg 1 is not a python dict");
+               return NULL;
+       }
+       else if (!PyList_Check(ter_list))
+       {
+               PyErr_SetString(PyExc_StandardError,
+                       "type error");
+                       eDebug("arg 0 is not a python list");
+               return NULL;
+       }
+       XMLTree tree;
+       tree.setFilename("/etc/tuxbox/terrestrial.xml");
+       tree.read();
+       Element *root = tree.getRoot();
+       if (!root)
+       {
+               eDebug("couldn't open /etc/tuxbox/terrestrial.xml!!");
+               Py_INCREF(Py_False);
+               return Py_False;
+       }
+       const Attribute *at;
+       std::string name;
+       int tmp, *dest,
+               freq, bw, constellation, crh = 5, crl = 5, guard = 4, transm, hierarchy, inv = 2;
+       char *end_ptr;
+       const ElementList &root_elements = root->getElementList();
+       for (ElementConstIterator it(root_elements.begin()); it != root_elements.end(); ++it)
+       {
+//             eDebug("element: %s", el->name().c_str());
+               const Element *el = *it;
+               const ElementList &ter_elements = el->getElementList();
+               const AttributeList &ter_attributes = el->getAttributeList();
+               ePyObject ter_name;
+               ePyObject ter_flags;
+               for (AttributeConstIterator it(ter_attributes.begin()); it != ter_attributes.end(); ++it)
+               {
+//                     eDebug("\tattr: %s", at->name().c_str());
+                       at = *it;
+                       name = at->name();
+                       if (name == "name")
+                               ter_name = PyString_FromString(at->value().c_str());
+                       else if (name == "flags")
+                       {
+                               tmp = strtol(at->value().c_str(), &end_ptr, 10);
+                               if (!*end_ptr)
+                                       ter_flags = PyInt_FromLong(tmp);
+                       }
+               }
+               if (ter_name)
+               {
+                       ePyObject tplist = PyList_New(0);
+                       ePyObject tuple = PyTuple_New(2);
+                       if (!ter_flags)
+                               ter_flags = PyInt_FromLong(0);
+                       PyTuple_SET_ITEM(tuple, 0, ter_name);
+                       PyTuple_SET_ITEM(tuple, 1, ter_flags);
+                       PyList_Append(ter_list, tuple);
+                       Py_DECREF(tuple);
+                       PyDict_SetItem(tp_dict, ter_name, tplist);
+                       for (ElementConstIterator it(ter_elements.begin()); it != ter_elements.end(); ++it)
+                       {
+//                             eDebug("\telement: %s", (*it)->name().c_str());
+                               const AttributeList &tp_attributes = (*it)->getAttributeList();
+                               AttributeConstIterator end = tp_attributes.end();
+                               freq = 0;
+                               bw = eDVBFrontendParametersTerrestrial::Bandwidth_Auto;
+                               constellation = eDVBFrontendParametersTerrestrial::Modulation_Auto;
+                               crh = eDVBFrontendParametersTerrestrial::FEC_Auto;
+                               crl = eDVBFrontendParametersTerrestrial::FEC_Auto;
+                               guard = eDVBFrontendParametersTerrestrial::GuardInterval_Auto;
+                               transm = eDVBFrontendParametersTerrestrial::TransmissionMode_Auto;
+                               hierarchy = eDVBFrontendParametersTerrestrial::Hierarchy_Auto;
+                               inv = eDVBFrontendParametersTerrestrial::Inversion_Unknown;
+                               for (AttributeConstIterator it(tp_attributes.begin()); it != end; ++it)
+                               {
+//                                     eDebug("\t\tattr: %s", at->name().c_str());
+                                       at = *it;
+                                       dest = 0;
+                                       name = at->name();
+                                       if (name == "centre_frequency") dest = &freq;
+                                       else if (name == "bandwidth") dest = &bw;
+                                       else if (name == "constellation") dest = &constellation;
+                                       else if (name == "code_rate_hp") dest = &crh;
+                                       else if (name == "code_rate_lp") dest = &crl;
+                                       else if (name == "guard_interval") dest = &guard;
+                                       else if (name == "transmission_mode") dest = &transm;
+                                       else if (name == "hierarchy_information") dest = &hierarchy;
+                                       else if (name == "inversion") dest = &inv;
+                                       if (dest)
+                                       {
+                                               tmp = strtol(at->value().c_str(), &end_ptr, 10);
+                                               if (!*end_ptr)
+                                                       *dest = tmp;
+                                       }
+                               }
+                               if (freq)
+                               {
+                                       if (crh > 5) // our terrestrial.xml is buggy... 6 for AUTO
+                                               crh = 5;
+                                       if (crl > 5) // our terrestrial.xml is buggy... 6 for AUTO
+                                               crl = 5;
+                                       tuple = PyTuple_New(10);
+                                       PyTuple_SET_ITEM(tuple, 0, PyInt_FromLong(2));
+                                       PyTuple_SET_ITEM(tuple, 1, PyInt_FromLong(freq));
+                                       PyTuple_SET_ITEM(tuple, 2, PyInt_FromLong(bw));
+                                       PyTuple_SET_ITEM(tuple, 3, PyInt_FromLong(constellation));
+                                       PyTuple_SET_ITEM(tuple, 4, PyInt_FromLong(crh));
+                                       PyTuple_SET_ITEM(tuple, 5, PyInt_FromLong(crl));
+                                       PyTuple_SET_ITEM(tuple, 6, PyInt_FromLong(guard));
+                                       PyTuple_SET_ITEM(tuple, 7, PyInt_FromLong(transm));
+                                       PyTuple_SET_ITEM(tuple, 8, PyInt_FromLong(hierarchy));
+                                       PyTuple_SET_ITEM(tuple, 9, PyInt_FromLong(inv));
+                                       PyList_Append(tplist, tuple);
+                                       Py_DECREF(tuple);
+                               }
+                       }
+                       Py_DECREF(tplist);
+               }
+               else if (ter_flags)
+                       Py_DECREF(ter_flags);
+       }
+       Py_INCREF(Py_True);
+       return Py_True;
+}
+
 eDVBDB::~eDVBDB()
 {
        instance=NULL;
@@ -763,14 +1194,23 @@ RESULT eDVBDB::removeServices(eDVBChannelID chid, unsigned int orbpos)
                bool remove=true;
                int system;
                it->second.m_frontendParameters->getSystem(system);
-               if ( orbpos != 0xFFFFFFFF && system == iDVBFrontend::feSatellite )
+               if ( system == iDVBFrontend::feSatellite )
                {
                        eDVBFrontendParametersSatellite sat;
                        it->second.m_frontendParameters->getDVBS(sat);
                        if ((unsigned int)sat.orbital_position != orbpos)
                                remove=false;
                }
-               if ( remove && chid.dvbnamespace != eNs && chid.dvbnamespace != ch.dvbnamespace )
+               if ( remove && chid.dvbnamespace != eNs ) // namespace given?
+               {
+                       if ( system == iDVBFrontend::feCable && chid.dvbnamespace.get() == (int)0xFFFF0000 )
+                               ;
+                       else if ( system == iDVBFrontend::feTerrestrial && chid.dvbnamespace.get() == (int)0xEEEE0000 )
+                               ;
+                       else if ( chid.dvbnamespace != ch.dvbnamespace )
+                               remove=false;
+               }
+               else if ( system == iDVBFrontend::feCable || system == iDVBFrontend::feTerrestrial )
                        remove=false;
                if ( remove && chid.original_network_id != eOnid && chid.original_network_id != ch.original_network_id )
                        remove=false;
@@ -806,6 +1246,45 @@ RESULT eDVBDB::removeServices(eDVBChannelID chid, unsigned int orbpos)
        return ret;
 }
 
+RESULT eDVBDB::removeServices(iDVBFrontendParameters *feparm)
+{
+       int ret = -1;
+       std::set<eDVBChannelID> removed_chids;
+       std::map<eDVBChannelID, channel>::iterator it(m_channels.begin());
+       while (it != m_channels.end())
+       {
+               int diff;
+               if (!feparm->calculateDifference(&(*it->second.m_frontendParameters), diff, false))
+               {
+                       if (diff < 4000)
+                       {
+                               removed_chids.insert(it->first);
+                               m_channels.erase(it++);
+                       }
+                       else
+                               ++it;
+               }
+               else
+                       ++it;
+       }
+       if (!removed_chids.empty())
+       {
+               std::map<eServiceReferenceDVB, ePtr<eDVBService> >::iterator service(m_services.begin());
+               while(service != m_services.end())
+               {
+                       eDVBChannelID chid;
+                       service->first.getChannelID(chid);
+                       std::set<eDVBChannelID>::iterator it(removed_chids.find(chid));
+                       if (it != removed_chids.end())
+                               m_services.erase(service++);
+                       else
+                               ++service;
+               }
+               ret = 0;
+       }
+       return ret;
+}
+
 RESULT eDVBDB::addFlag(const eServiceReference &ref, unsigned int flagmask)
 {
        if (ref.type == eServiceReference::idDVB)
@@ -857,8 +1336,15 @@ RESULT eDVBDB::removeFlags(unsigned int flagmask, eDVBChannelID chid, unsigned i
                        if ((unsigned int)sat.orbital_position != orbpos)
                                remove=false;
                }
-               if ( remove && chid.dvbnamespace != eNs && chid.dvbnamespace != ch.dvbnamespace )
-                       remove=false;
+               if ( remove && chid.dvbnamespace != eNs )
+               {
+                       if (system == iDVBFrontend::feCable && chid.dvbnamespace.get() == (int)0xFFFF0000)
+                               ;
+                       else if (system == iDVBFrontend::feTerrestrial && chid.dvbnamespace.get() == (int)0xEEEE0000)
+                               ;
+                       else if ( chid.dvbnamespace != ch.dvbnamespace )
+                               remove=false;
+               }
                if ( remove && chid.original_network_id != eOnid && chid.original_network_id != ch.original_network_id )
                        remove=false;
                if ( remove && chid.transport_stream_id != eTsid && chid.transport_stream_id != ch.transport_stream_id )
@@ -886,9 +1372,13 @@ RESULT eDVBDB::removeFlags(unsigned int flagmask, eDVBChannelID chid, unsigned i
 RESULT eDVBDB::addChannelToList(const eDVBChannelID &id, iDVBFrontendParameters *feparm)
 {
        channel ch;
+       std::map<eDVBChannelID, channel>::iterator it = m_channels.find(id);
        assert(feparm);
        ch.m_frontendParameters = feparm;
-       m_channels.insert(std::pair<eDVBChannelID, channel>(id, ch));
+       if (it != m_channels.end())
+               it->second = ch;
+       else
+               m_channels.insert(std::pair<eDVBChannelID, channel>(id, ch));
        return 0;
 }
 
@@ -945,7 +1435,7 @@ RESULT eDVBDB::getBouquet(const eServiceReference &ref, eBouquet* &bouquet)
                eDebug("getBouquet failed.. no path given!");
                return -1;
        }
-       unsigned int pos = str.find("FROM BOUQUET \"");
+       size_t pos = str.find("FROM BOUQUET \"");
        if ( pos != std::string::npos )
        {
                str.erase(0, pos+14);
@@ -1016,7 +1506,7 @@ int eDVBDBQueryBase::compareLessEqual(const eServiceReferenceDVB &a, const eServ
 {
        ePtr<eDVBService> a_service, b_service;
        int sortmode = m_query ? m_query->m_sort : eDVBChannelQuery::tName;
-       
+
        if ((sortmode == eDVBChannelQuery::tName) || (sortmode == eDVBChannelQuery::tProvider))
        {
                if (a.name.empty() && m_db->getService(a, a_service))
@@ -1024,7 +1514,7 @@ int eDVBDBQueryBase::compareLessEqual(const eServiceReferenceDVB &a, const eServ
                if (b.name.empty() && m_db->getService(b, b_service))
                        return 1;
        }
-       
+
        switch (sortmode)
        {
        case eDVBChannelQuery::tName:
@@ -1076,14 +1566,20 @@ RESULT eDVBDBQuery::getNextResult(eServiceReferenceDVB &ref)
 {
        while (m_cursor != m_db->m_services.end())
        {
-               ref = m_cursor->first;
+               ePtr<eDVBService> service = m_cursor->second;
+               if (service->isHidden())
+                       ++m_cursor;
+               else
+               {
+                       ref = m_cursor->first;
 
-               int res = (!m_query) || m_cursor->second->checkFilter(ref, *m_query);
+                       int res = (!m_query) || service->checkFilter(ref, *m_query);
 
-               ++m_cursor;
+                       ++m_cursor;
 
-               if (res)
-                       return 0;
+                       if (res)
+                               return 0;
+               }
        }
 
        ref.type = eServiceReference::idInvalid;
@@ -1107,7 +1603,7 @@ RESULT eDVBDBBouquetQuery::getNextResult(eServiceReferenceDVB &ref)
                std::map<eServiceReferenceDVB, ePtr<eDVBService> >::iterator it =
                        m_db->m_services.find(ref);
 
-               int res = (!m_query) || it == m_db->m_services.end() || it->second->checkFilter(ref, *m_query);
+               int res = (!m_query) || it == m_db->m_services.end() || !(it->second->isHidden() && it->second->checkFilter(ref, *m_query));
 
                ++m_cursor;
 
@@ -1157,22 +1653,17 @@ int eDVBDBListQuery::compareLessEqual(const eServiceReferenceDVB &a, const eServ
 eDVBDBSatellitesQuery::eDVBDBSatellitesQuery(eDVBDB *db, const eServiceReference &source, eDVBChannelQuery *query)
        :eDVBDBListQuery(db, source, query)
 {
+       std::set<unsigned int> found;
        for (std::map<eServiceReferenceDVB, ePtr<eDVBService> >::iterator it(m_db->m_services.begin());
                it != m_db->m_services.end(); ++it)
        {
-               int res = it->second->checkFilter(it->first, *query);
+               int res = !it->second->isHidden() && it->second->checkFilter(it->first, *query);
                if (res)
                {
                        unsigned int dvbnamespace = it->first.getDVBNamespace().get()&0xFFFF0000;
-                       bool found=0;
-                       for (std::list<eServiceReferenceDVB>::iterator i(m_list.begin()); i != m_list.end(); ++i)
-                               if ( (i->getDVBNamespace().get()&0xFFFF0000) == dvbnamespace )
-                               {
-                                       found=true;
-                                       break;
-                               }
-                       if (!found)
+                       if (found.find(dvbnamespace) == found.end())
                        {
+                               found.insert(dvbnamespace);
                                eServiceReferenceDVB ref;
                                ref.setDVBNamespace(dvbnamespace);
                                ref.flags=eServiceReference::flagDirectory;
@@ -1209,26 +1700,19 @@ eDVBDBSatellitesQuery::eDVBDBSatellitesQuery(eDVBDB *db, const eServiceReference
 eDVBDBProvidersQuery::eDVBDBProvidersQuery(eDVBDB *db, const eServiceReference &source, eDVBChannelQuery *query)
        :eDVBDBListQuery(db, source, query)
 {
+       std::set<std::string> found;
        for (std::map<eServiceReferenceDVB, ePtr<eDVBService> >::iterator it(m_db->m_services.begin());
                it != m_db->m_services.end(); ++it)
        {
-               int res = it->second->checkFilter(it->first, *query);
+               int res = !it->second->isHidden() && it->second->checkFilter(it->first, *query);
                if (res)
                {
-                       bool found=0;
-
                        const char *provider_name = it->second->m_provider_name.length() ?
                                it->second->m_provider_name.c_str() :
                                "Unknown";
-
-                       for (std::list<eServiceReferenceDVB>::iterator i(m_list.begin()); i != m_list.end(); ++i)
-                               if (i->name == provider_name)
-                               {
-                                       found=true;
-                                       break;
-                               }
-                       if (!found)
+                       if (found.find(std::string(provider_name)) == found.end())
                        {
+                               found.insert(std::string(provider_name));
                                eServiceReferenceDVB ref;
                                char buf[64];
                                ref.name=provider_name;
@@ -1272,13 +1756,10 @@ static int decodeType(const std::string &type)
 RESULT parseExpression(ePtr<eDVBChannelQuery> &res, std::list<std::string>::const_iterator begin, std::list<std::string>::const_iterator end)
 {
        std::list<std::string>::const_iterator end_of_exp;
-       
+
        if (begin == end)
-       {
-               eDebug("empty expression!");
                return 0;
-       }
-       
+
        if (*begin == "(")
        {
                end_of_exp = begin;
@@ -1287,36 +1768,36 @@ RESULT parseExpression(ePtr<eDVBChannelQuery> &res, std::list<std::string>::cons
                                break;
                        else
                                ++end_of_exp;
-       
+
                if (end_of_exp == end)
                {
                        eDebug("expression parse: end of expression while searching for closing brace");
                        return -1;
                }
-               
+
                ++begin;
                // begin..end_of_exp
                int r = parseExpression(res, begin, end_of_exp);
                if (r)
                        return r;
                ++end_of_exp;
-               
+
                        /* we had only one sub expression */
                if (end_of_exp == end)
                {
 //                     eDebug("only one sub expression");
                        return 0;
                }
-               
+
                        /* otherwise we have an operator here.. */
-               
+
                ePtr<eDVBChannelQuery> r2 = res;
                res = new eDVBChannelQuery();
                res->m_sort = 0;
                res->m_p1 = r2;
                res->m_inverse = 0;
                r2 = 0;
-               
+
                if (*end_of_exp == "||")
                        res->m_type = eDVBChannelQuery::tOR;
                else if (*end_of_exp == "&&")
@@ -1327,18 +1808,18 @@ RESULT parseExpression(ePtr<eDVBChannelQuery> &res, std::list<std::string>::cons
                        res = 0;
                        return 1;
                }
-               
+
                ++end_of_exp;
-               
+
                return parseExpression(res->m_p2, end_of_exp, end);
        }
-       
+
        // "begin" <op> "end"
        std::string type, op, val;
-       
+
        res = new eDVBChannelQuery();
        res->m_sort = 0;
-       
+
        int cnt = 0;
        while (begin != end)
        {
@@ -1360,23 +1841,23 @@ RESULT parseExpression(ePtr<eDVBChannelQuery> &res, std::list<std::string>::cons
                ++begin;
                ++cnt;
        }
-       
+
        if (cnt != 3)
        {
                eDebug("malformed query: missing stuff");
                res = 0;
                return 1;
        }
-       
+
        res->m_type = decodeType(type);
-       
+
        if (res->m_type == -1)
        {
                eDebug("malformed query: invalid type %s", type.c_str());
                res = 0;
                return 1;
        }
-       
+
        if (op == "==")
                res->m_inverse = 0;
        else if (op == "!=")
@@ -1387,18 +1868,27 @@ RESULT parseExpression(ePtr<eDVBChannelQuery> &res, std::list<std::string>::cons
                res = 0;
                return 1;
        }
-       
+
        res->m_string = val;
-       res->m_int = atoi(val.c_str());
-//     res->m_channelid = eDVBChannelID(val);
-       
+
+       if (res->m_type == eDVBChannelQuery::tChannelID)
+       {
+               int ns, tsid, onid;
+               if (sscanf(val.c_str(), "%08x%04x%04x", &ns, &tsid, &onid) == 3)
+                       res->m_channelid = eDVBChannelID(eDVBNamespace(ns), eTransportStreamID(tsid), eOriginalNetworkID(onid));
+               else
+                       eDebug("couldn't parse channelid !! format should be hex NNNNNNNNTTTTOOOO (namespace, tsid, onid)");
+       }
+       else
+               res->m_int = atoi(val.c_str());
+
        return 0;
 }
 
 RESULT eDVBChannelQuery::compile(ePtr<eDVBChannelQuery> &res, std::string query)
 {
        std::list<std::string> tokens;
-       
+
        std::string current_token;
        std::string bouquet_name;
 
@@ -1410,34 +1900,34 @@ RESULT eDVBChannelQuery::compile(ePtr<eDVBChannelQuery> &res, std::string query)
        {
                int c = (i < query.size()) ? query[i] : ' ';
                ++i;
-               
+
                int issplit = !!strchr(splitchars, c);
                int isaln = isalnum(c);
                int iswhite = c == ' ';
                int isquot = c == '\"';
-               
+
                if (quotemode)
                {
                        iswhite = issplit = 0;
                        isaln = lastalnum;
                }
-               
+
                if (issplit || iswhite || isquot || lastsplit || (lastalnum != isaln))
                {
                        if (current_token.size())
                                tokens.push_back(current_token);
                        current_token.clear();
                }
-               
+
                if (!(iswhite || isquot))
                        current_token += c;
-               
+
                if (isquot)
                        quotemode = !quotemode;
                lastsplit = issplit;
                lastalnum = isaln;
        }
-       
+
 //     for (std::list<std::string>::const_iterator a(tokens.begin()); a != tokens.end(); ++a)
 //     {
 //             printf("%s\n", a->c_str());
@@ -1489,12 +1979,12 @@ RESULT eDVBChannelQuery::compile(ePtr<eDVBChannelQuery> &res, std::string query)
                res = 0;
                return -1;
        }
-       
+
 //     eDebug("sort by %d", sort);
-       
+
                /* now we recursivly parse that. */
        int r = parseExpression(res, tokens.begin(), tokens.end());
-       
+
                /* we have an empty (but valid!) expression */
        if (!r && !res)
        {
@@ -1502,7 +1992,7 @@ RESULT eDVBChannelQuery::compile(ePtr<eDVBChannelQuery> &res, std::string query)
                res->m_inverse = 0;
                res->m_type = eDVBChannelQuery::tAny;
        }
-       
+
        if (res)
        {
                res->m_sort = sort;