more python fixes

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

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index f8f9527694498e37b77b15a8f8d10cc585bdce5f..8c874e8671149ad36d2a7dda91f0343f47691b8b 100644 (file)
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@ -42,6 +42,16 @@ DEFINE_REF(eDVBResourceManager);
 
 eDVBResourceManager *eDVBResourceManager::instance;
 
+RESULT eDVBResourceManager::getInstance(ePtr<eDVBResourceManager> &ptr)
+{
+       if (instance)
+       {
+               ptr = instance;
+               return 0;
+       }
+       return -1;
+}
+
 eDVBResourceManager::eDVBResourceManager()
        :m_releaseCachedChannelTimer(eApp)
 {
@@ -626,11 +636,11 @@ void eDVBChannel::frontendStateChanged(iDVBFrontend*fe)
        } else if (state == iDVBFrontend::stateLostLock)
        {
                        /* on managed channels, we try to retune in order to re-acquire lock. */
-               if (m_feparm)
+               if (m_current_frontend_parameters)
                {
                        eDebug("OURSTATE: lost lock, trying to retune");
                        ourstate = state_tuning;
-                       m_frontend->get().tune(*m_feparm);
+                       m_frontend->get().tune(*m_current_frontend_parameters);
                } else
                        /* on unmanaged channels, we don't do this. the client will do this. */
                {
@@ -788,7 +798,11 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
                }
                
                if (relative == 1) /* pts relative */
+               {
                        pts += now;
+                       if (pts < 0)
+                               pts = 0;
+               }
 
                if (relative != 2)
                        if (pts < 0)
@@ -918,7 +932,7 @@ RESULT eDVBChannel::setChannel(const eDVBChannelID &channelid, ePtr<iDVBFrontend
                        /* if tuning fails, shutdown the channel immediately. */
        int res;
        res = m_frontend->get().tune(*feparm);
-       m_feparm = feparm;
+       m_current_frontend_parameters = feparm;
        
        if (res)
        {
@@ -977,8 +991,13 @@ RESULT eDVBChannel::getFrontend(ePtr<iDVBFrontend> &frontend)
        frontend = &m_frontend->get();
        if (frontend)
                return 0;
-       else
-               return -ENODEV;
+       return -ENODEV;
+}
+
+RESULT eDVBChannel::getCurrentFrontendParameters(ePtr<iDVBFrontendParameters> &param)
+{
+       param = m_current_frontend_parameters;
+       return 0;
 }
 
 RESULT eDVBChannel::playFile(const char *file)