X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ca329d3e86a98aacb0597d8581f5354cc99542e4..9d512025add93946694e16984b1d10df9c990717:/lib/dvb/dvb.cpp diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp index 11b1285a..a126aae7 100644 --- a/lib/dvb/dvb.cpp +++ b/lib/dvb/dvb.cpp @@ -766,8 +766,16 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off 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!"); @@ -997,15 +1005,19 @@ RESULT eDVBChannel::getCurrentPosition(iDVBDemux *decoding_demux, pts_t &pos, in return -1; pts_t now; + int r; - /* TODO: this is a gross hack. */ - r = decoding_demux->getSTC(now, mode ? 128 : 0); - - if (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 */ off_t off = 0; /* TODO: fixme */ r = m_tstools.fixupPTS(off, now); @@ -1088,9 +1100,10 @@ void eCueSheet::setSkipmode(const pts_t &ratio) m_event(evtSkipmode); } -void eCueSheet::setDecodingDemux(iDVBDemux *demux) +void eCueSheet::setDecodingDemux(iDVBDemux *demux, iTSMPEGDecoder *decoder) { m_decoding_demux = demux; + m_decoder = decoder; } RESULT eCueSheet::connectEvent(const Slot1 &event, ePtr &connection)