diff options
| author | Felix Domke <tmbinc@elitedvb.net> | 2006-05-12 17:32:36 +0000 |
|---|---|---|
| committer | Felix Domke <tmbinc@elitedvb.net> | 2006-05-12 17:32:36 +0000 |
| commit | a2aaaa1836cc7d4348429418c36d6742a6b3bc5a (patch) | |
| tree | 9cf59915633f03253235f06124431b0ce8428436 /lib/service/servicedvb.cpp | |
| parent | 62b5ec90e68742957e88889c2b3c606a8a536e09 (diff) | |
| download | enigma2-a2aaaa1836cc7d4348429418c36d6742a6b3bc5a.tar.gz enigma2-a2aaaa1836cc7d4348429418c36d6742a6b3bc5a.zip | |
add teletext parser to servicedvb
Diffstat (limited to 'lib/service/servicedvb.cpp')
| -rw-r--r-- | lib/service/servicedvb.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp index d1b99068..192d3a64 100644 --- a/lib/service/servicedvb.cpp +++ b/lib/service/servicedvb.cpp @@ -242,7 +242,6 @@ RESULT eDVBPVRServiceOfflineOperations::deleteFromDisk(int simulate) if (!eraser) eDebug("FATAL !! can't get background file eraser"); - /* TODO: deferred removing.. */ for (std::list<std::string>::iterator i(res.begin()); i != res.end(); ++i) { eDebug("Removing %s...", i->c_str()); @@ -1526,6 +1525,8 @@ void eDVBServicePlay::switchToLive() m_cue = 0; m_decoder = 0; m_decode_demux = 0; + m_teletext_parser = 0; + /* free the timeshift service handler, we need the resources */ m_service_handler_timeshift.free(); m_timeshift_active = 0; @@ -1542,6 +1543,7 @@ void eDVBServicePlay::switchToTimeshift() m_decode_demux = 0; m_decoder = 0; + m_teletext_parser = 0; m_timeshift_active = 1; @@ -1622,6 +1624,9 @@ void eDVBServicePlay::updateDecoder() m_decode_demux->getMPEGDecoder(m_decoder, m_is_primary); if (m_cue) m_cue->setDecodingDemux(m_decode_demux, m_decoder); +#ifdef INTERNAL_TELETEXT + m_teletext_parser = new eDVBTeletextParser(m_decode_demux); +#endif } if (m_decoder) @@ -1633,7 +1638,13 @@ void eDVBServicePlay::updateDecoder() m_decoder->setSyncPCR(pcrpid); else m_decoder->setSyncPCR(-1); +#ifndef INTERNAL_TELETEXT m_decoder->setTextPID(tpid); +#else + if (m_teletext_parser) + m_teletext_parser->start(tpid); +#endif + if (!m_is_primary) m_decoder->setTrickmode(1); m_decoder->start(); |