make enigma2 ready for dvb-s2

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

diff --git a/lib/dvb/epgcache.cpp b/lib/dvb/epgcache.cpp
index 7c7dd6b2c51ea595256068757b1e10c66ddc2dc7..ee61268c30520508a10e5454438ecc70ac5c30ee 100644 (file)
--- a/lib/dvb/epgcache.cpp
+++ b/lib/dvb/epgcache.cpp
@@ -177,12 +177,11 @@ eEPGCache::eEPGCache()
 
 void eEPGCache::timeUpdated()
 {
-       if ( !thread_running() )
+       if (!sync())
        {
                eDebug("[EPGC] time updated.. start EPG Mainloop");
                run();
-       }
-       else
+       } else
                messages.send(Message(Message::timeChanged));
 }
 
@@ -692,6 +691,7 @@ void eEPGCache::gotMessage( const Message &msg )
 
 void eEPGCache::thread()
 {
+       hasStarted();
        nice(4);
        load();
        cleanLoop();
@@ -910,7 +910,7 @@ bool eEPGCache::channel_data::finishEPG()
 {
        if (!isRunning)  // epg ready
        {
-               eDebug("[EPGC] stop caching events(%d)", time(0)+eDVBLocalTimeHandler::getInstance()->difference());
+               eDebug("[EPGC] stop caching events(%ld)", time(0)+eDVBLocalTimeHandler::getInstance()->difference());
                zapTimer.start(UPDATE_INTERVAL, 1);
                eDebug("[EPGC] next update in %i min", UPDATE_INTERVAL / 60000);
                for (int i=0; i < 3; ++i)
@@ -931,7 +931,7 @@ bool eEPGCache::channel_data::finishEPG()
 
 void eEPGCache::channel_data::startEPG()
 {
-       eDebug("[EPGC] start caching events(%d)", eDVBLocalTimeHandler::getInstance()->difference()+time(0));
+       eDebug("[EPGC] start caching events(%ld)", eDVBLocalTimeHandler::getInstance()->difference()+time(0));
        state=0;
        haveData=0;
        can_delete=0;
@@ -1118,7 +1118,7 @@ void eEPGCache::channel_data::readData( const __u8 *data)
                                        break;
                                default: eDebugNoNewLine("unknown");break;
                        }
-                       eDebug(" finished(%d)", time(0)+eDVBLocalTimeHandler::getInstance()->difference());
+                       eDebug(" finished(%ld)", time(0)+eDVBLocalTimeHandler::getInstance()->difference());
                        if ( reader )
                                reader->stop();
                        isRunning &= ~source;
@@ -1532,6 +1532,7 @@ PyObject *eEPGCache::lookupEvent(PyObject *list, PyObject *convertFunc)
                PyObject *item=PyList_GET_ITEM(list, listIt++); // borrowed reference!
                if (PyTuple_Check(item))
                {
+                       bool service_changed=false;
                        int type=0;
                        long event_id=-1;
                        time_t stime=-1;
@@ -1579,6 +1580,24 @@ PyObject *eEPGCache::lookupEvent(PyObject *list, PyObject *convertFunc)
                                eDebug("service reference for epg query is not valid");
                                continue;
                        }
+
+                       // redirect subservice querys to parent service
+                       eServiceReferenceDVB &dvb_ref = (eServiceReferenceDVB&)ref;
+                       if (dvb_ref.getParentTransportStreamID().get()) // linkage subservice
+                       {
+                               eServiceCenterPtr service_center;
+                               if (!eServiceCenter::getPrivInstance(service_center))
+                               {
+                                       dvb_ref.setTransportStreamID( dvb_ref.getParentTransportStreamID() );
+                                       dvb_ref.setServiceID( dvb_ref.getParentServiceID() );
+                                       dvb_ref.setParentTransportStreamID(eTransportStreamID(0));
+                                       dvb_ref.setParentServiceID(eServiceID(0));
+                                       dvb_ref.name="";
+                                       service = PyString_FromString(dvb_ref.toString().c_str());
+                                       service_changed = true;
+                               }
+                       }
+
                        PyObject *service_name=NULL;
                        if (must_get_service_name)
                        {
@@ -1628,6 +1647,8 @@ PyObject *eEPGCache::lookupEvent(PyObject *list, PyObject *convertFunc)
                                if (ret)
                                        return ret;
                        }
+                       if (service_changed)
+                               Py_DECREF(service);
                        if (service_name)
                                Py_DECREF(service_name);
                }