added missing return statement

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

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index 6289937997c0e19d75396e8942036ca6e5aa8d31..6a0211ec54f3701e38d56b85f2e42a7ac6d123e2 100644 (file)
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@ -493,19 +493,22 @@ bool eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid, con
 
        if (!decremented_cached_channel_fe_usecount)
        {
-               eDVBChannel *channel = (eDVBChannel*) &(*m_cached_channel);
-               if (channel->getUseCount() == 1)
+               if (m_cached_channel)
                {
-                       ePtr<iDVBFrontend> fe;
-                       if (!channel->getFrontend(fe))
+                       eDVBChannel *channel = (eDVBChannel*) &(*m_cached_channel);
+                       if (channel->getUseCount() == 1)
                        {
-                               for (eSmartPtrList<eDVBRegisteredFrontend>::iterator ii(m_frontend.begin()); ii != m_frontend.end(); ++ii)
+                               ePtr<iDVBFrontend> fe;
+                               if (!channel->getFrontend(fe))
                                {
-                                       if ( &(*fe) == &(*ii->m_frontend) )
+                                       for (eSmartPtrList<eDVBRegisteredFrontend>::iterator ii(m_frontend.begin()); ii != m_frontend.end(); ++ii)
                                        {
-                                               --ii->m_inuse;
-                                               decremented_cached_channel_fe_usecount = &ii->m_inuse;
-                                               break;
+                                               if ( &(*fe) == &(*ii->m_frontend) )
+                                               {
+                                                       --ii->m_inuse;
+                                                       decremented_cached_channel_fe_usecount = &ii->m_inuse;
+                                                       break;
+                                               }
                                        }
                                }
                        }
@@ -604,6 +607,17 @@ void eDVBChannel::frontendStateChanged(iDVBFrontend*fe)
        }
 }
 
+void eDVBChannel::pvrEvent(int event)
+{
+       switch (event)
+       {
+       case eFilePushThread::evtEOF:
+               eDebug("eDVBChannel: End of file!");
+               m_event(this, evtEOF);
+               break;
+       }
+}
+
 void eDVBChannel::AddUse()
 {
        ++m_use_count;
@@ -655,6 +669,12 @@ RESULT eDVBChannel::connectStateChange(const Slot1<void,iDVBChannel*> &stateChan
        return 0;
 }
 
+RESULT eDVBChannel::connectEvent(const Slot2<void,iDVBChannel*,int> &event, ePtr<eConnection> &connection)
+{
+       connection = new eConnection((iDVBChannel*)this, m_event.connect(event));
+       return 0;
+}
+
 RESULT eDVBChannel::getState(int &state)
 {
        state = m_state;
@@ -668,7 +688,6 @@ RESULT eDVBChannel::setCIRouting(const eDVBCIRouting &routing)
 
 RESULT eDVBChannel::getDemux(ePtr<iDVBDemux> &demux, int cap)
 {
-       eDebug("get %d demux", cap);
        ePtr<eDVBAllocatedDemux> &our_demux = (cap & capDecode) ? m_decoder_demux : m_demux;
        
        if (!our_demux)
@@ -677,14 +696,12 @@ RESULT eDVBChannel::getDemux(ePtr<iDVBDemux> &demux, int cap)
                
                if (m_mgr->allocateDemux(m_frontend ? (eDVBRegisteredFrontend*)*m_frontend : (eDVBRegisteredFrontend*)0, our_demux, cap))
                        return -1;
-               
        }
        
        demux = *our_demux;
+               /* don't hold a reference to the decoding demux, we don't need it. */
        if (cap & capDecode)
-       {
                our_demux = 0;
-       }
        return 0;
 }
 
@@ -733,6 +750,7 @@ RESULT eDVBChannel::playFile(const char *file)
        
        m_pvr_thread = new eFilePushThread();
        m_pvr_thread->start(m_pvr_fd_src, m_pvr_fd_dst);
+       CONNECT(m_pvr_thread->m_event, eDVBChannel::pvrEvent);
 
        return 0;
 }