dont use and show input power measurement (for rotor running detection),
[enigma2.git] / lib / dvb / dvb.cpp
index cb24fc3cef803db54e0e734a95103ab934d00c36..41c4f3cad4733a1c324589904e46ca142e82049c 100644 (file)
@@ -2,6 +2,7 @@
 #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>
@@ -82,6 +83,8 @@ eDVBResourceManager::eDVBResourceManager()
        eDebug("found %d adapter, %d frontends and %d demux", 
                m_adapter.size(), m_frontend.size(), m_demux.size());
 
+       eDVBCAService::registerChannelCallback(this);
+
        CONNECT(m_releaseCachedChannelTimer.timeout, eDVBResourceManager::releaseCachedChannel);
 }
 
@@ -90,7 +93,7 @@ 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->getID() );
+                       mask |= ( 1 << i->m_frontend->getSlotID() );
        /* emit */ frontendUseMaskChanged(mask);
 }
 
@@ -239,8 +242,8 @@ void eDVBResourceManager::addAdapter(iDVBAdapter *adapter)
                        {
                                if (prev_dvbt_frontend)
                                {
-                                       prev_dvbt_frontend->m_frontend->setData(eDVBFrontend::LINKED_NEXT_PTR, (int)new_fe);
-                                       frontend->setData(eDVBFrontend::LINKED_PREV_PTR, (int)&(*prev_dvbt_frontend));
+                                       prev_dvbt_frontend->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;
                        }
@@ -248,44 +251,119 @@ void eDVBResourceManager::addAdapter(iDVBAdapter *adapter)
        }
 }
 
+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;
+       }
+       Py_RETURN_NONE;
+}
+
 RESULT eDVBResourceManager::allocateFrontend(ePtr<eDVBAllocatedFrontend> &fe, ePtr<iDVBFrontendParameters> &feparm)
 {
        ePtr<eDVBRegisteredFrontend> best;
        int bestval = 0;
+       int foundone = 0;
 
        for (eSmartPtrList<eDVBRegisteredFrontend>::iterator i(m_frontend.begin()); i != m_frontend.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;
+
                if (!i->m_inuse)
                {
-                       int c = i->m_frontend->isCompatibleWith(feparm);
                        if (c > bestval)
                        {
                                bestval = c;
                                best = i;
                        }
                }
+       }
 
        if (best)
        {
                fe = new eDVBAllocatedFrontend(best);
                return 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
+                       eDVBRegisteredFrontend *satpos_depends_to_fe =
+                               (eDVBRegisteredFrontend*) i->m_frontend->m_data[eDVBFrontend::SATPOS_DEPENDS_PTR];
+                       if ( (long)satpos_depends_to_fe != -1 )
+                       {
+                               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
+                       {
+                               eDVBRegisteredFrontend *next =
+                                       (eDVBRegisteredFrontend *) i->m_frontend->m_data[eDVBFrontend::LINKED_NEXT_PTR];
+                               while ( (long)next != -1 )
+                               {
+                                       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 = (eDVBRegisteredFrontend *)next->m_frontend->m_data[eDVBFrontend::LINKED_NEXT_PTR];
+                               }
+                               eDVBRegisteredFrontend *prev = (eDVBRegisteredFrontend *)
+                                       i->m_frontend->m_data[eDVBFrontend::LINKED_PREV_PTR];
+                               while ( (long)prev != -1 )
+                               {
+                                       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 = (eDVBRegisteredFrontend *)prev->m_frontend->m_data[eDVBFrontend::LINKED_PREV_PTR];
+                               }
+                       }
                        fe = new eDVBAllocatedFrontend(i);
                        return 0;
                }
-       
+alloc_fe_by_id_not_possible:
        fe = 0;
-       return -1;
+       return err;
 }
 
 RESULT eDVBResourceManager::allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBAllocatedDemux> &demux, int cap)
@@ -323,7 +401,7 @@ RESULT eDVBResourceManager::allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBA
                        
                        demux = new eDVBAllocatedDemux(i);
                        if (fe)
-                               demux->get().setSourceFrontend(fe->m_frontend->getID());
+                               demux->get().setSourceFrontend(fe->m_frontend->getDVBID());
                        else
                                demux->get().setSourcePVR(0);
                        return 0;
@@ -383,22 +461,23 @@ RESULT eDVBResourceManager::allocateChannel(const eDVBChannelID &channelid, eUse
        if (!m_list)
        {
                eDebug("no channel list set!");
-               return -ENOENT;
+               return errNoChannelList;
        }
 
        ePtr<iDVBFrontendParameters> feparm;
        if (m_list->getChannelFrontendData(channelid, feparm))
        {
                eDebug("channel not found!");
-               return -ENOENT;
+               return errChannelNotInList;
        }
 
        /* allocate a frontend. */
        
        ePtr<eDVBAllocatedFrontend> fe;
-       
-       if (allocateFrontend(fe, feparm))
-               return errNoFrontend;
+
+       int err = allocateFrontend(fe, feparm);
+       if (err)
+               return err;
 
        RESULT res;
        ePtr<eDVBChannel> ch;
@@ -447,7 +526,7 @@ void eDVBResourceManager::releaseCachedChannel()
        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;
 
@@ -458,9 +537,10 @@ RESULT eDVBResourceManager::allocateRawChannel(eUsePtr<iDVBChannel> &channel, in
                m_releaseCachedChannelTimer.stop();
        }
 
-       if (allocateFrontendByIndex(fe, frontend_index))
-               return errNoFrontend;
-       
+       int err = allocateFrontendByIndex(fe, slot_index);
+       if (err)
+               return err;
+
        eDVBChannel *ch;
        ch = new eDVBChannel(this, fe);
 
@@ -530,18 +610,44 @@ int eDVBResourceManager::canAllocateFrontend(ePtr<iDVBFrontendParameters> &fepar
                        if (c > bestval)
                                bestval = c;
                }
-
        return bestval;
 }
 
+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;
+}
+
 int eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid, const eDVBChannelID& ignore)
 {
-       int ret=30000;
+       int ret=0;
        if (m_cached_channel)
        {
                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. */
@@ -552,7 +658,7 @@ int eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid, cons
                if (i->m_channel_id == channelid)
                {
 //                     eDebug("found shared channel..");
-                       return ret;
+                       return tuner_type_channel_default(m_list, channelid);
                }
        }
 
@@ -622,14 +728,12 @@ int eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid, cons
        if (!m_list)
        {
                eDebug("no channel list set!");
-               ret = 0;
                goto error;
        }
 
        if (m_list->getChannelFrontendData(channelid, feparm))
        {
                eDebug("channel not found!");
-               ret = 0;
                goto error;
        }
 
@@ -644,24 +748,119 @@ error:
        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 /* not yet */
+#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]);
+//     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)))
@@ -675,8 +874,8 @@ int eDVBChannelFilePush::filterRecordData(const unsigned char *_data, int len, s
                {
                        int picture_type = (d[5] >> 3) & 7;
                        d += 4;
-                       
-                       eDebug("%d-frame at %d, offset in TS packet: %d, pid=%04x", picture_type, offset, offset % 188, pid);
+
+//                     eDebug("%d-frame at %d, offset in TS packet: %d, pid=%04x", picture_type, offset, offset % 188, pid);
 
                        if (m_iframe_state == 1)
                        {
@@ -698,19 +897,19 @@ int eDVBChannelFilePush::filterRecordData(const unsigned char *_data, int len, s
                        {
                                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;
@@ -722,7 +921,7 @@ int eDVBChannelFilePush::filterRecordData(const unsigned char *_data, int len, s
                                eDebug("now locked to pid %04x", pid);
                                m_pid = pid;
                        }
-                       m_pid = 0x6e;
+//                     m_pid = 0x6e;
                        d += 4;
                } else
                        d += 4; /* ignore */
@@ -833,8 +1032,10 @@ void eDVBChannel::cueSheetEvent(int event)
        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_lock.Unlock();
+                       eRdLocker l(m_cue->m_lock);
                        if (m_cue->m_skipmode_ratio)
                        {
                                int bitrate = m_tstools.calcBitrate(); /* in bits/s */
@@ -842,25 +1043,29 @@ void eDVBChannel::cueSheetEvent(int event)
                                                /* 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 / 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);
-                               
+
                                if (abs(m_skipmode_m) < abs(m_skipmode_n))
                                {
                                        eWarning("something is wrong with this calculation");
                                        m_skipmode_n = m_skipmode_m = 0;
                                }
-                               
                        } else
                        {
                                eDebug("skipmode ratio is 0, normal play");
                                m_skipmode_n = m_skipmode_m = 0;
                        }
                }
+               ASSERT(m_pvr_thread);
                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);
                eDebug("done");
@@ -887,7 +1092,7 @@ void eDVBChannel::cueSheetEvent(int event)
 }
 
        /* align toward zero */
-static inline int align(long long x, int align)
+static inline long long align(long long x, int align)
 {
        int sign = x < 0;
 
@@ -917,13 +1122,13 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
                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");
+               m_cue->m_lock.Unlock();
                return;
        }
 
@@ -933,14 +1138,18 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
                max = align(m_skipmode_n, blocksize);
        }
 
-       eDebug("getNextSourceSpan, current offset is %08llx!", current_offset);
+       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();
+               m_cue->m_lock.Unlock();
+               m_cue->m_lock.WrLock();
                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;
 
@@ -993,7 +1202,7 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
                        pts_t nextap;
                        if (m_tstools.getNextAccessPoint(nextap, now, pts))
                        {
-                               pts = now;
+                               pts = now - 90000; /* approx. 1s */
                                eDebug("AP relative seeking failed!");
                        } else
                        {
@@ -1010,14 +1219,16 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
                }
 
                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)
        {
-               int aligned_start = align(i->first, blocksize);
-               int aligned_end = align(i->second, blocksize);
-               
+               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;
@@ -1036,7 +1247,7 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
                        {
                                        /* in normal playback, just start at the next zone. */
                                start = i->first;
-                               
+
                                        /* size is not 64bit! */
                                if ((i->second - i->first) > max)
                                        size = max;
@@ -1057,8 +1268,11 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
                                --i;
                                eDebug("skip to previous block, which is %llx..%llx", i->first, i->second);
                                size_t len;
-                               
-                               if ((i->second - i->first) > max)
+
+                               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;
@@ -1066,19 +1280,21 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
                                start = aligned_end - len;
                                eDebug("skipping to %llx, %d", start, len);
                        }
+
+                       eDebug("result: %llx, %x (%llx %llx)", start, size, aligned_start, aligned_end);
                        return;
                }
        }
-       
+
        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 = blocksize;
+       size = max;
 
        eDebug("END OF CUESHEET. (%08llx, %d)", start, size);
        return;
@@ -1344,25 +1560,25 @@ eCueSheet::eCueSheet()
 
 void eCueSheet::seekTo(int relative, const pts_t &pts)
 {
-       {
-               eSingleLocker 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()
 {
-       eSingleLocker l(m_lock);
+       m_lock.WrLock();
        m_spans.clear();
+       m_lock.Unlock();
 }
 
 void eCueSheet::addSourceSpan(const pts_t &begin, const pts_t &end)
 {
-       {
-               eSingleLocker 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()
@@ -1372,10 +1588,9 @@ void eCueSheet::commitSpans()
 
 void eCueSheet::setSkipmode(const pts_t &ratio)
 {
-       {
-               eSingleLocker l(m_lock);
-               m_skipmode_ratio = ratio;
-       }
+       m_lock.WrLock();
+       m_skipmode_ratio = ratio;
+       m_lock.Unlock();
        m_event(evtSkipmode);
 }