X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d7010ab56f9b823d56a5a5fa3ba7f7764bbfece4..f7ff87f985d26835958bb2404265f3029e35c72a:/lib/service/servicedvb.cpp diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp index ed6544f5..d1cc4ef8 100644 --- a/lib/service/servicedvb.cpp +++ b/lib/service/servicedvb.cpp @@ -13,6 +13,7 @@ #include #include #include +#include class eStaticServiceDVBInformation: public iStaticServiceInformation { @@ -305,7 +306,32 @@ RESULT eDVBServiceList::startQuery() return 0; } -RESULT eDVBServiceList::getContent(std::list &list) +RESULT eDVBServiceList::getContent(PyObject *list, bool sorted) +{ + eServiceReferenceDVB ref; + + if (!m_query || !list || !PyList_Check(list)) + return -1; + + std::list tmplist; + + while (!m_query->getNextResult(ref)) + tmplist.push_back(ref); + + if (sorted) + tmplist.sort(iListableServiceCompare(this)); + + for (std::list::iterator it(tmplist.begin()); + it != tmplist.end(); ++it) + { + PyObject *refobj = New_eServiceReference(*it); + PyList_Append(list, refobj); + Py_DECREF(refobj); + } + return 0; +} + +RESULT eDVBServiceList::getContent(std::list &list, bool sorted) { eServiceReferenceDVB ref; @@ -314,6 +340,10 @@ RESULT eDVBServiceList::getContent(std::list &list) while (!m_query->getNextResult(ref)) list.push_back(ref); + + if (sorted) + list.sort(iListableServiceCompare(this)); + return 0; } @@ -379,6 +409,13 @@ RESULT eDVBServiceList::flushChanges() return m_bouquet->flushChanges(); } +RESULT eDVBServiceList::setListName(const std::string &name) +{ + if (!m_bouquet) + return -1; + return m_bouquet->setListName(name); +} + RESULT eServiceFactoryDVB::play(const eServiceReference &ref, ePtr &ptr) { ePtr service; @@ -489,6 +526,7 @@ eDVBServicePlay::eDVBServicePlay(const eServiceReference &ref, eDVBService *serv { m_is_pvr = !ref.path.empty(); m_timeshift_enabled = m_timeshift_active = 0; + m_skipmode = 0; CONNECT(m_service_handler.serviceEvent, eDVBServicePlay::serviceEvent); CONNECT(m_service_handler_timeshift.serviceEvent, eDVBServicePlay::serviceEventTimeshift); @@ -553,7 +591,11 @@ void eDVBServicePlay::serviceEvent(int event) break; } case eDVBServicePMTHandler::eventEOF: - m_event((iPlayableService*)this, evEnd); + m_event((iPlayableService*)this, evEOF); + break; + case eDVBServicePMTHandler::eventSOF: + m_event((iPlayableService*)this, evSOF); + break; } } @@ -565,6 +607,9 @@ void eDVBServicePlay::serviceEventTimeshift(int event) if (m_timeshift_active) updateDecoder(); break; + case eDVBServicePMTHandler::eventEOF: + switchToLive(); + break; } } @@ -574,13 +619,24 @@ RESULT eDVBServicePlay::start() /* in pvr mode, we only want to use one demux. in tv mode, we're using two (one for decoding, one for data source), as we must be prepared to start recording from the data demux. */ - r = m_service_handler.tune((eServiceReferenceDVB&)m_reference, m_is_pvr); + m_cue = new eCueSheet(); + r = m_service_handler.tune((eServiceReferenceDVB&)m_reference, m_is_pvr, m_cue); m_event(this, evStart); + m_event((iPlayableService*)this, evSeekableStatusChanged); return 0; } RESULT eDVBServicePlay::stop() { + eDebug("stop timeshift"); + stopTimeshift(); /* in case timeshift was enabled, remove buffer etc. */ + + eDebug("free ts handler"); + m_service_handler_timeshift.free(); + eDebug("stop service handler"); + m_service_handler.free(); + eDebug("ok"); + return 0; } @@ -592,6 +648,9 @@ RESULT eDVBServicePlay::connectEvent(const Slot2 &ev RESULT eDVBServicePlay::pause(ePtr &ptr) { + /* note: we check for timeshift to be enabled, + not neccessary active. if you pause when timeshift + is not active, you should activate it when unpausing */ if ((!m_is_pvr) && (!m_timeshift_enabled)) { ptr = 0; @@ -612,15 +671,44 @@ RESULT eDVBServicePlay::setSlowMotion(int ratio) RESULT eDVBServicePlay::setFastForward(int ratio) { - if (m_decoder) - return m_decoder->setFastForward(ratio); - else + int skipmode, ffratio; + + if (ratio > 8) + { + skipmode = ratio; + ffratio = 1; + } else if (ratio > 0) + { + skipmode = 0; + ffratio = ratio; + } else if (!ratio) + { + skipmode = 0; + ffratio = 0; + } else if (ratio < 0) + { + skipmode = ratio; + ffratio = 1; + } + + if (m_skipmode != skipmode) + { + eDebug("setting cue skipmode to %d", skipmode); + if (m_cue) + m_cue->setSkipmode(skipmode * 90000); /* convert to 90000 per second */ + } + + m_skipmode = skipmode; + + if (!m_decoder) return -1; + + return m_decoder->setFastForward(ffratio); } RESULT eDVBServicePlay::seek(ePtr &ptr) { - if (m_is_pvr || m_timeshift_enabled) + if (m_is_pvr || m_timeshift_active) { ptr = this; return 0; @@ -645,11 +733,6 @@ RESULT eDVBServicePlay::getLength(pts_t &len) RESULT eDVBServicePlay::pause() { - if (m_timeshift_enabled && !m_timeshift_active) - { - switchToTimeshift(); - return 0; - } if (!m_is_paused && m_decoder) { m_is_paused = 1; @@ -677,10 +760,14 @@ RESULT eDVBServicePlay::seekTo(pts_t to) ePtr pvr_channel; - if (m_service_handler.getPVRChannel(pvr_channel)) + if ((m_timeshift_enabled ? m_service_handler_timeshift : m_service_handler).getPVRChannel(pvr_channel)) return -1; - return pvr_channel->seekTo(m_decode_demux, 0, to); + if (!m_cue) + return -1; + + m_cue->seekTo(0, to); + return 0; } RESULT eDVBServicePlay::seekRelative(int direction, pts_t to) @@ -692,12 +779,16 @@ RESULT eDVBServicePlay::seekRelative(int direction, pts_t to) ePtr pvr_channel; - if (m_service_handler.getPVRChannel(pvr_channel)) + if ((m_timeshift_enabled ? m_service_handler_timeshift : m_service_handler).getPVRChannel(pvr_channel)) return -1; to *= direction; - return pvr_channel->seekTo(m_decode_demux, 1, to); + if (!m_cue) + return 0; + + m_cue->seekTo(1, to); + return 0; } RESULT eDVBServicePlay::getPlayPosition(pts_t &pos) @@ -707,7 +798,7 @@ RESULT eDVBServicePlay::getPlayPosition(pts_t &pos) if (!m_decode_demux) return -1; - if (m_service_handler.getPVRChannel(pvr_channel)) + if ((m_timeshift_enabled ? m_service_handler_timeshift : m_service_handler).getPVRChannel(pvr_channel)) return -1; return pvr_channel->getCurrentPosition(m_decode_demux, pos, 1); @@ -757,6 +848,11 @@ RESULT eDVBServicePlay::timeshift(ePtr &ptr) RESULT eDVBServicePlay::getName(std::string &name) { + if (m_is_pvr) + { + ePtr i = new eStaticServiceDVBPVRInformation(m_reference); + return i->getName(m_reference, name); + } if (m_dvb_service) { m_dvb_service->getName(m_reference, name); @@ -828,7 +924,7 @@ int eDVBServicePlay::getInfo(int w) case sAudioPID: if (program.audioStreams.empty()) return -1; return program.audioStreams[m_current_audio_stream].pid; case sPCRPID: return program.pcrPid; case sPMTPID: return program.pmtPid; - case sTXTPID: return -1; + case sTXTPID: return program.textPid; case sSID: return ((const eServiceReferenceDVB&)m_reference).getServiceID().get(); case sONID: return ((const eServiceReferenceDVB&)m_reference).getOriginalNetworkID().get(); case sTSID: return ((const eServiceReferenceDVB&)m_reference).getTransportStreamID().get(); @@ -997,7 +1093,7 @@ RESULT eDVBServicePlay::startTimeshift() if (m_timeshift_fd < 0) { - delete m_record; + m_record = 0; return -4; } @@ -1021,15 +1117,33 @@ RESULT eDVBServicePlay::stopTimeshift() m_timeshift_enabled = 0; m_record->stop(); - delete m_record; + m_record = 0; close(m_timeshift_fd); remove(m_timeshift_file.c_str()); - eDebug("timeshift disabled"); return 0; } +int eDVBServicePlay::isTimeshiftActive() +{ + return m_timeshift_enabled && m_timeshift_active; +} + +RESULT eDVBServicePlay::activateTimeshift() +{ + if (!m_timeshift_enabled) + return -1; + + if (!m_timeshift_active) + { + switchToTimeshift(); + return 0; + } + + return -2; +} + void eDVBServicePlay::updateTimeshiftPids() { if (!m_record) @@ -1080,7 +1194,6 @@ void eDVBServicePlay::updateTimeshiftPids() void eDVBServicePlay::switchToLive() { - eDebug("SwitchToLive"); if (!m_timeshift_active) return; @@ -1090,12 +1203,13 @@ void eDVBServicePlay::switchToLive() m_service_handler_timeshift.free(); m_timeshift_active = 0; + m_event((iPlayableService*)this, evSeekableStatusChanged); + updateDecoder(); } void eDVBServicePlay::switchToTimeshift() { - eDebug("SwitchToTimeshift"); if (m_timeshift_active) return; @@ -1103,12 +1217,13 @@ void eDVBServicePlay::switchToTimeshift() m_decoder = 0; m_timeshift_active = 1; + + m_event((iPlayableService*)this, evSeekableStatusChanged); eServiceReferenceDVB r = (eServiceReferenceDVB&)m_reference; r.path = m_timeshift_file; - eDebug("ok, re-tuning to %s", r.toString().c_str()); - m_service_handler_timeshift.tune(r, 1); /* use the decoder demux for everything */ + m_service_handler_timeshift.tune(r, 1, m_cue); /* use the decoder demux for everything */ } void eDVBServicePlay::updateDecoder() @@ -1167,6 +1282,8 @@ void eDVBServicePlay::updateDecoder() h.getDecodeDemux(m_decode_demux); if (m_decode_demux) m_decode_demux->getMPEGDecoder(m_decoder); + if (m_cue) + m_cue->setDecodingDemux(m_decode_demux); } if (m_decoder)