X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4e8cae716ad3fdf29a7b2a45e5eec0a530f93277..457ccb7da5d147837110a6be85b7f2d041e1dcba:/lib/service/servicedvb.cpp

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index 0ec488fe..9cfe7073 100644
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -985,7 +985,7 @@ RESULT eDVBServicePlay::isCurrentlySeekable()
 	return m_is_pvr || m_timeshift_active;
 }
 
-RESULT eDVBServicePlay::frontendStatusInfo(ePtr<iFrontendStatusInformation> &ptr)
+RESULT eDVBServicePlay::frontendInfo(ePtr<iFrontendInformation> &ptr)
 {
 	ptr = this;
 	return 0;
@@ -1129,7 +1129,7 @@ int eDVBServicePlay::getInfo(int w)
 			}
 		}
 		return -1;
-	case sIsCrypted: return program.isCrypted;
+	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[m_current_audio_stream].pid;
@@ -1203,6 +1203,8 @@ RESULT eDVBServicePlay::getTrackInfo(struct iAudioTrackInfo &info, unsigned int
 		info.m_description = "MPEG";
 	else if (program.audioStreams[i].type == eDVBServicePMTHandler::audioStream::atAC3)
 		info.m_description = "AC3";
+	else if (program.audioStreams[i].type == eDVBServicePMTHandler::audioStream::atAAC)
+		info.m_description = "AAC";
 	else  if (program.audioStreams[i].type == eDVBServicePMTHandler::audioStream::atDTS)
 		info.m_description = "DTS";
 	else
@@ -1277,10 +1279,8 @@ RESULT eDVBServicePlay::selectChannel(int i)
 	}
 }
 
-int eDVBServicePlay::getFrontendInfo(int w)
+int eDVBServiceBase::getFrontendInfo(int w)
 {
-	if (m_is_pvr)
-		return 0;
 	eUsePtr<iDVBChannel> channel;
 	if(m_service_handler.getChannel(channel))
 		return 0;
@@ -1290,7 +1290,7 @@ int eDVBServicePlay::getFrontendInfo(int w)
 	return fe->readFrontendData(w);
 }
 
-PyObject *eDVBServicePlay::getFrontendData(bool original)
+PyObject *eDVBServiceBase::getFrontendData(bool original)
 {
 	PyObject *ret=0;
 
@@ -1699,7 +1699,7 @@ void eDVBServicePlay::updateDecoder()
 				m_dvb_service->setCacheEntry(eDVBService::cAC3PID, apid);
 			}
 			m_dvb_service->setCacheEntry(eDVBService::cVPID, vpid);
-			m_dvb_service->setCacheEntry(eDVBService::cVTYPE, vpidtype);
+			m_dvb_service->setCacheEntry(eDVBService::cVTYPE, vpidtype == eDVBVideo::MPEG2 ? -1 : vpidtype);
 			m_dvb_service->setCacheEntry(eDVBService::cPCRPID, pcrpid);
 			m_dvb_service->setCacheEntry(eDVBService::cTPID, tpid);
 		}