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

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index 192d3a64..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;
@@ -997,6 +997,12 @@ RESULT eDVBServicePlay::info(ePtr<iServiceInformation> &ptr)
 	return 0;
 }
 
+RESULT eDVBServicePlay::audioChannel(ePtr<iAudioChannelSelection> &ptr)
+{
+	ptr = this;
+	return 0;
+}
+
 RESULT eDVBServicePlay::audioTracks(ePtr<iAudioTrackSelection> &ptr)
 {
 	ptr = this;
@@ -1123,8 +1129,9 @@ 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;
 	case sPCRPID: return program.pcrPid;
 	case sPMTPID: return program.pmtPid;
@@ -1196,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
@@ -1238,12 +1247,12 @@ int eDVBServicePlay::selectAudioStream(int i)
 	{
 		if (program.audioStreams[i].type == eDVBAudio::aMPEG)
 		{
-			m_dvb_service->setCachePID(eDVBService::cAPID, program.audioStreams[i].pid);
-			m_dvb_service->setCachePID(eDVBService::cAC3PID, -1);
+			m_dvb_service->setCacheEntry(eDVBService::cAPID, program.audioStreams[i].pid);
+			m_dvb_service->setCacheEntry(eDVBService::cAC3PID, -1);
 		}	else
 		{
-			m_dvb_service->setCachePID(eDVBService::cAPID, -1);
-			m_dvb_service->setCachePID(eDVBService::cAC3PID, program.audioStreams[i].pid);
+			m_dvb_service->setCacheEntry(eDVBService::cAPID, -1);
+			m_dvb_service->setCacheEntry(eDVBService::cAC3PID, program.audioStreams[i].pid);
 		}
 	}
 
@@ -1252,10 +1261,26 @@ int eDVBServicePlay::selectAudioStream(int i)
 	return 0;
 }
 
-int eDVBServicePlay::getFrontendInfo(int w)
+int eDVBServicePlay::getCurrentChannel()
+{
+	int curChannel = m_dvb_service->getCacheEntry(eDVBService::cACHANNEL);
+	return curChannel == -1 ? STEREO : curChannel;
+}
+
+RESULT eDVBServicePlay::selectChannel(int i)
+{
+	if (i < iAudioChannelSelection::LEFT || i > iAudioChannelSelection::RIGHT)
+		i = -1;  // Stereo
+	if (m_dvb_service->getCacheEntry(eDVBService::cACHANNEL) != i)
+	{
+		m_dvb_service->setCacheEntry(eDVBService::cACHANNEL, i);
+		if (m_decoder)
+			m_decoder->setAudioChannel(i);
+	}
+}
+
+int eDVBServiceBase::getFrontendInfo(int w)
 {
-	if (m_is_pvr)
-		return 0;
 	eUsePtr<iDVBChannel> channel;
 	if(m_service_handler.getChannel(channel))
 		return 0;
@@ -1265,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;
 
@@ -1559,7 +1584,7 @@ void eDVBServicePlay::switchToTimeshift()
 
 void eDVBServicePlay::updateDecoder()
 {
-	int vpid = -1, apid = -1, apidtype = -1, pcrpid = -1, tpid = -1;
+	int vpid = -1, vpidtype = -1, apid = -1, apidtype = -1, pcrpid = -1, tpid = -1, achannel = -1;
 	eDVBServicePMTHandler &h = m_timeshift_active ? m_service_handler_timeshift : m_service_handler;
 
 	bool defaultac3=false;
@@ -1582,7 +1607,10 @@ void eDVBServicePlay::updateDecoder()
 				i != program.videoStreams.end(); ++i)
 			{
 				if (vpid == -1)
+				{
 					vpid = i->pid;
+					vpidtype = i->type;
+				}
 				if (i != program.videoStreams.begin())
 					eDebugNoNewLine(", ");
 				eDebugNoNewLine("%04x", i->pid);
@@ -1615,6 +1643,7 @@ void eDVBServicePlay::updateDecoder()
 		pcrpid = program.pcrPid;
 		eDebug(", and the text pid is %04x", program.textPid);
 		tpid = program.textPid;
+		achannel = program.audioChannel;
 	}
 
 	if (!m_decoder)
@@ -1631,7 +1660,7 @@ void eDVBServicePlay::updateDecoder()
 
 	if (m_decoder)
 	{
-		m_decoder->setVideoPID(vpid);
+		m_decoder->setVideoPID(vpid, vpidtype);
 		m_current_audio_stream = 0;
 		m_decoder->setAudioPID(apid, apidtype);
 		if (!(m_is_pvr || m_timeshift_active || !m_is_primary))
@@ -1647,7 +1676,11 @@ void eDVBServicePlay::updateDecoder()
 
 		if (!m_is_primary)
 			m_decoder->setTrickmode(1);
+
 		m_decoder->start();
+
+		m_decoder->setAudioChannel(achannel);
+
 // how we can do this better?
 // update cache pid when the user changed the audio track or video track
 // TODO handling of difference audio types.. default audio types..
@@ -1657,17 +1690,18 @@ void eDVBServicePlay::updateDecoder()
 		{
 			if (apidtype == eDVBAudio::aMPEG)
 			{
-				m_dvb_service->setCachePID(eDVBService::cAPID, apid);
-				m_dvb_service->setCachePID(eDVBService::cAC3PID, -1);
+				m_dvb_service->setCacheEntry(eDVBService::cAPID, apid);
+				m_dvb_service->setCacheEntry(eDVBService::cAC3PID, -1);
 			}
 			else
 			{
-				m_dvb_service->setCachePID(eDVBService::cAPID, -1);
-				m_dvb_service->setCachePID(eDVBService::cAC3PID, apid);
+				m_dvb_service->setCacheEntry(eDVBService::cAPID, -1);
+				m_dvb_service->setCacheEntry(eDVBService::cAC3PID, apid);
 			}
-			m_dvb_service->setCachePID(eDVBService::cVPID, vpid);
-			m_dvb_service->setCachePID(eDVBService::cPCRPID, pcrpid);
-			m_dvb_service->setCachePID(eDVBService::cTPID, tpid);
+			m_dvb_service->setCacheEntry(eDVBService::cVPID, vpid);
+			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);
 		}
 	}
 }