X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/b9bda8a0d43be892f2e5d96ea45ba8d4b2fdae20..513a789819efefc582cbabe6a1800f0625605226:/lib/service/servicedvb.cpp?ds=sidebyside

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index 9d9f2d1f..e3b6fe45 100644
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -1151,8 +1151,6 @@ RESULT eDVBServicePlay::start()
 		loadCuesheet();
 		m_event(this, evStart);
 	}
-
-	m_event((iPlayableService*)this, evSeekableStatusChanged);
 	return 0;
 }
 
@@ -1475,7 +1473,7 @@ RESULT eDVBServicePlay::audioDelay(ePtr<iAudioDelay> &ptr)
 	return 0;
 }
 
-RESULT eDVBServicePlay::radioText(ePtr<iRadioText> &ptr)
+RESULT eDVBServicePlay::rdsDecoder(ePtr<iRdsDecoder> &ptr)
 {
 	ptr = this;
 	return 0;
@@ -1705,8 +1703,8 @@ int eDVBServicePlay::selectAudioStream(int i)
 	if (m_decoder->setAudioPID(program.audioStreams[i].pid, program.audioStreams[i].type))
 		return -4;
 
-	if (m_radiotext_parser)
-		m_radiotext_parser->start(program.audioStreams[i].pid);
+	if (m_rds_decoder)
+		m_rds_decoder->start(program.audioStreams[i].pid);
 
 	if (m_dvb_service && !m_is_pvr)
 	{
@@ -1743,20 +1741,81 @@ RESULT eDVBServicePlay::selectChannel(int i)
 	return 0;
 }
 
-std::string eDVBServicePlay::getRadioText(int x)
+std::string eDVBServicePlay::getText(int x)
 {
-	if (m_radiotext_parser)
+	if (m_rds_decoder)
 		switch(x)
 		{
-			case 0:
-				return convertLatin1UTF8(m_radiotext_parser->getCurrentText());
+			case RadioText:
+				return convertLatin1UTF8(m_rds_decoder->getRadioText());
+			case RtpText:
+				return convertLatin1UTF8(m_rds_decoder->getRtpText());
 		}
 	return "";
 }
 
-void eDVBServicePlay::radioTextUpdated()
+void eDVBServicePlay::rdsDecoderEvent(int what)
+{
+	switch(what)
+	{
+		case eDVBRdsDecoder::RadioTextChanged:
+			m_event((iPlayableService*)this, evUpdatedRadioText);
+			break;
+		case eDVBRdsDecoder::RtpTextChanged:
+			m_event((iPlayableService*)this, evUpdatedRtpText);
+			break;
+		case eDVBRdsDecoder::RassInteractivePicMaskChanged:
+			m_event((iPlayableService*)this, evUpdatedRassInteractivePicMask);
+			break;
+		case eDVBRdsDecoder::RecvRassSlidePic:
+			m_event((iPlayableService*)this, evUpdatedRassSlidePic);
+			break;
+	}
+}
+
+void eDVBServicePlay::showRassSlidePicture()
+{
+	if (m_rds_decoder)
+	{
+		if (m_decoder)
+		{
+			std::string rass_slide_pic = m_rds_decoder->getRassSlideshowPicture();
+			if (rass_slide_pic.length())
+				m_decoder->showSinglePic(rass_slide_pic.c_str());
+			else
+				eDebug("empty filename for rass slide picture received!!");
+		}
+		else
+			eDebug("no MPEG Decoder to show iframes avail");
+	}
+	else
+		eDebug("showRassSlidePicture called.. but not decoder");
+}
+
+void eDVBServicePlay::showRassInteractivePic(int page, int subpage)
+{
+	if (m_rds_decoder)
+	{
+		if (m_decoder)
+		{
+			std::string rass_interactive_pic = m_rds_decoder->getRassPicture(page, subpage);
+			if (rass_interactive_pic.length())
+				m_decoder->showSinglePic(rass_interactive_pic.c_str());
+			else
+				eDebug("empty filename for rass interactive picture %d/%d received!!", page, subpage);
+		}
+		else
+			eDebug("no MPEG Decoder to show iframes avail");
+	}
+	else
+		eDebug("showRassInteractivePic called.. but not decoder");
+}
+
+ePyObject eDVBServicePlay::getRassInteractiveMask()
 {
-	m_event((iPlayableService*)this, evUpdatedRadioText);
+	if (m_rds_decoder)
+		return m_rds_decoder->getRassPictureMask();
+	Py_RETURN_NONE;
 }
 
 int eDVBServiceBase::getFrontendInfo(int w)
@@ -2089,11 +2148,11 @@ void eDVBServicePlay::switchToLive()
 	m_decoder = 0;
 	m_decode_demux = 0;
 	m_teletext_parser = 0;
-	m_radiotext_parser = 0;
+	m_rds_decoder = 0;
 	m_subtitle_parser = 0;
 	m_new_dvb_subtitle_page_connection = 0;
 	m_new_subtitle_page_connection = 0;
-	m_radiotext_updated_connection = 0;
+	m_rds_decoder_event_connection = 0;
 	m_video_event_connection = 0;
 
 		/* free the timeshift service handler, we need the resources */
@@ -2113,11 +2172,11 @@ void eDVBServicePlay::switchToTimeshift()
 	m_decode_demux = 0;
 	m_decoder = 0;
 	m_teletext_parser = 0;
-	m_radiotext_parser = 0;
+	m_rds_decoder = 0;
 	m_subtitle_parser = 0;
 	m_new_subtitle_page_connection = 0;
 	m_new_dvb_subtitle_page_connection = 0;
-	m_radiotext_updated_connection = 0;
+	m_rds_decoder_event_connection = 0;
 	m_video_event_connection = 0;
 
 	m_timeshift_active = 1;
@@ -2127,12 +2186,12 @@ void eDVBServicePlay::switchToTimeshift()
 
 	m_cue = new eCueSheet();
 	m_service_handler_timeshift.tune(r, 1, m_cue); /* use the decoder demux for everything */
-	updateDecoder(); /* mainly to switch off PCR */
-
+	updateDecoder(1); /* mainly to switch off PCR, and to set pause */
+	
 	m_event((iPlayableService*)this, evSeekableStatusChanged);
 }
 
-void eDVBServicePlay::updateDecoder()
+void eDVBServicePlay::updateDecoder(int intopause)
 {
 	int vpid = -1, vpidtype = -1, apid = -1, apidtype = -1, pcrpid = -1, tpid = -1, achannel = -1, ac3_delay=-1, pcm_delay=-1;
 
@@ -2259,9 +2318,9 @@ void eDVBServicePlay::updateDecoder()
 				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);
-					m_radiotext_parser->start(apid);
+					m_rds_decoder = new eDVBRdsDecoder(data_demux);
+					m_rds_decoder->connectEvent(slot(*this, &eDVBServicePlay::rdsDecoderEvent), m_rds_decoder_event_connection);
+					m_rds_decoder->start(apid);
 				}
 			}
 		}