X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/f7c8d3cf16c62a7be9ebb66a726237736bdd0a8e..dbe120313d2b4589e3c7ebe49ee98586a2b04e16:/lib/dvb/dvb.cpp diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp index 86b1965e..9d5a68aa 100644 --- a/lib/dvb/dvb.cpp +++ b/lib/dvb/dvb.cpp @@ -42,6 +42,16 @@ DEFINE_REF(eDVBResourceManager); eDVBResourceManager *eDVBResourceManager::instance; +RESULT eDVBResourceManager::getInstance(ePtr &ptr) +{ + if (instance) + { + ptr = instance; + return 0; + } + return -1; +} + eDVBResourceManager::eDVBResourceManager() :m_releaseCachedChannelTimer(eApp) { @@ -422,9 +432,16 @@ RESULT eDVBResourceManager::allocatePVRChannel(eUsePtr &channel) { ePtr demux; + if (m_cached_channel && m_releaseCachedChannelTimer.isActive()) + { + m_cached_channel_state_changed_conn.disconnect(); + m_cached_channel=0; + m_releaseCachedChannelTimer.stop(); + } + eDVBChannel *ch; ch = new eDVBChannel(this, 0); - + channel = ch; return 0; } @@ -826,10 +843,12 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off if ((current_offset >= i->first) && (current_offset < i->second)) { start = current_offset; - size = i->second - current_offset; - if (size > max) + /* max can not exceed max(size_t). i->second - current_offset, however, can. */ + if ((i->second - current_offset) > max) size = max; - eDebug("HIT, %lld < %lld < %lld", i->first, current_offset, i->second); + else + size = i->second - current_offset; + eDebug("HIT, %lld < %lld < %lld, size: %d", i->first, current_offset, i->second, size); return; } if (current_offset < i->first) @@ -839,9 +858,13 @@ 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 = i->second - i->first; - if (size > max) + + /* size is not 64bit! */ + if ((i->second - i->first) > max) size = max; + else + size = i->second - i->first; + eDebug("skip"); if (m_skipmode_m < 0) { @@ -855,12 +878,15 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off /* 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 = i->second - i->first; - if (max > len) - max = len; - start = i->second - max; - size = max; - eDebug("skipping to %llx, %d", start, size); + size_t len; + + if ((i->second - i->first) > max) + len = max; + else + len = i->second - i->first; + + start = i->second - len; + eDebug("skipping to %llx, %d", start, len); } return; } @@ -978,6 +1004,9 @@ RESULT eDVBChannel::getDemux(ePtr &demux, int cap) RESULT eDVBChannel::getFrontend(ePtr &frontend) { + frontend = 0; + if (!m_frontend) + return -ENODEV; frontend = &m_frontend->get(); if (frontend) return 0; @@ -1016,10 +1045,7 @@ RESULT eDVBChannel::playFile(const char *file) 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_state = state_ok; - m_stateChanged(this); - + m_pvr_thread = new eFilePushThread(); m_pvr_thread->enablePVRCommit(1); m_pvr_thread->setScatterGather(this); @@ -1033,6 +1059,9 @@ RESULT eDVBChannel::playFile(const char *file) } CONNECT(m_pvr_thread->m_event, eDVBChannel::pvrEvent); + m_state = state_ok; + m_stateChanged(this); + return 0; }