X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/b455ca34e1ab4a716e1b2f0c7228fb235b577ce4..94b346a792a343858948de8c6db1301592af5986:/lib/service/servicedvb.cpp

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index 497911c5..19bac206 100644
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -97,50 +97,9 @@ int eStaticServiceDVBInformation::isPlayable(const eServiceReference &ref, const
 }
 
 extern void PutToDict(ePyObject &dict, const char*key, long value);  // defined in dvb/frontend.cpp
-extern void PutToDict(ePyObject &dict, const char*key, ePyObject item); // defined in dvb/frontend.cpp
-extern void PutToDict(ePyObject &dict, const char*key, const char *value); // defined in dvb/frontend.cpp
-
-void PutSatelliteDataToDict(ePyObject &dict, eDVBFrontendParametersSatellite &feparm)
-{
-	PutToDict(dict, "tuner_type", "DVB-S");
-	PutToDict(dict, "frequency", feparm.frequency);
-	PutToDict(dict, "symbol_rate", feparm.symbol_rate);
-	PutToDict(dict, "orbital_position", feparm.orbital_position);
-	PutToDict(dict, "inversion", feparm.inversion);
-	PutToDict(dict, "fec_inner", feparm.fec);
-	PutToDict(dict, "modulation", feparm.modulation);
-	PutToDict(dict, "polarization", feparm.polarisation);
-	if (feparm.system == eDVBFrontendParametersSatellite::System_DVB_S2)
-	{
-		PutToDict(dict, "rolloff", feparm.rolloff);
-		PutToDict(dict, "pilot", feparm.pilot);
-	}
-	PutToDict(dict, "system", feparm.system);
-}
-
-void PutTerrestrialDataToDict(ePyObject &dict, eDVBFrontendParametersTerrestrial &feparm)
-{
-	PutToDict(dict, "tuner_type", "DVB-T");
-	PutToDict(dict, "frequency", feparm.frequency);
-	PutToDict(dict, "bandwidth", feparm.bandwidth);
-	PutToDict(dict, "code_rate_lp", feparm.code_rate_LP);
-	PutToDict(dict, "code_rate_hp", feparm.code_rate_HP);
-	PutToDict(dict, "constellation", feparm.modulation);
-	PutToDict(dict, "transmission_mode", feparm.transmission_mode);
-	PutToDict(dict, "guard_interval", feparm.guard_interval);
-	PutToDict(dict, "hierarchy_information", feparm.hierarchy);
-	PutToDict(dict, "inversion", feparm.inversion);
-}
-
-void PutCableDataToDict(ePyObject &dict, eDVBFrontendParametersCable &feparm)
-{
-	PutToDict(dict, "tuner_type", "DVB-C");
-	PutToDict(dict, "frequency", feparm.frequency);
-	PutToDict(dict, "symbol_rate", feparm.symbol_rate);
-	PutToDict(dict, "modulation", feparm.modulation);
-	PutToDict(dict, "inversion", feparm.inversion);
-	PutToDict(dict, "fec_inner", feparm.fec_inner);
-}
+extern void PutSatelliteDataToDict(ePyObject &dict, eDVBFrontendParametersSatellite &feparm); // defined in dvb/frontend.cpp
+extern void PutTerrestrialDataToDict(ePyObject &dict, eDVBFrontendParametersTerrestrial &feparm); // defined in dvb/frontend.cpp
+extern void PutCableDataToDict(ePyObject &dict, eDVBFrontendParametersCable &feparm); // defined in dvb/frontend.cpp
 
 PyObject *eStaticServiceDVBInformation::getInfoObject(const eServiceReference &r, int what)
 {
@@ -1070,6 +1029,9 @@ void eDVBServicePlay::serviceEvent(int event)
 		m_event((iPlayableService*)this, evUpdatedInfo);
 		break;
 	}
+	case eDVBServicePMTHandler::eventPreStart:
+		loadCuesheet();
+		break;
 	case eDVBServicePMTHandler::eventEOF:
 		m_event((iPlayableService*)this, evEOF);
 		break;
@@ -1102,22 +1064,30 @@ void eDVBServicePlay::serviceEventTimeshift(int event)
 
 RESULT eDVBServicePlay::start()
 {
-	int r;
+	eServiceReferenceDVB service = (eServiceReferenceDVB&)m_reference;
+
 		/* 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. */
 	if (m_is_pvr)
+	{
+		eDVBMetaParser meta;
+		if (!meta.parseFile(m_reference.path))
+		{
+			service = meta.m_ref;
+			service.path = m_reference.path;
+		}
 		m_cue = new eCueSheet();
+	}
 	else
 		m_event(this, evStart);
 
 	m_first_program_info = 1;
-	eServiceReferenceDVB &service = (eServiceReferenceDVB&)m_reference;
-	r = m_service_handler.tune(service, m_is_pvr, m_cue, false, m_dvb_service);
+	m_service_handler.tune(service, m_is_pvr, m_cue, false, m_dvb_service);
 
-		/* inject EIT if there is a stored one */
 	if (m_is_pvr)
 	{
+		/* inject EIT if there is a stored one */
 		std::string filename = service.path;
 		filename.erase(filename.length()-2, 2);
 		filename+="eit";
@@ -1128,11 +1098,6 @@ RESULT eDVBServicePlay::start()
 			m_event_handler.inject(event, 0);
 			m_event_handler.inject(empty, 1);
 		}
-	}
-
-	if (m_is_pvr)
-	{
-		loadCuesheet();
 		m_event(this, evStart);
 	}
 	return 0;
@@ -1795,21 +1760,26 @@ int eDVBServicePlay::selectAudioStream(int i)
 		return -4;
 	}
 
+	int rdsPid = apid;
+
 		/* if we are not in PVR mode, timeshift is not active and we are not in pip mode, check if we need to enable the rds reader */
 	if (!(m_is_pvr || m_timeshift_active || !m_is_primary))
-		if (!m_rds_decoder)
+	{
+		int different_pid = program.videoStreams.empty() && program.audioStreams.size() == 1 && program.audioStreams[stream].rdsPid != -1;
+		if (different_pid)
+			rdsPid = program.audioStreams[stream].rdsPid;
+		if (!m_rds_decoder || m_rds_decoder->getPid() != rdsPid)
 		{
+			m_rds_decoder = 0;
 			ePtr<iDVBDemux> data_demux;
 			if (!h.getDataDemux(data_demux))
 			{
-				m_rds_decoder = new eDVBRdsDecoder(data_demux);
+				m_rds_decoder = new eDVBRdsDecoder(data_demux, different_pid);
 				m_rds_decoder->connectEvent(slot(*this, &eDVBServicePlay::rdsDecoderEvent), m_rds_decoder_event_connection);
+				m_rds_decoder->start(rdsPid);
 			}
 		}
-
-		/* if we decided that we need one, update the pid */
-	if (m_rds_decoder)
-		m_rds_decoder->start(apid);
+	}
 
 			/* store new pid as default only when:
 				a.) we have an entry in the service db for the current service,