fix segfault

[enigma2.git] / lib / service / servicedvb.cpp

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index 7d737c22e6e6f018d20784001c57f81de288ae93..bae45aaea2fb12404b8848443ad6755c9719c0b3 100644 (file)
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -630,7 +630,7 @@ RESULT eServiceFactoryDVB::lookupService(ePtr<eDVBService> &service, const eServ
 }
 
 eDVBServicePlay::eDVBServicePlay(const eServiceReference &ref, eDVBService *service): 
-       m_reference(ref), m_dvb_service(service), m_is_paused(0)
+       m_reference(ref), m_dvb_service(service), m_have_video_pid(0), m_is_paused(0)
 {
        m_is_primary = 1;
        m_is_pvr = !m_reference.path.empty();
@@ -752,9 +752,6 @@ RESULT eDVBServicePlay::start()
        eServiceReferenceDVB &service = (eServiceReferenceDVB&)m_reference;
        r = m_service_handler.tune(service, m_is_pvr, m_cue);
 
-       // get back correct service reference (after parsing of recording meta files)
-       m_service_handler.getServiceReference(service);
-
                /* inject EIT if there is a stored one */
        if (m_is_pvr)
        {
@@ -1031,7 +1028,8 @@ RESULT eDVBServicePlay::subServices(ePtr<iSubserviceList> &ptr)
 RESULT eDVBServicePlay::timeshift(ePtr<iTimeshiftService> &ptr)
 {
        ptr = 0;
-       if (m_timeshift_enabled || !m_is_pvr)
+       if (m_have_video_pid &&  // HACK !!! FIXMEE !! temporary no timeshift on radio services !!
+               (m_timeshift_enabled || !m_is_pvr))
        {
                if (!m_timeshift_enabled)
                {
@@ -1694,12 +1692,11 @@ void eDVBServicePlay::updateDecoder()
                }
                else // subservice or recording
                {
-                       eServiceReferenceDVB parent = ((eServiceReferenceDVB&)m_reference).getParentServiceReference();
-                       if (!parent && !m_reference.path.empty()) // is recording
-                       {
-                               parent = (eServiceReferenceDVB&)m_reference;
-                               parent.path="";
-                       }
+                       eServiceReferenceDVB ref;
+                       m_service_handler.getServiceReference(ref);
+                       eServiceReferenceDVB parent = ref.getParentServiceReference();
+                       if (!parent)
+                               parent = ref;
                        if (parent)
                        {
                                ePtr<eDVBResourceManager> res_mgr;
@@ -1711,14 +1708,13 @@ void eDVBServicePlay::updateDecoder()
                                                ePtr<eDVBService> origService;
                                                if (!db->getService(parent, origService))
                                                {
-                                                       ac3_delay = origService->getCacheEntry(eDVBService::cAC3DELAY);
+                                                       ac3_delay = origService->getCacheEntry(eDVBService::cAC3DELAY);
                                                        pcm_delay = origService->getCacheEntry(eDVBService::cPCMDELAY);
                                                }
                                        }
                                }
                        }
                }
-
                m_decoder->setAC3Delay(ac3_delay == -1 ? 0 : ac3_delay);
                m_decoder->setPCMDelay(pcm_delay == -1 ? 0 : pcm_delay);
 
@@ -1774,6 +1770,7 @@ void eDVBServicePlay::updateDecoder()
                        m_dvb_service->setCacheEntry(eDVBService::cTPID, tpid);
                }
        }
+       m_have_video_pid = (vpid > 0 && vpid < 0x2000);
 }
 
 void eDVBServicePlay::loadCuesheet()