release cached channel when its no more used and a pvr channel request is pending

[vuplus_dvbapp] / lib / dvb / dvb.cpp

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index f8f9527..55aa6ea 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)
 {
@@ -422,9 +432,16 @@ RESULT eDVBResourceManager::allocatePVRChannel(eUsePtr<iDVBPVRChannel> &channel)
 {
        ePtr<eDVBAllocatedDemux> demux;
 
+       if (m_cached_channel && m_releaseCachedChannelTimer.isActive())
+       {
+               m_cached_channel_state_changed_conn.disconnect();
+               m_cached_channel=0;
+               m_releaseCachedChannelTimer.stop();
+       }
+
        eDVBChannel *ch;
        ch = new eDVBChannel(this, 0);
-       
+
        channel = ch;
        return 0;
 }
@@ -626,11 +643,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 +805,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)
@@ -822,10 +843,12 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
                if ((current_offset >= i->first) && (current_offset < i->second))
                {
                        start = current_offset;
-                       size = i->second - current_offset;
-                       if (size > max)
+                               /* max can not exceed max(size_t). i->second - current_offset, however, can. */
+                       if ((i->second - current_offset) > max)
                                size = max;
-                       eDebug("HIT, %lld < %lld < %lld", i->first, current_offset, i->second);
+                       else
+                               size = i->second - current_offset;
+                       eDebug("HIT, %lld < %lld < %lld, size: %d", i->first, current_offset, i->second, size);
                        return;
                }
                if (current_offset < i->first)
@@ -835,9 +858,13 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
                        {
                                        /* in normal playback, just start at the next zone. */
                                start = i->first;
-                               size = i->second - i->first;
-                               if (size > max)
+                               
+                                       /* size is not 64bit! */
+                               if ((i->second - i->first) > max)
                                        size = max;
+                               else
+                                       size = i->second - i->first;
+
                                eDebug("skip");
                                if (m_skipmode_m < 0)
                                {
@@ -851,12 +878,15 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
                                        /* when skipping reverse, however, choose the zone before. */
                                --i;
                                eDebug("skip to previous block, which is %llx..%llx", i->first, i->second);
-                               size_t len = i->second - i->first;
-                               if (max > len)
-                                       max = len;
-                               start = i->second - max;
-                               size = max;
-                               eDebug("skipping to %llx, %d", start, size);
+                               size_t len;
+                               
+                               if ((i->second - i->first) > max)
+                                       len = max;
+                               else
+                                       len = i->second - i->first;
+
+                               start = i->second - len;
+                               eDebug("skipping to %llx, %d", start, len);
                        }
                        return;
                }
@@ -918,7 +948,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)
        {
@@ -974,11 +1004,19 @@ RESULT eDVBChannel::getDemux(ePtr<iDVBDemux> &demux, int cap)
 
 RESULT eDVBChannel::getFrontend(ePtr<iDVBFrontend> &frontend)
 {
+       frontend = 0;
+       if (!m_frontend)
+               return -ENODEV;
        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)