Merge branch 'master' into tmbinc/FixTimingBugs
[enigma2.git] / lib / dvb / dvb.cpp
index 8f4022ecbcde00066ce1017d597cc22a2b428c6a..3ad086ded384879452a62fc0bb80c6ec42e35515 100644 (file)
@@ -2,6 +2,7 @@
 #include <lib/base/filepush.h>
 #include <lib/dvb/idvb.h>
 #include <lib/dvb/dvb.h>
 #include <lib/base/filepush.h>
 #include <lib/dvb/idvb.h>
 #include <lib/dvb/dvb.h>
+#include <lib/dvb/pmt.h>
 #include <lib/dvb/sec.h>
 
 #include <errno.h>
 #include <lib/dvb/sec.h>
 
 #include <errno.h>
@@ -42,12 +43,30 @@ DEFINE_REF(eDVBResourceManager);
 
 eDVBResourceManager *eDVBResourceManager::instance;
 
 
 eDVBResourceManager *eDVBResourceManager::instance;
 
+RESULT eDVBResourceManager::getInstance(ePtr<eDVBResourceManager> &ptr)
+{
+       if (instance)
+       {
+               ptr = instance;
+               return 0;
+       }
+       return -1;
+}
+
+ePtr<eDVBResourceManager> NewResourceManagerPtr(void)
+{
+       ePtr<eDVBResourceManager> ptr;
+       eDVBResourceManager::getInstance(ptr);
+       return ptr;
+}
+
 eDVBResourceManager::eDVBResourceManager()
 eDVBResourceManager::eDVBResourceManager()
-       :m_releaseCachedChannelTimer(eApp)
+       :m_releaseCachedChannelTimer(eTimer::create(eApp))
 {
        avail = 1;
        busy = 0;
 {
        avail = 1;
        busy = 0;
-       m_sec = new eDVBSatelliteEquipmentControl(m_frontend);
+       m_sec = new eDVBSatelliteEquipmentControl(m_frontend, m_simulate_frontend);
+
        if (!instance)
                instance = this;
                
        if (!instance)
                instance = this;
                
@@ -62,12 +81,22 @@ eDVBResourceManager::eDVBResourceManager()
                num_adapter++;
        }
        
                num_adapter++;
        }
        
-       eDebug("found %d adapter, %d frontends and %d demux", 
-               m_adapter.size(), m_frontend.size(), m_demux.size());
+       eDebug("found %d adapter, %d frontends(%d sim) and %d demux", 
+               m_adapter.size(), m_frontend.size(), m_simulate_frontend.size(), m_demux.size());
+
+       eDVBCAService::registerChannelCallback(this);
 
 
-       CONNECT(m_releaseCachedChannelTimer.timeout, eDVBResourceManager::releaseCachedChannel);
+       CONNECT(m_releaseCachedChannelTimer->timeout, eDVBResourceManager::releaseCachedChannel);
 }
 
 }
 
+void eDVBResourceManager::feStateChanged()
+{
+       int mask=0;
+       for (eSmartPtrList<eDVBRegisteredFrontend>::iterator i(m_frontend.begin()); i != m_frontend.end(); ++i)
+               if (i->m_inuse)
+                       mask |= ( 1 << i->m_frontend->getSlotID() );
+       /* emit */ frontendUseMaskChanged(mask);
+}
 
 DEFINE_REF(eDVBAdapterLinux);
 eDVBAdapterLinux::eDVBAdapterLinux(int nr): m_nr(nr)
 
 DEFINE_REF(eDVBAdapterLinux);
 eDVBAdapterLinux::eDVBAdapterLinux(int nr): m_nr(nr)
@@ -89,10 +118,18 @@ eDVBAdapterLinux::eDVBAdapterLinux(int nr): m_nr(nr)
                        break;
                ePtr<eDVBFrontend> fe;
 
                        break;
                ePtr<eDVBFrontend> fe;
 
-               int ok = 0;
-               fe = new eDVBFrontend(m_nr, num_fe, ok);
-               if (ok)
-                       m_frontend.push_back(fe);
+               {
+                       int ok = 0;
+                       fe = new eDVBFrontend(m_nr, num_fe, ok);
+                       if (ok)
+                               m_frontend.push_back(fe);
+               }
+               {
+                       int ok = 0;
+                       fe = new eDVBFrontend(m_nr, num_fe, ok, true);
+                       if (ok)
+                               m_simulate_frontend.push_back(fe);
+               }
                ++num_fe;
        }
        
                ++num_fe;
        }
        
@@ -145,9 +182,9 @@ int eDVBAdapterLinux::getNumFrontends()
        return m_frontend.size();
 }
 
        return m_frontend.size();
 }
 
-RESULT eDVBAdapterLinux::getFrontend(ePtr<eDVBFrontend> &fe, int nr)
+RESULT eDVBAdapterLinux::getFrontend(ePtr<eDVBFrontend> &fe, int nr, bool simulate)
 {
 {
-       eSmartPtrList<eDVBFrontend>::iterator i(m_frontend.begin());
+       eSmartPtrList<eDVBFrontend>::iterator i(simulate ? m_simulate_frontend.begin() : m_frontend.begin());
        while (nr && (i != m_frontend.end()))
        {
                --nr;
        while (nr && (i != m_frontend.end()))
        {
                --nr;
@@ -197,56 +234,183 @@ void eDVBResourceManager::addAdapter(iDVBAdapter *adapter)
                        m_demux.push_back(new eDVBRegisteredDemux(demux, adapter));
        }
 
                        m_demux.push_back(new eDVBRegisteredDemux(demux, adapter));
        }
 
+       ePtr<eDVBRegisteredFrontend> prev_dvbt_frontend;
        for (i=0; i<num_fe; ++i)
        {
                ePtr<eDVBFrontend> frontend;
        for (i=0; i<num_fe; ++i)
        {
                ePtr<eDVBFrontend> frontend;
-
                if (!adapter->getFrontend(frontend, i))
                {
                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);
                        frontend->setSEC(m_sec);
-                       m_frontend.push_back(new eDVBRegisteredFrontend(frontend, adapter));
+                       // 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, (long)new_fe);
+                                       frontend->setData(eDVBFrontend::LINKED_PREV_PTR, (long)&(*prev_dvbt_frontend));
+                               }
+                               prev_dvbt_frontend = new_fe;
+                       }
                }
        }
                }
        }
+
+       prev_dvbt_frontend = 0;
+       for (i=0; i<num_fe; ++i)
+       {
+               ePtr<eDVBFrontend> frontend;
+               if (!adapter->getFrontend(frontend, i, true))
+               {
+                       int frontendType=0;
+                       frontend->getFrontendType(frontendType);
+                       eDVBRegisteredFrontend *new_fe = new eDVBRegisteredFrontend(frontend, adapter);
+//                     CONNECT(new_fe->stateChanged, eDVBResourceManager::feStateChanged);
+                       m_simulate_frontend.push_back(new_fe);
+                       frontend->setSEC(m_sec);
+                       // 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, (long)new_fe);
+                                       frontend->setData(eDVBFrontend::LINKED_PREV_PTR, (long)&(*prev_dvbt_frontend));
+                               }
+                               prev_dvbt_frontend = new_fe;
+                       }
+               }
+       }
+
+}
+
+PyObject *eDVBResourceManager::setFrontendSlotInformations(ePyObject list)
+{
+       if (!PyList_Check(list))
+       {
+               PyErr_SetString(PyExc_StandardError, "eDVBResourceManager::setFrontendSlotInformations argument should be a python list");
+               return NULL;
+       }
+       if ((unsigned int)PyList_Size(list) != m_frontend.size())
+       {
+               char blasel[256];
+               sprintf(blasel, "eDVBResourceManager::setFrontendSlotInformations list size incorrect %d frontends avail, but %d entries in slotlist",
+                       m_frontend.size(), PyList_Size(list));
+               PyErr_SetString(PyExc_StandardError, blasel);
+               return NULL;
+       }
+       int pos=0;
+       for (eSmartPtrList<eDVBRegisteredFrontend>::iterator i(m_frontend.begin()); i != m_frontend.end(); ++i)
+       {
+               ePyObject obj = PyList_GET_ITEM(list, pos++);
+               if (!i->m_frontend->setSlotInfo(obj))
+                       return NULL;
+       }
+       pos=0;
+       for (eSmartPtrList<eDVBRegisteredFrontend>::iterator i(m_simulate_frontend.begin()); i != m_simulate_frontend.end(); ++i)
+       {
+               ePyObject obj = PyList_GET_ITEM(list, pos++);
+               if (!i->m_frontend->setSlotInfo(obj))
+                       return NULL;
+       }
+       Py_RETURN_NONE;
 }
 
 }
 
-RESULT eDVBResourceManager::allocateFrontend(ePtr<eDVBAllocatedFrontend> &fe, ePtr<iDVBFrontendParameters> &feparm)
+RESULT eDVBResourceManager::allocateFrontend(ePtr<eDVBAllocatedFrontend> &fe, ePtr<iDVBFrontendParameters> &feparm, bool simulate)
 {
 {
+       eSmartPtrList<eDVBRegisteredFrontend> &frontends = simulate ? m_simulate_frontend : m_frontend;
        ePtr<eDVBRegisteredFrontend> best;
        int bestval = 0;
        ePtr<eDVBRegisteredFrontend> best;
        int bestval = 0;
+       int foundone = 0;
+
+       for (eSmartPtrList<eDVBRegisteredFrontend>::iterator i(frontends.begin()); i != frontends.end(); ++i)
+       {
+               int c = i->m_frontend->isCompatibleWith(feparm);
+
+               if (c)  /* if we have at least one frontend which is compatible with the source, flag this. */
+                       foundone = 1;
 
 
-       for (eSmartPtrList<eDVBRegisteredFrontend>::iterator i(m_frontend.begin()); i != m_frontend.end(); ++i)
                if (!i->m_inuse)
                {
                if (!i->m_inuse)
                {
-                       int c = i->m_frontend->isCompatibleWith(feparm);
+//                     eDebug("Slot %d, score %d", i->m_frontend->getSlotID(), c);
                        if (c > bestval)
                        {
                                bestval = c;
                                best = i;
                        }
                }
                        if (c > bestval)
                        {
                                bestval = c;
                                best = i;
                        }
                }
+//             else
+//                     eDebug("Slot %d, score %d... but BUSY!!!!!!!!!!!", i->m_frontend->getSlotID(), c);
+       }
 
        if (best)
        {
                fe = new eDVBAllocatedFrontend(best);
                return 0;
        }
 
        if (best)
        {
                fe = new eDVBAllocatedFrontend(best);
                return 0;
        }
-       
+
        fe = 0;
        fe = 0;
-       
-       return -1;
+
+       if (foundone)
+               return errAllSourcesBusy;
+       else
+               return errNoSourceFound;
 }
 
 }
 
-RESULT eDVBResourceManager::allocateFrontendByIndex(ePtr<eDVBAllocatedFrontend> &fe, int nr)
+RESULT eDVBResourceManager::allocateFrontendByIndex(ePtr<eDVBAllocatedFrontend> &fe, int slot_index)
 {
 {
-       for (eSmartPtrList<eDVBRegisteredFrontend>::iterator i(m_frontend.begin()); i != m_frontend.end(); ++i, --nr)
-               if ((!nr) && !i->m_inuse)
+       int err = errNoSourceFound;
+       for (eSmartPtrList<eDVBRegisteredFrontend>::iterator i(m_frontend.begin()); i != m_frontend.end(); ++i)
+               if (!i->m_inuse && i->m_frontend->getSlotID() == slot_index)
                {
                {
+                       // check if another slot linked to this is in use
+                       long tmp;
+                       i->m_frontend->getData(eDVBFrontend::SATPOS_DEPENDS_PTR, tmp);
+                       if ( tmp != -1 )
+                       {
+                               eDVBRegisteredFrontend *satpos_depends_to_fe = (eDVBRegisteredFrontend *)tmp;
+                               if (satpos_depends_to_fe->m_inuse)
+                               {
+                                       eDebug("another satpos depending frontend is in use.. so allocateFrontendByIndex not possible!");
+                                       err = errAllSourcesBusy;
+                                       goto alloc_fe_by_id_not_possible;
+                               }
+                       }
+                       else // check linked tuners
+                       {
+                               i->m_frontend->getData(eDVBFrontend::LINKED_NEXT_PTR, tmp);
+                               while ( tmp != -1 )
+                               {
+                                       eDVBRegisteredFrontend *next = (eDVBRegisteredFrontend *) tmp;
+                                       if (next->m_inuse)
+                                       {
+                                               eDebug("another linked frontend is in use.. so allocateFrontendByIndex not possible!");
+                                               err = errAllSourcesBusy;
+                                               goto alloc_fe_by_id_not_possible;
+                                       }
+                                       next->m_frontend->getData(eDVBFrontend::LINKED_NEXT_PTR, tmp);
+                               }
+                               i->m_frontend->getData(eDVBFrontend::LINKED_PREV_PTR, tmp);
+                               while ( tmp != -1 )
+                               {
+                                       eDVBRegisteredFrontend *prev = (eDVBRegisteredFrontend *) tmp;
+                                       if (prev->m_inuse)
+                                       {
+                                               eDebug("another linked frontend is in use.. so allocateFrontendByIndex not possible!");
+                                               err = errAllSourcesBusy;
+                                               goto alloc_fe_by_id_not_possible;
+                                       }
+                                       prev->m_frontend->getData(eDVBFrontend::LINKED_PREV_PTR, tmp);
+                               }
+                       }
                        fe = new eDVBAllocatedFrontend(i);
                        return 0;
                }
                        fe = new eDVBAllocatedFrontend(i);
                        return 0;
                }
-       
+alloc_fe_by_id_not_possible:
        fe = 0;
        fe = 0;
-       return -1;
+       return err;
 }
 
 RESULT eDVBResourceManager::allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBAllocatedDemux> &demux, int cap)
 }
 
 RESULT eDVBResourceManager::allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBAllocatedDemux> &demux, int cap)
@@ -256,28 +420,80 @@ RESULT eDVBResourceManager::allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBA
 
        eDebug("allocate demux");
        eSmartPtrList<eDVBRegisteredDemux>::iterator i(m_demux.begin());
 
        eDebug("allocate demux");
        eSmartPtrList<eDVBRegisteredDemux>::iterator i(m_demux.begin());
-       
+
+       int n=0;
+
        if (i == m_demux.end())
                return -1;
        if (i == m_demux.end())
                return -1;
-               
-       int n=0;
-               /* FIXME: hardware demux policy */
-       if (!(cap & iDVBChannel::capDecode))
-               ++i, ++n;
        
        
-       for (; i != m_demux.end(); ++i, ++n)
-               if ((!i->m_inuse) && ((!fe) || (i->m_adapter == fe->m_adapter)))
+       ePtr<eDVBRegisteredDemux> unused;
+       
+       if (m_demux.size() < 5)
+       {
+               /* FIXME: hardware demux policy */
+               if (!(cap & iDVBChannel::capDecode))
+               {
+                       if (m_demux.size() > 2)  /* assumed to be true, otherwise we have lost anyway */
+                       {
+                               ++i, ++n;
+                               ++i, ++n;
+                       }
+               }
+
+               for (; i != m_demux.end(); ++i, ++n)
+               {
+                       int is_decode = n < 2;
+               
+                       int in_use = is_decode ? (i->m_demux->getRefCount() != 2) : i->m_inuse;
+               
+                       if ((!in_use) && ((!fe) || (i->m_adapter == fe->m_adapter)))
+                       {
+                               if ((cap & iDVBChannel::capDecode) && !is_decode)
+                                       continue;
+                               unused = i;     
+                               break;
+                       }
+               }
+       }
+       else // we asume dm8000
+       {
+               for (; i != m_demux.end(); ++i, ++n)
                {
                {
-                       if ((cap & iDVBChannel::capDecode) && n)
-                               continue;
-                       
-                       demux = new eDVBAllocatedDemux(i);
                        if (fe)
                        if (fe)
-                               demux->get().setSourceFrontend(fe->m_frontend->getID());
-                       else
-                               demux->get().setSourcePVR(0);
-                       return 0;
+                       {
+                               if (!i->m_inuse)
+                               {
+                                       if (!unused)
+                                               unused = i;
+                               }
+                               else if (i->m_adapter == fe->m_adapter && 
+                                   i->m_demux->getSource() == fe->m_frontend->getDVBID())
+                               {
+                                       demux = new eDVBAllocatedDemux(i);
+                                       return 0;
+                               }
+                       }
+                       else if (n == 4) // always use demux4 for PVR (demux 4 can not descramble...)
+                       {
+                               if (i->m_inuse) {
+                                       demux = new eDVBAllocatedDemux(i);
+                                       return 0;
+                               }
+                               unused = i;
+                       }
                }
                }
+       }
+
+       if (unused)
+       {
+               demux = new eDVBAllocatedDemux(unused);
+               if (fe)
+                       demux->get().setSourceFrontend(fe->m_frontend->getDVBID());
+               else
+                       demux->get().setSourcePVR(0);
+               return 0;
+       }
+
        eDebug("demux not found");
        return -1;
 }
        eDebug("demux not found");
        return -1;
 }
@@ -297,11 +513,24 @@ RESULT eDVBResourceManager::getChannelList(ePtr<iDVBChannelList> &list)
                return -ENOENT;
 }
 
                return -ENOENT;
 }
 
-RESULT eDVBResourceManager::allocateChannel(const eDVBChannelID &channelid, eUsePtr<iDVBChannel> &channel)
+#define eDebugNoSimulate(x...) \
+       do { \
+               if (!simulate) \
+                       eDebug(x); \
+       } while(0)
+//             else \
+//             { \
+//                     eDebugNoNewLine("SIMULATE:"); \
+//                     eDebug(x); \
+//             } \
+
+
+RESULT eDVBResourceManager::allocateChannel(const eDVBChannelID &channelid, eUsePtr<iDVBChannel> &channel, bool simulate)
 {
                /* first, check if a channel is already existing. */
 {
                /* first, check if a channel is already existing. */
+       std::list<active_channel> &active_channels = simulate ? m_active_simulate_channels : m_active_channels;
 
 
-       if (m_cached_channel)
+       if (!simulate && m_cached_channel)
        {
                eDVBChannel *cache_chan = (eDVBChannel*)&(*m_cached_channel);
                if(channelid==cache_chan->getChannelID())
        {
                eDVBChannel *cache_chan = (eDVBChannel*)&(*m_cached_channel);
                if(channelid==cache_chan->getChannelID())
@@ -310,46 +539,48 @@ RESULT eDVBResourceManager::allocateChannel(const eDVBChannelID &channelid, eUse
                        channel = m_cached_channel;
                        return 0;
                }
                        channel = m_cached_channel;
                        return 0;
                }
+               m_cached_channel_state_changed_conn.disconnect();
                m_cached_channel=0;
                m_cached_channel=0;
+               m_releaseCachedChannelTimer->stop();
        }
 
        }
 
-//     eDebug("allocate channel.. %04x:%04x", channelid.transport_stream_id.get(), channelid.original_network_id.get());
-       for (std::list<active_channel>::iterator i(m_active_channels.begin()); i != m_active_channels.end(); ++i)
+       eDebugNoSimulate("allocate channel.. %04x:%04x", channelid.transport_stream_id.get(), channelid.original_network_id.get());
+       for (std::list<active_channel>::iterator i(active_channels.begin()); i != active_channels.end(); ++i)
        {
        {
-//             eDebug("available channel.. %04x:%04x", i->m_channel_id.transport_stream_id.get(), i->m_channel_id.original_network_id.get());
+               eDebugNoSimulate("available channel.. %04x:%04x", i->m_channel_id.transport_stream_id.get(), i->m_channel_id.original_network_id.get());
                if (i->m_channel_id == channelid)
                {
                if (i->m_channel_id == channelid)
                {
-//                     eDebug("found shared channel..");
+                       eDebugNoSimulate("found shared channel..");
                        channel = i->m_channel;
                        return 0;
                }
        }
                        channel = i->m_channel;
                        return 0;
                }
        }
-       
+
        /* no currently available channel is tuned to this channelid. create a new one, if possible. */
 
        if (!m_list)
        {
        /* 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;
+               eDebugNoSimulate("no channel list set!");
+               return errNoChannelList;
        }
 
        ePtr<iDVBFrontendParameters> feparm;
        if (m_list->getChannelFrontendData(channelid, feparm))
        {
        }
 
        ePtr<iDVBFrontendParameters> feparm;
        if (m_list->getChannelFrontendData(channelid, feparm))
        {
-               eDebug("channel not found!");
-               return -ENOENT;
+               eDebugNoSimulate("channel not found!");
+               return errChannelNotInList;
        }
 
        /* allocate a frontend. */
        
        ePtr<eDVBAllocatedFrontend> fe;
        }
 
        /* allocate a frontend. */
        
        ePtr<eDVBAllocatedFrontend> fe;
-       
-       if (allocateFrontend(fe, feparm))
-               return errNoFrontend;
+
+       int err = allocateFrontend(fe, feparm, simulate);
+       if (err)
+               return err;
 
        RESULT res;
 
        RESULT res;
-       ePtr<eDVBChannel> ch;
-       ch = new eDVBChannel(this, fe);
+       ePtr<eDVBChannel> ch = new eDVBChannel(this, fe);
 
        res = ch->setChannel(channelid, feparm);
        if (res)
 
        res = ch->setChannel(channelid, feparm);
        if (res)
@@ -357,8 +588,15 @@ RESULT eDVBResourceManager::allocateChannel(const eDVBChannelID &channelid, eUse
                channel = 0;
                return errChidNotFound;
        }
                channel = 0;
                return errChidNotFound;
        }
-       m_cached_channel = channel = ch;
-       CONNECT(ch->m_stateChanged,eDVBResourceManager::DVBChannelStateChanged);
+
+       if (simulate)
+               channel = ch;
+       else
+       {
+               m_cached_channel = channel = ch;
+               m_cached_channel_state_changed_conn =
+                       CONNECT(ch->m_stateChanged,eDVBResourceManager::DVBChannelStateChanged);
+       }
 
        return 0;
 }
 
        return 0;
 }
@@ -373,13 +611,13 @@ void eDVBResourceManager::DVBChannelStateChanged(iDVBChannel *chan)
                case iDVBChannel::state_ok:
                {
                        eDebug("stop release channel timer");
                case iDVBChannel::state_ok:
                {
                        eDebug("stop release channel timer");
-                       m_releaseCachedChannelTimer.stop();
+                       m_releaseCachedChannelTimer->stop();
                        break;
                }
                case iDVBChannel::state_last_instance:
                {
                        eDebug("start release channel timer");
                        break;
                }
                case iDVBChannel::state_last_instance:
                {
                        eDebug("start release channel timer");
-                       m_releaseCachedChannelTimer.start(3000, true);
+                       m_releaseCachedChannelTimer->start(3000, true);
                        break;
                }
                default: // ignore all other events
                        break;
                }
                default: // ignore all other events
@@ -389,24 +627,26 @@ void eDVBResourceManager::DVBChannelStateChanged(iDVBChannel *chan)
 
 void eDVBResourceManager::releaseCachedChannel()
 {
 
 void eDVBResourceManager::releaseCachedChannel()
 {
-       eDebug("release cached channel");
+       eDebug("release cached channel (timer timeout)");
        m_cached_channel=0;
 }
 
        m_cached_channel=0;
 }
 
-RESULT eDVBResourceManager::allocateRawChannel(eUsePtr<iDVBChannel> &channel, int frontend_index)
+RESULT eDVBResourceManager::allocateRawChannel(eUsePtr<iDVBChannel> &channel, int slot_index)
 {
        ePtr<eDVBAllocatedFrontend> fe;
 
        if (m_cached_channel)
 {
        ePtr<eDVBAllocatedFrontend> fe;
 
        if (m_cached_channel)
+       {
+               m_cached_channel_state_changed_conn.disconnect();
                m_cached_channel=0;
                m_cached_channel=0;
+               m_releaseCachedChannelTimer->stop();
+       }
 
 
-       if (allocateFrontendByIndex(fe, frontend_index))
-               return errNoFrontend;
-       
-       eDVBChannel *ch;
-       ch = new eDVBChannel(this, fe);
+       int err = allocateFrontendByIndex(fe, slot_index);
+       if (err)
+               return err;
 
 
-       channel = ch;
+       channel = new eDVBChannel(this, fe);
        return 0;
 }
 
        return 0;
 }
 
@@ -415,38 +655,55 @@ RESULT eDVBResourceManager::allocatePVRChannel(eUsePtr<iDVBPVRChannel> &channel)
 {
        ePtr<eDVBAllocatedDemux> demux;
 
 {
        ePtr<eDVBAllocatedDemux> demux;
 
-       if (m_cached_channel)
+       if (m_cached_channel && m_releaseCachedChannelTimer->isActive())
+       {
+               m_cached_channel_state_changed_conn.disconnect();
                m_cached_channel=0;
                m_cached_channel=0;
+               m_releaseCachedChannelTimer->stop();
+       }
 
 
-       eDVBChannel *ch;
-       ch = new eDVBChannel(this, 0);
-       
-       channel = ch;
+       channel = new eDVBChannel(this, 0);
        return 0;
 }
 
 RESULT eDVBResourceManager::addChannel(const eDVBChannelID &chid, eDVBChannel *ch)
 {
        return 0;
 }
 
 RESULT eDVBResourceManager::addChannel(const eDVBChannelID &chid, eDVBChannel *ch)
 {
-       m_active_channels.push_back(active_channel(chid, ch));
-       /* emit */ m_channelAdded(ch);
+       ePtr<iDVBFrontend> fe;
+       if (!ch->getFrontend(fe))
+       {
+               eDVBFrontend *frontend = (eDVBFrontend*)&(*fe);
+               if (frontend->is_simulate())
+                       m_active_simulate_channels.push_back(active_channel(chid, ch));
+               else
+               {
+                       m_active_channels.push_back(active_channel(chid, ch));
+                       /* emit */ m_channelAdded(ch);
+               }
+       }
        return 0;
 }
 
 RESULT eDVBResourceManager::removeChannel(eDVBChannel *ch)
 {
        return 0;
 }
 
 RESULT eDVBResourceManager::removeChannel(eDVBChannel *ch)
 {
-       int cnt = 0;
-       for (std::list<active_channel>::iterator i(m_active_channels.begin()); i != m_active_channels.end();)
+       ePtr<iDVBFrontend> fe;
+       if (!ch->getFrontend(fe))
        {
        {
-               if (i->m_channel == ch)
+               eDVBFrontend *frontend = (eDVBFrontend*)&(*fe);
+               std::list<active_channel> &active_channels = frontend->is_simulate() ? m_active_simulate_channels : m_active_channels;
+               int cnt = 0;
+               for (std::list<active_channel>::iterator i(active_channels.begin()); i != active_channels.end();)
                {
                {
-                       i = m_active_channels.erase(i);
-                       ++cnt;
-               } else
-                       ++i;
+                       if (i->m_channel == ch)
+                       {
+                               i = active_channels.erase(i);
+                               ++cnt;
+                       } else
+                               ++i;
+               }
+               ASSERT(cnt == 1);
+               if (cnt == 1)
+                       return 0;
        }
        }
-       ASSERT(cnt == 1);
-       if (cnt == 1)
-               return 0;
        return -ENOENT;
 }
 
        return -ENOENT;
 }
 
@@ -456,59 +713,92 @@ RESULT eDVBResourceManager::connectChannelAdded(const Slot1<void,eDVBChannel*> &
        return 0;
 }
 
        return 0;
 }
 
-bool eDVBResourceManager::canAllocateFrontend(ePtr<iDVBFrontendParameters> &feparm)
+int eDVBResourceManager::canAllocateFrontend(ePtr<iDVBFrontendParameters> &feparm, bool simulate)
 {
 {
+       eSmartPtrList<eDVBRegisteredFrontend> &frontends = simulate ? m_simulate_frontend : m_frontend;
        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)
+       for (eSmartPtrList<eDVBRegisteredFrontend>::iterator i(frontends.begin()); i != frontends.end(); ++i)
                if (!i->m_inuse)
                {
                        int c = i->m_frontend->isCompatibleWith(feparm);
                        if (c > bestval)
                                bestval = c;
                }
                if (!i->m_inuse)
                {
                        int c = i->m_frontend->isCompatibleWith(feparm);
                        if (c > bestval)
                                bestval = c;
                }
+       return bestval;
+}
 
 
-       return bestval>0;
+int tuner_type_channel_default(ePtr<iDVBChannelList> &channellist, const eDVBChannelID &chid)
+{
+       if (channellist)
+       {
+               ePtr<iDVBFrontendParameters> feparm;
+               if (!channellist->getChannelFrontendData(chid, feparm))
+               {
+                       int system;
+                       if (!feparm->getSystem(system))
+                       {
+                               switch(system)
+                               {
+                                       case iDVBFrontend::feSatellite:
+                                               return 50000;
+                                       case iDVBFrontend::feCable:
+                                               return 40000;
+                                       case iDVBFrontend::feTerrestrial:
+                                               return 30000;
+                                       default:
+                                               break;
+                               }
+                       }
+               }
+       }
+       return 0;
 }
 
 }
 
-bool eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid, const eDVBChannelID& ignore)
+int eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid, const eDVBChannelID& ignore, bool simulate)
 {
 {
-       bool ret=true;
-       if (m_cached_channel)
+       std::list<active_channel> &active_channels = simulate ? m_active_simulate_channels : m_active_channels;
+       int ret=0;
+       if (!simulate && m_cached_channel)
        {
                eDVBChannel *cache_chan = (eDVBChannel*)&(*m_cached_channel);
                if(channelid==cache_chan->getChannelID())
        {
                eDVBChannel *cache_chan = (eDVBChannel*)&(*m_cached_channel);
                if(channelid==cache_chan->getChannelID())
-                       return ret;
+                       return tuner_type_channel_default(m_list, channelid);
        }
 
                /* first, check if a channel is already existing. */
 //     eDebug("allocate channel.. %04x:%04x", channelid.transport_stream_id.get(), channelid.original_network_id.get());
        }
 
                /* first, check if a channel is already existing. */
 //     eDebug("allocate channel.. %04x:%04x", channelid.transport_stream_id.get(), channelid.original_network_id.get());
-       for (std::list<active_channel>::iterator i(m_active_channels.begin()); i != m_active_channels.end(); ++i)
+       for (std::list<active_channel>::iterator i(active_channels.begin()); i != active_channels.end(); ++i)
        {
 //             eDebug("available channel.. %04x:%04x", i->m_channel_id.transport_stream_id.get(), i->m_channel_id.original_network_id.get());
                if (i->m_channel_id == channelid)
                {
 //                     eDebug("found shared channel..");
        {
 //             eDebug("available channel.. %04x:%04x", i->m_channel_id.transport_stream_id.get(), i->m_channel_id.original_network_id.get());
                if (i->m_channel_id == channelid)
                {
 //                     eDebug("found shared channel..");
-                       return ret;
+                       return tuner_type_channel_default(m_list, channelid);
                }
        }
 
        int *decremented_cached_channel_fe_usecount=NULL,
                *decremented_fe_usecount=NULL;
 
                }
        }
 
        int *decremented_cached_channel_fe_usecount=NULL,
                *decremented_fe_usecount=NULL;
 
-       for (std::list<active_channel>::iterator i(m_active_channels.begin()); i != m_active_channels.end(); ++i)
+       for (std::list<active_channel>::iterator i(active_channels.begin()); i != active_channels.end(); ++i)
        {
        {
+               eSmartPtrList<eDVBRegisteredFrontend> &frontends = simulate ? m_simulate_frontend : m_frontend;
 //             eDebug("available channel.. %04x:%04x", i->m_channel_id.transport_stream_id.get(), i->m_channel_id.original_network_id.get());
                if (i->m_channel_id == ignore)
                {
                        eDVBChannel *channel = (eDVBChannel*) &(*i->m_channel);
 //             eDebug("available channel.. %04x:%04x", i->m_channel_id.transport_stream_id.get(), i->m_channel_id.original_network_id.get());
                if (i->m_channel_id == ignore)
                {
                        eDVBChannel *channel = (eDVBChannel*) &(*i->m_channel);
-                       if (channel == &(*m_cached_channel) ? channel->getUseCount() == 2 : channel->getUseCount() == 1)  // channel only used once..
+                       // one eUsePtr<iDVBChannel> is used in eDVBServicePMTHandler
+                       // another on eUsePtr<iDVBChannel> is used in the eDVBScan instance used in eDVBServicePMTHandler (for SDT scan)
+                       // so we must check here if usecount is 3 (when the channel is equal to the cached channel)
+                       // or 2 when the cached channel is not equal to the compared channel
+                       if (channel == &(*m_cached_channel) ? channel->getUseCount() == 3 : channel->getUseCount() == 2)  // channel only used once..
                        {
                                ePtr<iDVBFrontend> fe;
                                if (!i->m_channel->getFrontend(fe))
                                {
                        {
                                ePtr<iDVBFrontend> fe;
                                if (!i->m_channel->getFrontend(fe))
                                {
-                                       for (eSmartPtrList<eDVBRegisteredFrontend>::iterator ii(m_frontend.begin()); ii != m_frontend.end(); ++ii)
+                                       for (eSmartPtrList<eDVBRegisteredFrontend>::iterator ii(frontends.begin()); ii != frontends.end(); ++ii)
                                        {
                                                if ( &(*fe) == &(*ii->m_frontend) )
                                                {
                                        {
                                                if ( &(*fe) == &(*ii->m_frontend) )
                                                {
@@ -535,7 +825,8 @@ bool eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid, con
                                ePtr<iDVBFrontend> fe;
                                if (!channel->getFrontend(fe))
                                {
                                ePtr<iDVBFrontend> fe;
                                if (!channel->getFrontend(fe))
                                {
-                                       for (eSmartPtrList<eDVBRegisteredFrontend>::iterator ii(m_frontend.begin()); ii != m_frontend.end(); ++ii)
+                                       eSmartPtrList<eDVBRegisteredFrontend> &frontends = simulate ? m_simulate_frontend : m_frontend;
+                                       for (eSmartPtrList<eDVBRegisteredFrontend>::iterator ii(frontends.begin()); ii != frontends.end(); ++ii)
                                        {
                                                if ( &(*fe) == &(*ii->m_frontend) )
                                                {
                                        {
                                                if ( &(*fe) == &(*ii->m_frontend) )
                                                {
@@ -556,18 +847,16 @@ bool eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid, con
        if (!m_list)
        {
                eDebug("no channel list set!");
        if (!m_list)
        {
                eDebug("no channel list set!");
-               ret = false;
                goto error;
        }
 
        if (m_list->getChannelFrontendData(channelid, feparm))
        {
                eDebug("channel not found!");
                goto error;
        }
 
        if (m_list->getChannelFrontendData(channelid, feparm))
        {
                eDebug("channel not found!");
-               ret = false;
                goto error;
        }
 
                goto error;
        }
 
-       ret = canAllocateFrontend(feparm);
+       ret = canAllocateFrontend(feparm, simulate);
 
 error:
        if (decremented_fe_usecount)
 
 error:
        if (decremented_fe_usecount)
@@ -578,6 +867,205 @@ error:
        return ret;
 }
 
        return ret;
 }
 
+bool eDVBResourceManager::canMeasureFrontendInputPower()
+{
+       for (eSmartPtrList<eDVBRegisteredFrontend>::iterator i(m_frontend.begin()); i != m_frontend.end(); ++i)
+       {
+               return i->m_frontend->readInputpower() >= 0;
+       }
+       return false;
+}
+
+class eDVBChannelFilePush: public eFilePushThread
+{
+public:
+       eDVBChannelFilePush() { setIFrameSearch(0); setTimebaseChange(0); }
+       void setIFrameSearch(int enabled) { m_iframe_search = enabled; m_iframe_state = 0; }
+
+                       /* "timebase change" is for doing trickmode playback at an exact speed, even when pictures are skipped. */
+                       /* you need to set it to 1/16 if you want 16x playback, for example. you need video master sync. */
+       void setTimebaseChange(int ratio) { m_timebase_change = ratio; } /* 16bit fixpoint, 0 for disable */
+protected:
+       int m_iframe_search, m_iframe_state, m_pid;
+       int m_timebase_change;
+       int filterRecordData(const unsigned char *data, int len, size_t &current_span_remaining);
+};
+
+int eDVBChannelFilePush::filterRecordData(const unsigned char *_data, int len, size_t &current_span_remaining)
+{
+#if 0
+       if (m_timebase_change)
+       {
+               eDebug("timebase change: %d", m_timebase_change);
+               int offset;
+               for (offset = 0; offset < len; offset += 188)
+               {
+                       unsigned char *pkt = (unsigned char*)_data + offset;
+                       if (pkt[1] & 0x40) /* pusi */
+                       {
+                               if (pkt[3] & 0x20) // adaption field present?
+                                       pkt += pkt[4] + 4 + 1;  /* skip adaption field and header */
+                               else
+                                       pkt += 4; /* skip header */
+                               if (pkt[0] || pkt[1] || (pkt[2] != 1))
+                               {
+                                       eWarning("broken startcode");
+                                       continue;
+                               }
+
+                               pts_t pts = 0;
+
+                               if (pkt[7] & 0x80) // PTS present?
+                               {
+                                       pts  = ((unsigned long long)(pkt[ 9]&0xE))  << 29;
+                                       pts |= ((unsigned long long)(pkt[10]&0xFF)) << 22;
+                                       pts |= ((unsigned long long)(pkt[11]&0xFE)) << 14;
+                                       pts |= ((unsigned long long)(pkt[12]&0xFF)) << 7;
+                                       pts |= ((unsigned long long)(pkt[13]&0xFE)) >> 1;
+
+#if 0
+                                       off_t off = 0;
+                                       RESULT r = m_tstools.fixupPTS(off, pts);
+                                       if (r)
+                                               eWarning("fixup PTS while trickmode playback failed.\n");
+#endif
+
+                                       int sec = pts / 90000;
+                                       int frm = pts % 90000;
+                                       int min = sec / 60;
+                                       sec %= 60;
+                                       int hr = min / 60;
+                                       min %= 60;
+                                       int d = hr / 24;
+                                       hr %= 24;
+
+//                                     eDebug("original, fixed pts: %016llx %d:%02d:%02d:%02d:%05d", pts, d, hr, min, sec, frm);
+
+                                       pts += 0x80000000LL;
+                                       pts *= m_timebase_change;
+                                       pts >>= 16;
+
+                                       sec = pts / 90000;
+                                       frm = pts % 90000;
+                                       min = sec / 60;
+                                       sec %= 60;
+                                       hr = min / 60;
+                                       min %= 60;
+                                       d = hr / 24;
+                                       hr %= 24;
+
+//                                     eDebug("new pts (after timebase change): %016llx %d:%02d:%02d:%02d:%05d", pts, d, hr, min, sec, frm);
+
+                                       pkt[9] &= ~0xE;
+                                       pkt[10] = 0;
+                                       pkt[11] &= ~1;
+                                       pkt[12] = 0;
+                                       pkt[13] &= ~1;
+
+                                       pkt[9]  |= (pts >> 29) & 0xE;
+                                       pkt[10] |= (pts >> 22) & 0xFF;
+                                       pkt[11] |= (pts >> 14) & 0xFE;
+                                       pkt[12] |= (pts >> 7) & 0xFF;
+                                       pkt[13] |= (pts << 1) & 0xFE;
+                               }
+                       }
+               }
+       }
+#endif
+
+#if 1 /* not yet */
+       if (!m_iframe_search)
+               return len;
+
+       unsigned char *data = (unsigned char*)_data; /* remove that const. we know what we are doing. */
+
+//     eDebug("filterRecordData, size=%d (mod 188=%d), first byte is %02x", len, len %188, data[0]);
+
+       unsigned char *d = data;
+       while ((d = (unsigned char*)memmem(d, data + len - d, "\x00\x00\x01", 3)))
+       {
+               int offset = d - data;
+               int ts_offset = offset - offset % 188; /* offset to the start of TS packet */
+               unsigned char *ts = data + ts_offset;
+               int pid = ((ts[1] << 8) | ts[2]) & 0x1FFF;
+
+               if ((d[3] == 0 || d[3] == 0x09 && d[-1] == 0 && (ts[1] & 0x40)) && (m_pid == pid))  /* picture start */
+               {
+                       int picture_type = (d[3]==0 ? (d[5] >> 3) & 7 : (d[4] >> 5) + 1);
+                       d += 4;
+
+//                     eDebug("%d-frame at %d, offset in TS packet: %d, pid=%04x", picture_type, offset, offset % 188, pid);
+
+                       if (m_iframe_state == 1)
+                       {
+                                       /* we are allowing data, and stop allowing data on the next frame. 
+                                          we now found a frame. so stop here. */
+                               memset(data + offset, 0, 188 - (offset%188)); /* zero out rest of TS packet */
+                               current_span_remaining = 0;
+                               m_iframe_state = 0;
+                               unsigned char *fts = ts + 188;
+                               while (fts < (data + len))
+                               {
+                                       fts[1] |= 0x1f;
+                                       fts[2] |= 0xff; /* drop packet */
+                                       fts += 188;
+                               }
+
+                               return len; // ts_offset + 188; /* deliver this packet, but not more. */
+                       } else
+                       {
+                               if (picture_type != 1) /* we are only interested in I frames */
+                                       continue;
+
+                               unsigned char *fts = data;
+                               while (fts < ts)
+                               {
+                                       fts[1] |= 0x1f;
+                                       fts[2] |= 0xff; /* drop packet */
+
+                                       fts += 188;
+                               }
+                                               /* force payload only */
+                               ts[3] &= ~0x30;
+                               ts[3] |=  0x10;
+
+//                             memset(ts + 4, 0xFF, (offset % 188) - 4);
+
+                               m_iframe_state = 1;
+                       }
+               } else if ((d[3] & 0xF0) == 0xE0) /* video stream */
+               {
+                               /* verify that this is actually a PES header, not just some ES data */
+                       if (ts[1] & 0x40) /* PUSI set */
+                       {
+                               int payload_start = 4;
+                               if (ts[3] & 0x20) /* adaptation field present */
+                                       payload_start += ts[4] + 1; /* skip AF */
+                               if (payload_start == (offset%184)) /* the 00 00 01 should be directly at the payload start, otherwise it's not a PES header */
+                               {
+                                       if (m_pid != pid)
+                                       {
+                                               eDebug("now locked to pid %04x (%02x %02x %02x %02x)", pid, ts[0], ts[1], ts[2], ts[3]);
+                                               m_pid = pid;
+                                       }
+                               }
+                       }
+//                     m_pid = 0x6e;
+                       d += 4;
+               } else
+                       d += 4; /* ignore */
+
+       }
+
+       if (m_iframe_state == 1)
+               return len;
+       else
+               return 0; /* we need find an iframe first */
+#else
+       return len;
+#endif
+}
+
 DEFINE_REF(eDVBChannel);
 
 eDVBChannel::eDVBChannel(eDVBResourceManager *mgr, eDVBAllocatedFrontend *frontend): m_state(state_idle), m_mgr(mgr)
 DEFINE_REF(eDVBChannel);
 
 eDVBChannel::eDVBChannel(eDVBResourceManager *mgr, eDVBAllocatedFrontend *frontend): m_state(state_idle), m_mgr(mgr)
@@ -622,11 +1110,11 @@ void eDVBChannel::frontendStateChanged(iDVBFrontend*fe)
        } else if (state == iDVBFrontend::stateLostLock)
        {
                        /* on managed channels, we try to retune in order to re-acquire lock. */
        } 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;
                {
                        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. */
                {
                } else
                        /* on unmanaged channels, we don't do this. the client will do this. */
                {
@@ -664,6 +1152,9 @@ void eDVBChannel::pvrEvent(int event)
 
 void eDVBChannel::cueSheetEvent(int event)
 {
 
 void eDVBChannel::cueSheetEvent(int event)
 {
+               /* we might end up here if playing failed or stopped, but the client hasn't (yet) noted. */
+       if (!m_pvr_thread)
+               return;
        switch (event)
        {
        case eCueSheet::evtSeek:
        switch (event)
        {
        case eCueSheet::evtSeek:
@@ -673,44 +1164,86 @@ void eDVBChannel::cueSheetEvent(int event)
        case eCueSheet::evtSkipmode:
        {
                {
        case eCueSheet::evtSkipmode:
        {
                {
-                       eSingleLocker l(m_cue->m_lock);
+                       m_cue->m_lock.WrLock();
                        m_cue->m_seek_requests.push_back(std::pair<int, pts_t>(1, 0)); /* resync */
                        m_cue->m_seek_requests.push_back(std::pair<int, pts_t>(1, 0)); /* resync */
+                       m_cue->m_lock.Unlock();
+                       eRdLocker l(m_cue->m_lock);
                        if (m_cue->m_skipmode_ratio)
                        {
                                int bitrate = m_tstools.calcBitrate(); /* in bits/s */
                                eDebug("skipmode ratio is %lld:90000, bitrate is %d bit/s", m_cue->m_skipmode_ratio, bitrate);
                                                /* i agree that this might look a bit like black magic. */
                                m_skipmode_n = 512*1024; /* must be 1 iframe at least. */
                        if (m_cue->m_skipmode_ratio)
                        {
                                int bitrate = m_tstools.calcBitrate(); /* in bits/s */
                                eDebug("skipmode ratio is %lld:90000, bitrate is %d bit/s", m_cue->m_skipmode_ratio, bitrate);
                                                /* i agree that this might look a bit like black magic. */
                                m_skipmode_n = 512*1024; /* must be 1 iframe at least. */
-                               m_skipmode_m = bitrate / 8 / 90000 * m_cue->m_skipmode_ratio;
-       
+                               m_skipmode_m = bitrate / 8 / 90000 * m_cue->m_skipmode_ratio / 8;
+
+                               if (m_cue->m_skipmode_ratio < 0)
+                                       m_skipmode_m -= m_skipmode_n;
+
                                eDebug("resolved to: %d %d", m_skipmode_m, m_skipmode_n);
                                eDebug("resolved to: %d %d", m_skipmode_m, m_skipmode_n);
-                               
+
                                if (abs(m_skipmode_m) < abs(m_skipmode_n))
                                {
                                if (abs(m_skipmode_m) < abs(m_skipmode_n))
                                {
-                                       eFatal("damn, something is wrong with this calculation");
+                                       eWarning("something is wrong with this calculation");
                                        m_skipmode_n = m_skipmode_m = 0;
                                }
                                        m_skipmode_n = m_skipmode_m = 0;
                                }
-                               
                        } else
                        {
                                eDebug("skipmode ratio is 0, normal play");
                                m_skipmode_n = m_skipmode_m = 0;
                        }
                }
                        } else
                        {
                                eDebug("skipmode ratio is 0, normal play");
                                m_skipmode_n = m_skipmode_m = 0;
                        }
                }
+               m_pvr_thread->setIFrameSearch(m_skipmode_n != 0);
+               if (m_cue->m_skipmode_ratio != 0)
+                       m_pvr_thread->setTimebaseChange(0x10000 * 9000 / (m_cue->m_skipmode_ratio / 10)); /* negative values are also ok */
+               else
+                       m_pvr_thread->setTimebaseChange(0); /* normal playback */
+               eDebug("flush pvr");
                flushPVR(m_cue->m_decoding_demux);
                flushPVR(m_cue->m_decoding_demux);
+               eDebug("done");
                break;
        }
        case eCueSheet::evtSpanChanged:
                break;
        }
        case eCueSheet::evtSpanChanged:
-               eDebug("source span translation not yet supported");
-       //      recheckCuesheetSpans();
+       {
+               m_source_span.clear();
+               for (std::list<std::pair<pts_t, pts_t> >::const_iterator i(m_cue->m_spans.begin()); i != m_cue->m_spans.end(); ++i)
+               {
+                       off_t offset_in, offset_out;
+                       pts_t pts_in = i->first, pts_out = i->second;
+                       if (m_tstools.getOffset(offset_in, pts_in, -1) || m_tstools.getOffset(offset_out, pts_out, 1))
+                       {
+                               eDebug("span translation failed.\n");
+                               continue;
+                       }
+                       eDebug("source span: %llx .. %llx, translated to %llx..%llx", pts_in, pts_out, offset_in, offset_out);
+                       m_source_span.push_back(std::pair<off_t, off_t>(offset_in, offset_out));
+               }
                break;
        }
                break;
        }
+       }
+}
+
+       /* align toward zero */
+static inline long long align(long long x, int align)
+{
+       int sign = x < 0;
+
+       if (sign)
+               x = -x;
+
+       x -= x % align;
+
+       if (sign)
+               x = -x;
+
+       return x;
 }
 
        /* remember, this gets called from another thread. */
 void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off_t &start, size_t &size)
 {
 }
 
        /* remember, this gets called from another thread. */
 void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off_t &start, size_t &size)
 {
-       unsigned int max = 10*1024*1024;
+       const int blocksize = 188;
+       unsigned int max = align(10*1024*1024, blocksize);
+       current_offset = align(current_offset, blocksize);
        
        if (!m_cue)
        {
        
        if (!m_cue)
        {
@@ -720,95 +1253,194 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
                return;
        }
 
                return;
        }
 
-       eSingleLocker l(m_cue->m_lock);
-       
+       m_cue->m_lock.RdLock();
        if (!m_cue->m_decoding_demux)
        {
                start = current_offset;
                size = max;
                eDebug("getNextSourceSpan, no decoding demux. forcing normal play");
        if (!m_cue->m_decoding_demux)
        {
                start = current_offset;
                size = max;
                eDebug("getNextSourceSpan, no decoding demux. forcing normal play");
+               m_cue->m_lock.Unlock();
                return;
        }
                return;
        }
-       
+
        if (m_skipmode_n)
        {
                eDebug("skipmode %d:%d", m_skipmode_m, m_skipmode_n);
        if (m_skipmode_n)
        {
                eDebug("skipmode %d:%d", m_skipmode_m, m_skipmode_n);
-               max = m_skipmode_n;
+               max = align(m_skipmode_n, blocksize);
        }
        }
-       
-       eDebug("getNextSourceSpan, current offset is %08llx!", current_offset);
-       
-       if ((current_offset < -m_skipmode_m) && (m_skipmode_m < 0))
-       {
-               eDebug("reached SOF");
-               m_skipmode_m = 0;
-               m_pvr_thread->sendEvent(eFilePushThread::evtUser);
-       }
-       
-       current_offset += m_skipmode_m;
-       
+
+       eDebug("getNextSourceSpan, current offset is %08llx, m_skipmode_m = %d!", current_offset, m_skipmode_m);
+
+       current_offset += align(m_skipmode_m, blocksize);
+
        while (!m_cue->m_seek_requests.empty())
        {
                std::pair<int, pts_t> seek = m_cue->m_seek_requests.front();
        while (!m_cue->m_seek_requests.empty())
        {
                std::pair<int, pts_t> seek = m_cue->m_seek_requests.front();
+               m_cue->m_lock.Unlock();
+               m_cue->m_lock.WrLock();
                m_cue->m_seek_requests.pop_front();
                m_cue->m_seek_requests.pop_front();
+               m_cue->m_lock.Unlock();
+               m_cue->m_lock.RdLock();
                int relative = seek.first;
                pts_t pts = seek.second;
 
                int relative = seek.first;
                pts_t pts = seek.second;
 
-               int bitrate = m_tstools.calcBitrate(); /* in bits/s */
-       
-               if (bitrate == -1)
-                       continue;
-       
+               pts_t now = 0;
                if (relative)
                {
                if (relative)
                {
-                       pts_t now;
-                                       /* we're using the decoder's timestamp here. this 
-                                          won't work for radio (ouch). */
+                       if (!m_cue->m_decoder)
+                       {
+                               eDebug("no decoder - can't seek relative");
+                               continue;
+                       }
+                       if (m_cue->m_decoder->getPTS(0, now))
+                       {
+                               eDebug("decoder getPTS failed, can't seek relative");
+                               continue;
+                       }
                        if (getCurrentPosition(m_cue->m_decoding_demux, now, 1))
                        {
                                eDebug("seekTo: getCurrentPosition failed!");
                                continue;
                        }
                        if (getCurrentPosition(m_cue->m_decoding_demux, now, 1))
                        {
                                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 */
+               {
                        pts += now;
                        pts += now;
+                       if (pts < 0)
+                               pts = 0;
+               }
+
+               if (relative != 2)
+                       if (pts < 0)
+                               pts = 0;
+               
+               if (relative == 2) /* AP relative */
+               {
+                       eDebug("AP relative seeking: %lld, at %lld", pts, now);
+                       pts_t nextap;
+                       if (m_tstools.getNextAccessPoint(nextap, now, pts))
+                       {
+                               pts = now - 90000; /* approx. 1s */
+                               eDebug("AP relative seeking failed!");
+                       } else
+                       {
+                               pts = nextap;
+                               eDebug("next ap is %llx\n", pts);
+                       }
                }
                }
-       
-               if (pts < 0)
-                       pts = 0;
-       
-               off_t offset = (pts * (pts_t)bitrate) / 8ULL / 90000ULL;
                
                
+               off_t offset = 0;
+               if (m_tstools.getOffset(offset, pts, -1))
+               {
+                       eDebug("get offset for pts=%lld failed!", pts);
+                       continue;
+               }
+
                eDebug("ok, resolved skip (rel: %d, diff %lld), now at %08llx", relative, pts, offset);
                eDebug("ok, resolved skip (rel: %d, diff %lld), now at %08llx", relative, pts, offset);
-               current_offset = offset;
+               current_offset = align(offset, blocksize); /* in case tstools return non-aligned offset */
        }
        }
-       
+
+       m_cue->m_lock.Unlock();
+
        for (std::list<std::pair<off_t, off_t> >::const_iterator i(m_source_span.begin()); i != m_source_span.end(); ++i)
        {
        for (std::list<std::pair<off_t, off_t> >::const_iterator i(m_source_span.begin()); i != m_source_span.end(); ++i)
        {
-               if ((current_offset >= i->first) && (current_offset < i->second))
+               long long aligned_start = align(i->first, blocksize);
+               long long aligned_end = align(i->second, blocksize);
+       
+               if ((current_offset >= aligned_start) && (current_offset < aligned_end))
                {
                        start = current_offset;
                {
                        start = current_offset;
-                       size = i->second - current_offset;
-                       if (size > max)
+                               /* max can not exceed max(size_t). aligned_end - current_offset, however, can. */
+                       if ((aligned_end - current_offset) > max)
                                size = max;
                                size = max;
-                       eDebug("HIT, %lld < %lld < %lld", i->first, current_offset, i->second);
+                       else
+                               size = aligned_end - current_offset;
+                       eDebug("HIT, %lld < %lld < %lld, size: %d", i->first, current_offset, i->second, size);
                        return;
                }
                        return;
                }
-               if (current_offset < i->first)
+               if (current_offset < aligned_start)
                {
                {
-                       start = i->first;
-                       size = i->second - i->first;
-                       if (size > max)
-                               size = max;
-                       eDebug("skip");
+                               /* ok, our current offset is in an 'out' zone. */
+                       if ((m_skipmode_m >= 0) || (i == m_source_span.begin()))
+                       {
+                                       /* in normal playback, just start at the next zone. */
+                               start = i->first;
+
+                                       /* size is not 64bit! */
+                               if ((i->second - i->first) > max)
+                                       size = max;
+                               else
+                                       size = aligned_end - aligned_start;
+
+                               eDebug("skip");
+                               if (m_skipmode_m < 0)
+                               {
+                                       eDebug("reached SOF");
+                                               /* reached SOF */
+                                       m_skipmode_m = 0;
+                                       m_pvr_thread->sendEvent(eFilePushThread::evtUser);
+                               }
+                       } else
+                       {
+                                       /* 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;
+
+                               aligned_start = align(i->first, blocksize);
+                               aligned_end = align(i->second, blocksize);
+
+                               if ((aligned_end - aligned_start) > max)
+                                       len = max;
+                               else
+                                       len = aligned_end - aligned_start;
+
+                               start = aligned_end - len;
+                               eDebug("skipping to %llx, %d", start, len);
+                       }
+
+                       eDebug("result: %llx, %x (%llx %llx)", start, size, aligned_start, aligned_end);
                        return;
                }
        }
                        return;
                }
        }
-       
-       start = current_offset;
-       size = max;
+
+       if (m_source_span.empty()) {
+               if ((current_offset < -m_skipmode_m) && (m_skipmode_m < 0))
+               {
+                       eDebug("reached SOF");
+                       m_skipmode_m = 0;
+                       m_pvr_thread->sendEvent(eFilePushThread::evtUser);
+               }
+               start = current_offset;
+               size = max;
+       } else {
+               off_t tmp2, tmp = align(m_source_span.rbegin()->second, blocksize);
+               pts_t len;
+               getLength(len);
+               m_tstools.getOffset(tmp2, len, 1);
+               if (current_offset == tmp || current_offset == tmp2) {
+                       start = tmp2;
+                       size = max;
+               } else {
+                       start = tmp - align(512*1024, blocksize);
+                       size = align(512*1024, blocksize);
+               }
+       }
+
        eDebug("END OF CUESHEET. (%08llx, %d)", start, size);
        eDebug("END OF CUESHEET. (%08llx, %d)", start, size);
-       
-       if (size < 4096)
-               eFatal("blub");
        return;
 }
 
        return;
 }
 
@@ -855,7 +1487,7 @@ RESULT eDVBChannel::setChannel(const eDVBChannelID &channelid, ePtr<iDVBFrontend
                        /* if tuning fails, shutdown the channel immediately. */
        int res;
        res = m_frontend->get().tune(*feparm);
                        /* 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)
        {
        
        if (res)
        {
@@ -904,6 +1536,11 @@ RESULT eDVBChannel::getDemux(ePtr<iDVBDemux> &demux, int cap)
        
        demux = *our_demux;
                /* don't hold a reference to the decoding demux, we don't need it. */
        
        demux = *our_demux;
                /* don't hold a reference to the decoding demux, we don't need it. */
+               
+               /* FIXME: by dropping the 'allocated demux' in favour of the 'iDVBDemux',
+                  the refcount is lost. thus, decoding demuxes are never allocated. 
+                  
+                  this poses a big problem for PiP. */
        if (cap & capDecode)
                our_demux = 0;
        return 0;
        if (cap & capDecode)
                our_demux = 0;
        return 0;
@@ -911,11 +1548,19 @@ RESULT eDVBChannel::getDemux(ePtr<iDVBDemux> &demux, int cap)
 
 RESULT eDVBChannel::getFrontend(ePtr<iDVBFrontend> &frontend)
 {
 
 RESULT eDVBChannel::getFrontend(ePtr<iDVBFrontend> &frontend)
 {
+       frontend = 0;
+       if (!m_frontend)
+               return -ENODEV;
        frontend = &m_frontend->get();
        if (frontend)
                return 0;
        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)
 }
 
 RESULT eDVBChannel::playFile(const char *file)
@@ -934,30 +1579,33 @@ RESULT eDVBChannel::playFile(const char *file)
                   THEN DO A REAL FIX HERE! */
        
                /* (this codepath needs to be improved anyway.) */
                   THEN DO A REAL FIX HERE! */
        
                /* (this codepath needs to be improved anyway.) */
+#if HAVE_DVB_API_VERSION < 3
+       m_pvr_fd_dst = open("/dev/pvr", O_WRONLY);
+#else
        m_pvr_fd_dst = open("/dev/misc/pvr", O_WRONLY);
        m_pvr_fd_dst = open("/dev/misc/pvr", O_WRONLY);
+#endif
        if (m_pvr_fd_dst < 0)
        {
                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;
        }
        if (m_pvr_fd_dst < 0)
        {
                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;
        }
-       
-       m_pvr_fd_src = open(file, O_RDONLY|O_LARGEFILE);
-       if (m_pvr_fd_src < 0)
+
+       m_pvr_thread = new eDVBChannelFilePush();
+       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))
        {
        {
-               eDebug("can't open PVR m_pvr_fd_src file %s (%m)", file);
-               close(m_pvr_fd_dst);
+               delete m_pvr_thread;
+               m_pvr_thread = 0;
+               eDebug("can't open PVR file %s (%m)", file);
                return -ENOENT;
        }
                return -ENOENT;
        }
-       
+       CONNECT(m_pvr_thread->m_event, eDVBChannel::pvrEvent);
+
        m_state = state_ok;
        m_stateChanged(this);
        m_state = state_ok;
        m_stateChanged(this);
-       
-       m_pvr_thread = new eFilePushThread();
-       m_pvr_thread->enablePVRCommit(1);
-       m_pvr_thread->setScatterGather(this);
-
-       m_pvr_thread->start(m_pvr_fd_src, m_pvr_fd_dst);
-       CONNECT(m_pvr_thread->m_event, eDVBChannel::pvrEvent);
 
        return 0;
 }
 
        return 0;
 }
@@ -967,7 +1615,6 @@ void eDVBChannel::stopFile()
        if (m_pvr_thread)
        {
                m_pvr_thread->stop();
        if (m_pvr_thread)
        {
                m_pvr_thread->stop();
-               ::close(m_pvr_fd_src);
                ::close(m_pvr_fd_dst);
                delete m_pvr_thread;
                m_pvr_thread = 0;
                ::close(m_pvr_fd_dst);
                delete m_pvr_thread;
                m_pvr_thread = 0;
@@ -992,39 +1639,30 @@ RESULT eDVBChannel::getCurrentPosition(iDVBDemux *decoding_demux, pts_t &pos, in
        if (!decoding_demux)
                return -1;
        
        if (!decoding_demux)
                return -1;
        
-       off_t begin = 0;
-               /* getPTS for offset 0 is cached, so it doesn't harm. */
-       int r = m_tstools.getPTS(begin, pos);
-       if (r)
-       {
-               eDebug("tstools getpts(0) failed!");
-               return r;
-       }
-       
        pts_t now;
        
        pts_t now;
        
-                       /* TODO: this is a gross hack. */
-       r = decoding_demux->getSTC(now, mode ? 128 : 0);
-
-       if (r)
+       int r;
+       
+       if (mode == 0) /* demux */
        {
        {
-               eDebug("demux getSTC failed");
-               return -1;
-       }
+               r = decoding_demux->getSTC(now, 0);
+               if (r)
+               {
+                       eDebug("demux getSTC failed");
+                       return -1;
+               }
+       } else
+               now = pos; /* fixup supplied */
        
        
-//     eDebug("STC: %08llx PTS: %08llx, diff %lld", now, pos, now - pos);
-               /* when we are less than 10 seconds before the start, return 0. */
-               /* (we're just waiting for the timespam to start) */
-       if ((now < pos) && ((pos - now) < 90000 * 10))
+       off_t off = 0; /* TODO: fixme */
+       r = m_tstools.fixupPTS(off, now);
+       if (r)
        {
        {
-               pos = 0;
-               return 0;
+               eDebug("fixup PTS failed");
+               return -1;
        }
        
        }
        
-       if (now < pos) /* wrap around */
-               pos = now + ((pts_t)1)<<33 - pos;
-       else
-               pos = now - pos;
+       pos = now;
        
        return 0;
 }
        
        return 0;
 }
@@ -1066,40 +1704,44 @@ eCueSheet::eCueSheet()
 
 void eCueSheet::seekTo(int relative, const pts_t &pts)
 {
 
 void eCueSheet::seekTo(int relative, const pts_t &pts)
 {
-       {
-               eSingleLock l(m_lock);
-               m_seek_requests.push_back(std::pair<int, pts_t>(relative, pts));
-       }
+       m_lock.WrLock();
+       m_seek_requests.push_back(std::pair<int, pts_t>(relative, pts));
+       m_lock.Unlock();
        m_event(evtSeek);
 }
        
 void eCueSheet::clear()
 {
        m_event(evtSeek);
 }
        
 void eCueSheet::clear()
 {
-       eSingleLock l(m_lock);
+       m_lock.WrLock();
        m_spans.clear();
        m_spans.clear();
+       m_lock.Unlock();
 }
 
 void eCueSheet::addSourceSpan(const pts_t &begin, const pts_t &end)
 {
 }
 
 void eCueSheet::addSourceSpan(const pts_t &begin, const pts_t &end)
 {
-       {
-               eSingleLock l(m_lock);
-               m_spans.push_back(std::pair<pts_t, pts_t>(begin, end));
-       }
+       assert(begin < end);
+       m_lock.WrLock();
+       m_spans.push_back(std::pair<pts_t, pts_t>(begin, end));
+       m_lock.Unlock();
+}
+
+void eCueSheet::commitSpans()
+{
        m_event(evtSpanChanged);
 }
 
 void eCueSheet::setSkipmode(const pts_t &ratio)
 {
        m_event(evtSpanChanged);
 }
 
 void eCueSheet::setSkipmode(const pts_t &ratio)
 {
-       {
-               eSingleLock l(m_lock);
-               m_skipmode_ratio = ratio;
-       }
+       m_lock.WrLock();
+       m_skipmode_ratio = ratio;
+       m_lock.Unlock();
        m_event(evtSkipmode);
 }
 
        m_event(evtSkipmode);
 }
 
-void eCueSheet::setDecodingDemux(iDVBDemux *demux)
+void eCueSheet::setDecodingDemux(iDVBDemux *demux, iTSMPEGDecoder *decoder)
 {
        m_decoding_demux = demux;
 {
        m_decoding_demux = demux;
+       m_decoder = decoder;
 }
 
 RESULT eCueSheet::connectEvent(const Slot1<void,int> &event, ePtr<eConnection> &connection)
 }
 
 RESULT eCueSheet::connectEvent(const Slot1<void,int> &event, ePtr<eConnection> &connection)