aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAndreas Monzner <andreas.monzner@multimedia-labs.de>2006-08-17 00:04:28 +0000
committerAndreas Monzner <andreas.monzner@multimedia-labs.de>2006-08-17 00:04:28 +0000
commitec7c78fd405d7d6579eb40ac52a56e904ee1e21f (patch)
tree1515b57b9aca5a4f64f81c680511072b17c7c0b9 /lib
parent82e42c6b20bc9b84a6c393b8b5b62819d9538d2a (diff)
downloadenigma2-ec7c78fd405d7d6579eb40ac52a56e904ee1e21f.tar.gz
enigma2-ec7c78fd405d7d6579eb40ac52a56e904ee1e21f.zip
dont start radiotext decoder in playback / timeshift mode.. (not working
yet)
Diffstat (limited to 'lib')
-rw-r--r--lib/service/servicedvb.cpp21
1 files changed, 11 insertions, 10 deletions
diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index 97739969..3008a9d2 100644
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -1740,16 +1740,6 @@ void eDVBServicePlay::updateDecoder()
m_teletext_parser = new eDVBTeletextParser(m_decode_demux);
m_teletext_parser->connectNewPage(slot(*this, &eDVBServicePlay::newSubtitlePage), m_new_subtitle_page_connection);
#endif
- if (apid != 1)
- {
- ePtr<iDVBDemux> data_demux;
- if ( (m_timeshift_active && !m_service_handler_timeshift.getDataDemux(data_demux))
- || (!m_timeshift_active && !m_service_handler.getDataDemux(data_demux)))
- {
- m_radiotext_parser = new eDVBRadioTextParser(data_demux);
- m_radiotext_parser->connectUpdatedRadiotext(slot(*this, &eDVBServicePlay::radioTextUpdated), m_radiotext_updated_connection);
- }
- }
}
if (m_decoder)
@@ -1792,7 +1782,18 @@ void eDVBServicePlay::updateDecoder()
m_current_audio_stream = 0;
m_decoder->setAudioPID(apid, apidtype);
if (!(m_is_pvr || m_timeshift_active || !m_is_primary))
+ {
m_decoder->setSyncPCR(pcrpid);
+ if (apid != 1)
+ {
+ ePtr<iDVBDemux> data_demux;
+ if (h.getDataDemux(data_demux))
+ {
+ m_radiotext_parser = new eDVBRadioTextParser(data_demux);
+ m_radiotext_parser->connectUpdatedRadiotext(slot(*this, &eDVBServicePlay::radioTextUpdated), m_radiotext_updated_connection);
+ }
+ }
+ }
else
m_decoder->setSyncPCR(-1);