X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4c9293c08de2abe11f03d15f6515201348bc41f1..c9474b61671ed008fc7f18f8bbaafe0fd0a39dd2:/lib/service/servicedvb.cpp

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index 47956dfa..85961550 100644
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -757,7 +757,6 @@ void eDVBServicePlay::gotNewEvent()
 
 void eDVBServicePlay::serviceEvent(int event)
 {
-	eDebug("service %p: error %d", this, event);
 	m_tune_state = event;
 
 	switch (event)
@@ -1219,8 +1218,6 @@ int eDVBServicePlay::getInfo(int w)
 {
 	eDVBServicePMTHandler::program program;
 	
-	eDebug("get info in %p", this);
-
 	if (w == sCAIDs)
 		return resIsPyObject;
 
@@ -1231,11 +1228,10 @@ int eDVBServicePlay::getInfo(int w)
 	if (h.getProgramInfo(program))
 		no_program_info = 1;
 	
-	eDebug("ok");
 	switch (w)
 	{
 	case sAspect:
-		if (!no_program_info) return -1; 
+		if (no_program_info) return -1; 
 		if (!program.videoStreams.empty() && program.videoStreams[0].component_tag != -1)
 		{
 			ePtr<eServiceEvent> evt;
@@ -1274,13 +1270,13 @@ int eDVBServicePlay::getInfo(int w)
 			}
 		}
 		return -1;
-	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 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();