X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/cd883d9759844701ef57afa0cb03de7722acc5e5..eaba0ae47c605e932fc9a932ec6cd7928af15206:/lib/service/servicedvb.cpp

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index 1264b872..85961550 100644
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -174,7 +174,6 @@ int eStaticServiceDVBBouquetInformation::isPlayable(const eServiceReference &ref
 		{
 			((const eServiceReferenceDVB&)*it).getChannelID(chid);
 			int tmp=res->canAllocateChannel(chid, chid_ignore);
-			eDebug("%d %s", tmp, it->toString().c_str());
 			if (tmp > cur)
 			{
 				m_playable_service = *it;
@@ -193,6 +192,13 @@ int eStaticServiceDVBBouquetInformation::getLength(const eServiceReference &ref)
 	return -1;
 }
 
+#include <lib/dvb/epgcache.h>
+
+RESULT eStaticServiceDVBBouquetInformation::getEvent(const eServiceReference &ref, ePtr<eServiceEvent> &ptr, time_t start_time)
+{
+	return eEPGCache::getInstance()->lookupEventTime(ref, start_time, ptr);
+}
+
 class eStaticServiceDVBPVRInformation: public iStaticServiceInformation
 {
 	DECLARE_REF(eStaticServiceDVBPVRInformation);
@@ -723,6 +729,8 @@ eDVBServicePlay::eDVBServicePlay(const eServiceReference &ref, eDVBService *serv
 	
 	m_subtitle_widget = 0;
 	
+	m_tune_state = -1;
+	
 	CONNECT(m_subtitle_sync_timer.timeout, eDVBServicePlay::checkSubtitleTiming);
 }
 
@@ -749,6 +757,8 @@ void eDVBServicePlay::gotNewEvent()
 
 void eDVBServicePlay::serviceEvent(int event)
 {
+	m_tune_state = event;
+
 	switch (event)
 	{
 	case eDVBServicePMTHandler::eventTuned:
@@ -768,9 +778,12 @@ void eDVBServicePlay::serviceEvent(int event)
 		}
 		break;
 	}
+	case eDVBServicePMTHandler::eventNoPAT:
+	case eDVBServicePMTHandler::eventNoPATEntry:
+	case eDVBServicePMTHandler::eventNoPMT:
 	case eDVBServicePMTHandler::eventTuneFailed:
 	{
-		eDebug("DVB service failed to tune");
+		eDebug("DVB service failed to tune - error %d", event);
 		m_event((iPlayableService*)this, evTuneFailed);
 		break;
 	}
@@ -1204,18 +1217,21 @@ RESULT eDVBServicePlay::getEvent(ePtr<eServiceEvent> &evt, int nownext)
 int eDVBServicePlay::getInfo(int w)
 {
 	eDVBServicePMTHandler::program program;
-
+	
 	if (w == sCAIDs)
 		return resIsPyObject;
 
 	eDVBServicePMTHandler &h = m_timeshift_active ? m_service_handler_timeshift : m_service_handler;
 	
+	int no_program_info = 0;
+	
 	if (h.getProgramInfo(program))
-		return -1;
+		no_program_info = 1;
 	
 	switch (w)
 	{
 	case sAspect:
+		if (no_program_info) return -1; 
 		if (!program.videoStreams.empty() && program.videoStreams[0].component_tag != -1)
 		{
 			ePtr<eServiceEvent> evt;
@@ -1254,19 +1270,20 @@ int eDVBServicePlay::getInfo(int w)
 			}
 		}
 		return -1;
-	case sIsCrypted: return program.isCrypted();
-	case sVideoPID: if (program.videoStreams.empty()) return -1; return program.videoStreams[0].pid;
-	case sVideoType: if (program.videoStreams.empty()) return -1; return program.videoStreams[0].type;
-	case sAudioPID: if (program.audioStreams.empty()) return -1; return program.audioStreams[0].pid;
-	case sPCRPID: return program.pcrPid;
-	case sPMTPID: return program.pmtPid;
-	case sTXTPID: return program.textPid;
+	case sIsCrypted: if (no_program_info) return -1; return program.isCrypted();
+	case sVideoPID: if (no_program_info) return -1; if (program.videoStreams.empty()) return -1; return program.videoStreams[0].pid;
+	case sVideoType: if (no_program_info) return -1; if (program.videoStreams.empty()) return -1; return program.videoStreams[0].type;
+	case sAudioPID: if (no_program_info) return -1; if (program.audioStreams.empty()) return -1; return program.audioStreams[0].pid;
+	case sPCRPID: if (no_program_info) return -1; return program.pcrPid;
+	case sPMTPID: if (no_program_info) return -1; return program.pmtPid;
+	case sTXTPID: if (no_program_info) return -1; return program.textPid;
 	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;
 	case sServiceref: return resIsString;
+	case sDVBState: return m_tune_state;
 	default:
 		return -1;
 	}