tsmpegdecoder: set audio type

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

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index 5ede1e38f86e0997b9c3f9769f7747a09102b985..4d78292a2b6d59553ff08cd7739a59cb51b53551 100644 (file)
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@ -46,7 +46,7 @@ eDVBResourceManager::eDVBResourceManager()
 {
        avail = 1;
        busy = 0;
-       m_sec = new eDVBSatelliteEquipmentControl;
+       m_sec = new eDVBSatelliteEquipmentControl(m_frontend);
        if (!instance)
                instance = this;
                
@@ -200,13 +200,15 @@ void eDVBResourceManager::addAdapter(iDVBAdapter *adapter)
 
                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));
                }
        }
 }
 
-RESULT eDVBResourceManager::allocateFrontend(ePtr<iDVBFrontendParameters> &feparm, ePtr<eDVBAllocatedFrontend> &fe)
+RESULT eDVBResourceManager::allocateFrontend(ePtr<eDVBAllocatedFrontend> &fe, ePtr<iDVBFrontendParameters> &feparm)
 {
        ePtr<eDVBRegisteredFrontend> best;
        int bestval = 0;
@@ -217,7 +219,7 @@ RESULT eDVBResourceManager::allocateFrontend(ePtr<iDVBFrontendParameters> &fepar
                        int c = i->m_frontend->isCompatibleWith(feparm);
                        if (c > bestval)
                        {
-                               c = bestval;
+                               bestval = c;
                                best = i;
                        }
                }
@@ -233,6 +235,19 @@ RESULT eDVBResourceManager::allocateFrontend(ePtr<iDVBFrontendParameters> &fepar
        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)
@@ -317,15 +332,9 @@ RESULT eDVBResourceManager::allocateChannel(const eDVBChannelID &channelid, eUse
        
        ePtr<eDVBAllocatedFrontend> fe;
        
-       if (allocateFrontend(feparm, fe))
+       if (allocateFrontend(fe, feparm))
                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);
@@ -341,20 +350,13 @@ RESULT eDVBResourceManager::allocateChannel(const eDVBChannelID &channelid, eUse
        return 0;
 }
 
-RESULT eDVBResourceManager::allocateRawChannel(eUsePtr<iDVBChannel> &channel)
+RESULT eDVBResourceManager::allocateRawChannel(eUsePtr<iDVBChannel> &channel, int frontend_index)
 {
        ePtr<eDVBAllocatedFrontend> fe;
 
-#warning FIXME allocateRawChannel
-
-//     if (allocateFrontend(eDVBChannelID(), fe))
+       if (allocateFrontendByIndex(fe, frontend_index))
                return errNoFrontend;
        
-//     ePtr<eDVBAllocatedDemux> demux;
-       //
-//     if (allocateDemux(*fe, demux))
-//             return errNoDemux;
-       
        eDVBChannel *ch;
        ch = new eDVBChannel(this, fe);
 
@@ -367,9 +369,6 @@ RESULT eDVBResourceManager::allocatePVRChannel(eUsePtr<iDVBPVRChannel> &channel)
 {
        ePtr<eDVBAllocatedDemux> demux;
        
-//     if (allocateDemux(0, demux))
-//             return errNoDemux;
-       
        eDVBChannel *ch;
        ch = new eDVBChannel(this, 0);
        
@@ -583,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)
        {
-               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;
        }
        
@@ -609,9 +608,9 @@ RESULT eDVBChannel::getLength(pts_t &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;
@@ -625,7 +624,7 @@ RESULT eDVBChannel::getCurrentPosition(pts_t &pos)
        
        pts_t now;
        
-       r = m_decoder_demux->get().getSTC(now);
+       r = decoding_demux->getSTC(now);
 
        if (r)
        {
@@ -650,7 +649,7 @@ RESULT eDVBChannel::getCurrentPosition(pts_t &pos)
        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 */
        
@@ -660,7 +659,7 @@ RESULT eDVBChannel::seekTo(int relative, pts_t &pts)
        if (relative)
        {
                pts_t now;
-               if (getCurrentPosition(now))
+               if (getCurrentPosition(decoding_demux, now))
                {
                        eDebug("seekTo: getCurrentPosition failed!");
                        return -1;
@@ -673,11 +672,11 @@ RESULT eDVBChannel::seekTo(int relative, pts_t &pts)
        
        off_t offset = (pts * (pts_t)bitrate) / 8ULL / 90000ULL;
        
-       seekToPosition(offset);
+       seekToPosition(decoding_demux, offset);
        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:
@@ -699,8 +698,8 @@ RESULT eDVBChannel::seekToPosition(const off_t &r)
        ::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);