X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/19b9689ab36c01096cdb672d8c54c176808e0894..f15ee3f6cd34e4552f50dcc92a994198ed3b2dfe:/lib/service/servicedvb.cpp

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index d49c5f6d..14326914 100644
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -359,9 +359,12 @@ 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
+	if ((ref.flags & eServiceReference::flagDirectory) == eServiceReference::flagDirectory) // bouquet
 	{
-		ptr = new eStaticServiceDVBBouquetInformation;
+		if ( !ref.name.empty() )
+			ptr = new eStaticServiceDVBInformation;
+		else
+			ptr = new eStaticServiceDVBBouquetInformation;
 		return 0;
 	}
 	else if (!ref.path.empty())
@@ -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);
@@ -652,8 +656,14 @@ RESULT eDVBServicePlay::seekRelative(int direction, pts_t to)
 	if (m_service_handler.getPVRChannel(pvr_channel))
 		return -1;
 	
-			/* this is of couse wrong: PTS values don't match with bytes. */
-	return pvr_channel->seekToPosition(SEEK_CUR, direction * to);
+	to *= direction;
+	
+	ePtr<iDVBDemux> demux;
+	m_service_handler.getDemux(demux);
+	if (!demux)
+		return -1;
+	
+	return pvr_channel->seekTo(demux, 1, to);
 }
 
 RESULT eDVBServicePlay::getPlayPosition(pts_t &pos)
@@ -663,7 +673,12 @@ RESULT eDVBServicePlay::getPlayPosition(pts_t &pos)
 	if (m_service_handler.getPVRChannel(pvr_channel))
 		return -1;
 	
-	return pvr_channel->getCurrentPosition(pos);
+	ePtr<iDVBDemux> demux;
+	m_service_handler.getDemux(demux);
+	if (!demux)
+		return -1;
+	
+	return pvr_channel->getCurrentPosition(demux, pos);
 }
 
 RESULT eDVBServicePlay::info(ePtr<iServiceInformation> &ptr)
@@ -695,6 +710,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;
@@ -705,24 +757,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)
@@ -744,6 +784,30 @@ 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;
 }