work on linked tuners ( can not test it :( )

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

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index 89e2bdf38986f8f28422cb5ebe1206aa1c7e56b2..9ddc29b3a7caca12ac1200523adb038f7368fc80 100644 (file)
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@ -46,7 +46,7 @@ eDVBResourceManager::eDVBResourceManager()
 {
        avail = 1;
        busy = 0;
 {
        avail = 1;
        busy = 0;

-       m_sec = new eDVBSatelliteEquipmentControl;
+       m_sec = new eDVBSatelliteEquipmentControl(m_frontend);

        if (!instance)
                instance = this;
                
        if (!instance)
                instance = this;
                


@@ -200,21 +200,23 @@ void eDVBResourceManager::addAdapter(iDVBAdapter *adapter)
 
                if (!adapter->getFrontend(frontend, i))
                {
 
                if (!adapter->getFrontend(frontend, i))
                {

+                       frontend->setTone(iDVBFrontend::toneOff);
+                       frontend->setVoltage(iDVBFrontend::voltageOff);

                        frontend->setSEC(m_sec);
                        m_frontend.push_back(new eDVBRegisteredFrontend(frontend, adapter));
                }
        }
 }
 
                        frontend->setSEC(m_sec);
                        m_frontend.push_back(new eDVBRegisteredFrontend(frontend, adapter));
                }
        }
 }
 

-RESULT eDVBResourceManager::allocateFrontend(const eDVBChannelID &chid, ePtr<eDVBAllocatedFrontend> &fe)
+RESULT eDVBResourceManager::allocateFrontend(ePtr<eDVBAllocatedFrontend> &fe, ePtr<iDVBFrontendParameters> &feparm)

 {
        ePtr<eDVBRegisteredFrontend> best;
        int bestval = 0;
 {
        ePtr<eDVBRegisteredFrontend> best;
        int bestval = 0;

-       
+

        for (eSmartPtrList<eDVBRegisteredFrontend>::iterator i(m_frontend.begin()); i != m_frontend.end(); ++i)
                if (!i->m_inuse)
                {
        for (eSmartPtrList<eDVBRegisteredFrontend>::iterator i(m_frontend.begin()); i != m_frontend.end(); ++i)
                if (!i->m_inuse)
                {

-                       int c = i->m_frontend->isCompatibleWith(chid);
+                       int c = i->m_frontend->isCompatibleWith(feparm);

                        if (c > bestval)
                        {
                                c = bestval;
                        if (c > bestval)
                        {
                                c = bestval;


@@ -233,6 +235,19 @@ RESULT eDVBResourceManager::allocateFrontend(const eDVBChannelID &chid, ePtr<eDV
        return -1;
 }
 
        return -1;
 }
 

+RESULT eDVBResourceManager::allocateFrontendByIndex(ePtr<eDVBAllocatedFrontend> &fe, int nr)
+{
+       for (eSmartPtrList<eDVBRegisteredFrontend>::iterator i(m_frontend.begin()); i != m_frontend.end(); ++i, --nr)
+               if ((!nr) && !i->m_inuse)
+               {
+                       fe = new eDVBAllocatedFrontend(i);
+                       return 0;
+               }
+       
+       fe = 0;
+       return -1;
+}
+

 RESULT eDVBResourceManager::allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBAllocatedDemux> &demux, int cap)
 {
                /* find first unused demux which is on same adapter as frontend (or any, if PVR)
 RESULT eDVBResourceManager::allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBAllocatedDemux> &demux, int cap)
 {
                /* find first unused demux which is on same adapter as frontend (or any, if PVR)


@@ -298,26 +313,33 @@ RESULT eDVBResourceManager::allocateChannel(const eDVBChannelID &channelid, eUse
                }
        }
        
                }
        }
        

-               /* no currently available channel is tuned to this channelid. create a new one, if possible. */
-               
-               /* allocate a frontend. */
+       /* no currently available channel is tuned to this channelid. create a new one, if possible. */
+
+       if (!m_list)
+       {
+               eDebug("no channel list set!");
+               return -ENOENT;
+       }
+
+       ePtr<iDVBFrontendParameters> feparm;
+       if (m_list->getChannelFrontendData(channelid, feparm))
+       {
+               eDebug("channel not found!");
+               return -ENOENT;
+       }
+
+       /* allocate a frontend. */

        
        ePtr<eDVBAllocatedFrontend> fe;
        
        
        ePtr<eDVBAllocatedFrontend> fe;
        

-       if (allocateFrontend(channelid, fe))
+       if (allocateFrontend(fe, feparm))

                return errNoFrontend;
        
                return errNoFrontend;
        

-// will be allocated on demand:
-//     ePtr<eDVBAllocatedDemux> demux;
-//     
-//     if (allocateDemux(*fe, demux))
-//             return errNoDemux;
-       

        RESULT res;
        ePtr<eDVBChannel> ch;
        ch = new eDVBChannel(this, fe);
 
        RESULT res;
        ePtr<eDVBChannel> ch;
        ch = new eDVBChannel(this, fe);
 

-       res = ch->setChannel(channelid);
+       res = ch->setChannel(channelid, feparm);

        if (res)
        {
                channel = 0;
        if (res)
        {
                channel = 0;


@@ -328,18 +350,13 @@ RESULT eDVBResourceManager::allocateChannel(const eDVBChannelID &channelid, eUse
        return 0;
 }
 
        return 0;
 }
 

-RESULT eDVBResourceManager::allocateRawChannel(eUsePtr<iDVBChannel> &channel)
+RESULT eDVBResourceManager::allocateRawChannel(eUsePtr<iDVBChannel> &channel, int frontend_index)

 {
        ePtr<eDVBAllocatedFrontend> fe;
 {
        ePtr<eDVBAllocatedFrontend> fe;

-       
-       if (allocateFrontend(eDVBChannelID(), fe))
+
+       if (allocateFrontendByIndex(fe, frontend_index))

                return errNoFrontend;
        
                return errNoFrontend;
        

-//     ePtr<eDVBAllocatedDemux> demux;
-       //
-//     if (allocateDemux(*fe, demux))
-//             return errNoDemux;
-       

        eDVBChannel *ch;
        ch = new eDVBChannel(this, fe);
 
        eDVBChannel *ch;
        ch = new eDVBChannel(this, fe);
 


@@ -352,9 +369,6 @@ RESULT eDVBResourceManager::allocatePVRChannel(eUsePtr<iDVBPVRChannel> &channel)
 {
        ePtr<eDVBAllocatedDemux> demux;
        
 {
        ePtr<eDVBAllocatedDemux> demux;
        

-//     if (allocateDemux(0, demux))
-//             return errNoDemux;
-       

        eDVBChannel *ch;
        ch = new eDVBChannel(this, 0);
        
        eDVBChannel *ch;
        ch = new eDVBChannel(this, 0);
        


@@ -470,7 +484,7 @@ void eDVBChannel::ReleaseUse()
        }
 }
 
        }
 }
 

-RESULT eDVBChannel::setChannel(const eDVBChannelID &channelid)
+RESULT eDVBChannel::setChannel(const eDVBChannelID &channelid, ePtr<iDVBFrontendParameters> &feparm)

 {
        if (m_channel_id)
                m_mgr->removeChannel(this);
 {
        if (m_channel_id)
                m_mgr->removeChannel(this);


@@ -478,24 +492,6 @@ RESULT eDVBChannel::setChannel(const eDVBChannelID &channelid)
        if (!channelid)
                return 0;
 
        if (!channelid)
                return 0;
 

-       ePtr<iDVBChannelList> list;
-       
-       if (m_mgr->getChannelList(list))
-       {
-               eDebug("no channel list set!");
-               return -ENOENT;
-       }
-       
-       eDebug("tuning to chid: ns: %08x tsid %04x onid %04x",
-               channelid.dvbnamespace.get(), channelid.transport_stream_id.get(), channelid.original_network_id.get());
-
-       ePtr<iDVBFrontendParameters> feparm;
-       if (list->getChannelFrontendData(channelid, feparm))
-       {
-               eDebug("channel not found!");
-               return -ENOENT;
-       }
-       

        if (!m_frontend)
        {
                eDebug("no frontend to tune!");
        if (!m_frontend)
        {
                eDebug("no frontend to tune!");


@@ -586,7 +582,7 @@ RESULT eDVBChannel::playFile(const char *file)
        m_pvr_fd_dst = open("/dev/misc/pvr", O_WRONLY);
        if (m_pvr_fd_dst < 0)
        {
        m_pvr_fd_dst = open("/dev/misc/pvr", O_WRONLY);
        if (m_pvr_fd_dst < 0)
        {

-               eDebug("can't open /dev/misc/pvr - you need to buy the new(!) $$$ box! (%m)");
+               eDebug("can't open /dev/misc/pvr - you need to buy the new(!) $$$ box! (%m)"); // or wait for the driver to be improved.

                return -ENODEV;
        }
        
                return -ENODEV;
        }
        


@@ -612,9 +608,9 @@ RESULT eDVBChannel::getLength(pts_t &len)
        return m_tstools.calcLen(len);
 }
 
        return m_tstools.calcLen(len);
 }
 

-RESULT eDVBChannel::getCurrentPosition(pts_t &pos)
+RESULT eDVBChannel::getCurrentPosition(iDVBDemux *decoding_demux, pts_t &pos)

 {
 {

-       if (!m_decoder_demux)
+       if (!decoding_demux)

                return -1;
        
        off_t begin = 0;
                return -1;
        
        off_t begin = 0;


@@ -628,7 +624,7 @@ RESULT eDVBChannel::getCurrentPosition(pts_t &pos)
        
        pts_t now;
        
        
        pts_t now;
        

-       r = m_decoder_demux->get().getSTC(now);
+       r = decoding_demux->getSTC(now);

 
        if (r)
        {
 
        if (r)
        {


@@ -653,7 +649,7 @@ RESULT eDVBChannel::getCurrentPosition(pts_t &pos)
        return 0;
 }
 
        return 0;
 }
 

-RESULT eDVBChannel::seekTo(int relative, pts_t &pts)
+RESULT eDVBChannel::seekTo(iDVBDemux *decoding_demux, int relative, pts_t &pts)

 {
        int bitrate = m_tstools.calcBitrate(); /* in bits/s */
        
 {
        int bitrate = m_tstools.calcBitrate(); /* in bits/s */
        


@@ -663,7 +659,7 @@ RESULT eDVBChannel::seekTo(int relative, pts_t &pts)
        if (relative)
        {
                pts_t now;
        if (relative)
        {
                pts_t now;

-               if (getCurrentPosition(now))
+               if (getCurrentPosition(decoding_demux, now))

                {
                        eDebug("seekTo: getCurrentPosition failed!");
                        return -1;
                {
                        eDebug("seekTo: getCurrentPosition failed!");
                        return -1;


@@ -676,11 +672,11 @@ RESULT eDVBChannel::seekTo(int relative, pts_t &pts)
        
        off_t offset = (pts * (pts_t)bitrate) / 8ULL / 90000ULL;
        
        
        off_t offset = (pts * (pts_t)bitrate) / 8ULL / 90000ULL;
        

-       seekToPosition(offset);
+       seekToPosition(decoding_demux, offset);

        return 0;
 }
 
        return 0;
 }
 

-RESULT eDVBChannel::seekToPosition(const off_t &r)
+RESULT eDVBChannel::seekToPosition(iDVBDemux *decoding_demux, const off_t &r)

 {
                        /* when seeking, we have to ensure that all buffers are flushed.
                           there are basically 3 buffers:
 {
                        /* when seeking, we have to ensure that all buffers are flushed.
                           there are basically 3 buffers:


@@ -702,8 +698,8 @@ RESULT eDVBChannel::seekToPosition(const off_t &r)
        ::ioctl(m_pvr_fd_dst, 0);
        
                /* flush ratebuffers (video, audio) */
        ::ioctl(m_pvr_fd_dst, 0);
        
                /* flush ratebuffers (video, audio) */

-       if (m_decoder_demux)
-               m_decoder_demux->get().flush();
+       if (decoding_demux)
+               decoding_demux->flush();

 
                /* demux will also flush all decoder.. */
        m_pvr_thread->seek(SEEK_SET, r);
 
                /* demux will also flush all decoder.. */
        m_pvr_thread->seek(SEEK_SET, r);