add needed functions

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

diff --git a/lib/dvb/db.cpp b/lib/dvb/db.cpp
index 658c5866e1ac2dab888b7bca8beba5547737e477..a3a98c0401683c9c68badee3159ed6d2bad48bba 100644 (file)
--- a/lib/dvb/db.cpp
+++ b/lib/dvb/db.cpp
@@ -149,10 +149,9 @@ RESULT eDVBService::getName(const eServiceReference &ref, std::string &name)
        return 0;
 }
 
-RESULT eDVBService::getEvent(const eServiceReference &ref, ePtr<eServiceEvent> &ptr)
+RESULT eDVBService::getEvent(const eServiceReference &ref, ePtr<eServiceEvent> &ptr, time_t start_time)
 {
-       time_t t=-1;
-       return eEPGCache::getInstance()->lookupEventTime(ref, t, ptr);
+       return eEPGCache::getInstance()->lookupEventTime(ref, start_time, ptr);
 }
 
 bool eDVBService::isPlayable(const eServiceReference &ref, const eServiceReference &ignore)
@@ -858,7 +857,11 @@ eDVBDBSatellitesQuery::eDVBDBSatellitesQuery(eDVBDB *db, const eServiceReference
                                char buf[64];
 // TODO get real satellite name..
 // but i dont like to parse the satellites.xml here.. and in the python part
-                               snprintf(buf, 64, "Services - %d", dvbnamespace>>16);
+                               int tpos = dvbnamespace>>16;
+                               if (tpos > 1800) // west
+                                       snprintf(buf, 64, "Services (%3.1fW)", (0 - (tpos - 3600)) / 10.0);
+                               else
+                                       snprintf(buf, 64, "Services (%3.1fE)", tpos / 10.0);
                                ref.name=buf;
                                snprintf(buf, 64, "(satellitePosition == %d) && ", dvbnamespace>>16);
                                ref.path=buf+source.path;
@@ -874,7 +877,10 @@ eDVBDBSatellitesQuery::eDVBDBSatellitesQuery(eDVBDB *db, const eServiceReference
                                ref.path.erase(pos+5);
                                ref.path+="PROVIDERS ORDER BY name";
 //                             eDebug("ref.path now %s", ref.path.c_str());
-                               snprintf(buf, 64, "Providers - %d", dvbnamespace>>16);
+                               if (tpos > 1800) // west
+                                       snprintf(buf, 64, "Providers (%3.1fW)", (0 - (tpos - 3600)) / 10.0);
+                               else
+                                       snprintf(buf, 64, "Providers (%3.1fE)", tpos / 10.0);
                                ref.name=buf;
                                m_list.push_back(ref);
                        }