set stream mode when using filepush to playback recordings

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

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index bad0ce1af58ca54fa58dca097e6c656b7c6ee2da..13e3a17992e889e82daeacd0a36511f30b3b108c 100644 (file)
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@ -52,6 +52,13 @@ RESULT eDVBResourceManager::getInstance(ePtr<eDVBResourceManager> &ptr)
        return -1;
 }
 
+ePtr<eDVBResourceManager> NewResourceManagerPtr(void)
+{
+       ePtr<eDVBResourceManager> ptr;
+       eDVBResourceManager::getInstance(ptr);
+       return ptr;
+}
+
 eDVBResourceManager::eDVBResourceManager()
        :m_releaseCachedChannelTimer(eApp)
 {
@@ -215,15 +222,28 @@ void eDVBResourceManager::addAdapter(iDVBAdapter *adapter)
                        m_demux.push_back(new eDVBRegisteredDemux(demux, adapter));
        }
 
+       ePtr<eDVBRegisteredFrontend> prev_dvbt_frontend;
        for (i=0; i<num_fe; ++i)
        {
                ePtr<eDVBFrontend> frontend;
-
                if (!adapter->getFrontend(frontend, i))
                {
+                       int frontendType=0;
+                       frontend->getFrontendType(frontendType);
+                       eDVBRegisteredFrontend *new_fe = new eDVBRegisteredFrontend(frontend, adapter);
+                       CONNECT(new_fe->stateChanged, eDVBResourceManager::feStateChanged);
+                       m_frontend.push_back(new_fe);
                        frontend->setSEC(m_sec);
-                       m_frontend.push_back(new eDVBRegisteredFrontend(frontend, adapter));
-                       CONNECT(m_frontend.back()->stateChanged, eDVBResourceManager::feStateChanged);
+                       // we must link all dvb-t frontends ( for active antenna voltage )
+                       if (frontendType == iDVBFrontend::feTerrestrial)
+                       {
+                               if (prev_dvbt_frontend)
+                               {
+                                       prev_dvbt_frontend->m_frontend->setData(eDVBFrontend::LINKED_NEXT_PTR, (int)new_fe);
+                                       frontend->setData(eDVBFrontend::LINKED_PREV_PTR, (int)&(*prev_dvbt_frontend));
+                               }
+                               prev_dvbt_frontend = new_fe;
+                       }
                }
        }
 }
@@ -498,7 +518,7 @@ RESULT eDVBResourceManager::connectChannelAdded(const Slot1<void,eDVBChannel*> &
        return 0;
 }
 
-bool eDVBResourceManager::canAllocateFrontend(ePtr<iDVBFrontendParameters> &feparm)
+int eDVBResourceManager::canAllocateFrontend(ePtr<iDVBFrontendParameters> &feparm)
 {
        ePtr<eDVBRegisteredFrontend> best;
        int bestval = 0;
@@ -511,12 +531,12 @@ bool eDVBResourceManager::canAllocateFrontend(ePtr<iDVBFrontendParameters> &fepa
                                bestval = c;
                }
 
-       return bestval>0;
+       return bestval;
 }
 
-bool eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid, const eDVBChannelID& ignore)
+int eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid, const eDVBChannelID& ignore)
 {
-       bool ret=true;
+       int ret=30000;
        if (m_cached_channel)
        {
                eDVBChannel *cache_chan = (eDVBChannel*)&(*m_cached_channel);
@@ -602,14 +622,14 @@ bool eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid, con
        if (!m_list)
        {
                eDebug("no channel list set!");
-               ret = false;
+               ret = 0;
                goto error;
        }
 
        if (m_list->getChannelFrontendData(channelid, feparm))
        {
                eDebug("channel not found!");
-               ret = false;
+               ret = 0;
                goto error;
        }
 
@@ -791,17 +811,17 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
                eDebug("getNextSourceSpan, no decoding demux. forcing normal play");
                return;
        }
-       
+
        if (m_skipmode_n)
        {
                eDebug("skipmode %d:%d", m_skipmode_m, m_skipmode_n);
                max = m_skipmode_n;
        }
-       
+
        eDebug("getNextSourceSpan, current offset is %08llx!", current_offset);
-       
+
        current_offset += m_skipmode_m;
-       
+
        while (!m_cue->m_seek_requests.empty())
        {
                std::pair<int, pts_t> seek = m_cue->m_seek_requests.front();
@@ -827,6 +847,18 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
                                eDebug("seekTo: getCurrentPosition failed!");
                                continue;
                        }
+               } else if (pts < 0) /* seek relative to end */
+               {
+                       pts_t len;
+                       if (!getLength(len))
+                       {
+                               eDebug("seeking relative to end. len=%lld, seek = %lld", len, pts);
+                               pts += len;
+                       } else
+                       {
+                               eWarning("getLength failed - can't seek relative to end!");
+                               continue;
+                       }
                }
                
                if (relative == 1) /* pts relative */
@@ -857,7 +889,10 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
                
                off_t offset = 0;
                if (m_tstools.getOffset(offset, pts))
+               {
+                       eDebug("get offset for pts=%lld failed!", pts);
                        continue;
+               }
 
                eDebug("ok, resolved skip (rel: %d, diff %lld), now at %08llx", relative, pts, offset);
                current_offset = offset;
@@ -1078,6 +1113,7 @@ RESULT eDVBChannel::playFile(const char *file)
 
        m_pvr_thread = new eFilePushThread();
        m_pvr_thread->enablePVRCommit(1);
+       m_pvr_thread->setStreamMode(1);
        m_pvr_thread->setScatterGather(this);
 
        if (m_pvr_thread->start(file, m_pvr_fd_dst))
@@ -1190,7 +1226,7 @@ eCueSheet::eCueSheet()
 void eCueSheet::seekTo(int relative, const pts_t &pts)
 {
        {
-               eSingleLock l(m_lock);
+               eSingleLocker l(m_lock);
                m_seek_requests.push_back(std::pair<int, pts_t>(relative, pts));
        }
        m_event(evtSeek);
@@ -1198,14 +1234,14 @@ void eCueSheet::seekTo(int relative, const pts_t &pts)
        
 void eCueSheet::clear()
 {
-       eSingleLock l(m_lock);
+       eSingleLocker l(m_lock);
        m_spans.clear();
 }
 
 void eCueSheet::addSourceSpan(const pts_t &begin, const pts_t &end)
 {
        {
-               eSingleLock l(m_lock);
+               eSingleLocker l(m_lock);
                m_spans.push_back(std::pair<pts_t, pts_t>(begin, end));
        }
 }
@@ -1218,7 +1254,7 @@ void eCueSheet::commitSpans()
 void eCueSheet::setSkipmode(const pts_t &ratio)
 {
        {
-               eSingleLock l(m_lock);
+               eSingleLocker l(m_lock);
                m_skipmode_ratio = ratio;
        }
        m_event(evtSkipmode);