X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/81b381e1f5dd38ad1b80a3b3d96060b89a5fab6c..2d01fd232419dbb9edaf7eb42f587dc635d21d42:/lib/service/servicedvb.cpp

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index d8206b9a..271b94f0 100644
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -25,7 +25,7 @@ DEFINE_REF(eStaticServiceDVBInformation);
 
 RESULT eStaticServiceDVBInformation::getName(const eServiceReference &ref, std::string &name)
 {
-	if ( ref.name.length() )
+	if ( !ref.name.empty() )
 	{
 		name = ref.name;
 		return 0;
@@ -358,22 +358,25 @@ RESULT eServiceFactoryDVB::list(const eServiceReference &ref, ePtr<iListableServ
 
 RESULT eServiceFactoryDVB::info(const eServiceReference &ref, ePtr<iStaticServiceInformation> &ptr)
 {
-		/* do we have a PVR service? */
-	if (ref.flags & eServiceReference::flagDirectory) // bouquet
+	/* is a listable service? */
+	if ((ref.flags & eServiceReference::flagDirectory) == eServiceReference::flagDirectory) // bouquet
 	{
-		ptr = new eStaticServiceDVBBouquetInformation;
+		if ( !ref.name.empty() )  // satellites or providers list
+			ptr = new eStaticServiceDVBInformation;
+		else // a dvb bouquet
+			ptr = new eStaticServiceDVBBouquetInformation;
 		return 0;
 	}
-	else if (!ref.path.empty())
+	else if (!ref.path.empty()) /* do we have a PVR service? */
 	{
 		ptr = new eStaticServiceDVBPVRInformation(ref);
 		return 0;
 	}
-	else
+	else // normal dvb service
 	{
 		ePtr<eDVBService> service;
 		int r = lookupService(service, ref);
-		if (r)
+		if (r) // no eDVBService avail for this reference ( Linkage Services... )
 			ptr = new eStaticServiceDVBInformation;
 		else
 			/* eDVBService has the iStaticServiceInformation interface, so we pass it here. */
@@ -535,6 +538,7 @@ void eDVBServicePlay::serviceEvent(int event)
 		if (m_decoder)
 		{
 			m_decoder->setVideoPID(vpid);
+			m_current_audio_stream = 0;
 			m_decoder->setAudioPID(apid, apidtype);
 			if (!m_is_pvr)
 				m_decoder->setSyncPCR(pcrpid);
@@ -677,6 +681,12 @@ RESULT eDVBServicePlay::getPlayPosition(pts_t &pos)
 	return pvr_channel->getCurrentPosition(demux, pos);
 }
 
+RESULT eDVBServicePlay::frontendStatusInfo(ePtr<iFrontendStatusInformation> &ptr)
+{
+	ptr = this;
+	return 0;
+}
+
 RESULT eDVBServicePlay::info(ePtr<iServiceInformation> &ptr)
 {
 	ptr = this;
@@ -706,6 +716,43 @@ RESULT eDVBServicePlay::getEvent(ePtr<eServiceEvent> &evt, int nownext)
 	return m_event_handler.getEvent(evt, nownext);
 }
 
+int eDVBServicePlay::getInfo(int w)
+{
+	eDVBServicePMTHandler::program program;
+
+	if (m_service_handler.getProgramInfo(program))
+		return -1;
+	
+	switch (w)
+	{
+	case sVideoPID: if (program.videoStreams.empty()) return -1; return program.videoStreams[0].pid;
+	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 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();
+	case sNamespace: return ((const eServiceReferenceDVB&)m_reference).getDVBNamespace().get();
+	case sProvider: if (!m_dvb_service) return -1; return -2;
+	default:
+		return -1;
+	}
+}
+
+std::string eDVBServicePlay::getInfoString(int w)
+{	
+	switch (w)
+	{
+	case sProvider:
+		if (!m_dvb_service) return "";
+		return m_dvb_service->m_provider_name;
+	default:
+		return "";
+	}
+}
+
 int eDVBServicePlay::getNumberOfTracks()
 {
 	eDVBServicePMTHandler::program program;
@@ -716,24 +763,12 @@ int eDVBServicePlay::getNumberOfTracks()
 
 RESULT eDVBServicePlay::selectTrack(unsigned int i)
 {
-	eDVBServicePMTHandler::program program;
-
-	if (m_service_handler.getProgramInfo(program))
-		return -1;
-	
-	if (i >= program.audioStreams.size())
-		return -2;
-	
-	if (!m_decoder)
-		return -3;
-	
-	if (m_decoder->setAudioPID(program.audioStreams[i].pid, program.audioStreams[i].type))
-		return -4;
+	int ret = selectAudioStream(i);
 
 	if (m_decoder->start())
 		return -5;
-	
-	return 0;
+
+	return ret;
 }
 
 RESULT eDVBServicePlay::getTrackInfo(struct iAudioTrackInfo &info, unsigned int i)
@@ -755,9 +790,46 @@ RESULT eDVBServicePlay::getTrackInfo(struct iAudioTrackInfo &info, unsigned int
 	else
 		info.m_description = "???";
 	
+		/* CHECK here for component tag override. */
+	info.m_language = program.audioStreams[i].language_code;
+	
 	return 0;
 }
 
+int eDVBServicePlay::selectAudioStream(int i)
+{
+	eDVBServicePMTHandler::program program;
+
+	if (m_service_handler.getProgramInfo(program))
+		return -1;
+	
+	if (i >= program.audioStreams.size())
+		return -2;
+	
+	if (!m_decoder)
+		return -3;
+	
+	if (m_decoder->setAudioPID(program.audioStreams[i].pid, program.audioStreams[i].type))
+		return -4;
+
+	m_current_audio_stream = i;
+
+	return 0;
+}
+
+int eDVBServicePlay::getFrontendInfo(int w)
+{
+	if (m_is_pvr)
+		return 0;
+	eUsePtr<iDVBChannel> channel;
+	if(m_service_handler.getChannel(channel))
+		return 0;
+	ePtr<iDVBFrontend> fe;
+	if(channel->getFrontend(fe))
+		return 0;
+	return fe->readFrontendData(w);
+}
+
 DEFINE_REF(eDVBServicePlay)
 
 eAutoInitPtr<eServiceFactoryDVB> init_eServiceFactoryDVB(eAutoInitNumbers::service+1, "eServiceFactoryDVB");