X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2e2cf81de863a180f7d27dca89e5122e1eb0acaa..66238a69f495173897e7e1e62a7f05ff4356ae44:/lib/service/servicedvb.cpp?ds=sidebyside

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index 94833f44..d8206b9a 100644
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -66,7 +66,7 @@ RESULT eStaticServiceDVBBouquetInformation::getName(const eServiceReference &ref
 		return err;
 	}
 
-	const eBouquet *bouquet=0;
+	eBouquet *bouquet=0;
 	if ((err = db->getBouquet(ref, bouquet)) != 0)
 	{
 		eDebug("eStaticServiceDVBBouquetInformation::getName failed.. getBouquet failed!");
@@ -280,10 +280,9 @@ RESULT eDVBServiceList::startEdit(ePtr<iMutableServiceList> &res)
 		if (eDVBResourceManager::getInstance(resm) || resm->getChannelList(db))
 			return -1;
 
-			// FIXME!
-		if (db->getBouquet(m_parent, (const eBouquet*&)m_bouquet) != 0)
+		if (db->getBouquet(m_parent, m_bouquet) != 0)
 			return -1;
-		
+
 		res = this;
 		
 		return 0;
@@ -294,24 +293,30 @@ RESULT eDVBServiceList::startEdit(ePtr<iMutableServiceList> &res)
 
 RESULT eDVBServiceList::addService(eServiceReference &ref)
 {
-	ASSERT(m_bouquet);
-//	return m_bouquet->addService(ref);
-	return -1;
+	if (!m_bouquet)
+		return -1;
+	return m_bouquet->addService(ref);
 }
 
 RESULT eDVBServiceList::removeService(eServiceReference &ref)
 {
-	ASSERT(m_bouquet);
-//	return m_bouquet->removeService(ref);
-	return -1;
+	if (!m_bouquet)
+		return -1;
+	return m_bouquet->removeService(ref);
 }
 
 RESULT eDVBServiceList::moveService(eServiceReference &ref, int pos)
 {
-	ASSERT(m_bouquet);
-	
-//	return m_bouquet->moveService(ref, pos);
-	return -1;
+	if (!m_bouquet)
+		return -1;
+	return m_bouquet->moveService(ref, pos);
+}
+
+RESULT eDVBServiceList::flushChanges()
+{
+	if (!m_bouquet)
+		return -1;
+	return m_bouquet->flushChanges();
 }
 
 RESULT eServiceFactoryDVB::play(const eServiceReference &ref, ePtr<iPlayableService> &ptr)
@@ -473,7 +478,7 @@ void eDVBServicePlay::serviceEvent(int event)
 	}
 	case eDVBServicePMTHandler::eventNewProgramInfo:
 	{
-		int vpid = -1, apid = -1, pcrpid = -1;
+		int vpid = -1, apid = -1, apidtype = -1, pcrpid = -1;
 		eDVBServicePMTHandler::program program;
 		if (m_service_handler.getProgramInfo(program))
 			eDebug("getting program info failed.");
@@ -504,7 +509,10 @@ void eDVBServicePlay::serviceEvent(int event)
 					i != program.audioStreams.end(); ++i)
 				{
 					if (apid == -1)
+					{
 						apid = i->pid;
+						apidtype = i->type;
+					}
 					if (i != program.audioStreams.begin())
 						eDebugNoNewLine(", ");
 					eDebugNoNewLine("%04x", i->pid);
@@ -527,7 +535,7 @@ void eDVBServicePlay::serviceEvent(int event)
 		if (m_decoder)
 		{
 			m_decoder->setVideoPID(vpid);
-			m_decoder->setAudioPID(apid, 0);
+			m_decoder->setAudioPID(apid, apidtype);
 			if (!m_is_pvr)
 				m_decoder->setSyncPCR(pcrpid);
 			else
@@ -644,7 +652,14 @@ RESULT eDVBServicePlay::seekRelative(int direction, pts_t to)
 	if (m_service_handler.getPVRChannel(pvr_channel))
 		return -1;
 	
-	return pvr_channel->seekToPosition(SEEK_CUR, 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)
@@ -654,7 +669,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)
@@ -663,6 +683,12 @@ RESULT eDVBServicePlay::info(ePtr<iServiceInformation> &ptr)
 	return 0;
 }
 
+RESULT eDVBServicePlay::audioTracks(ePtr<iAudioTrackSelection> &ptr)
+{
+	ptr = this;
+	return 0;
+}
+
 RESULT eDVBServicePlay::getName(std::string &name)
 {
 	if (m_dvb_service)
@@ -680,6 +706,58 @@ RESULT eDVBServicePlay::getEvent(ePtr<eServiceEvent> &evt, int nownext)
 	return m_event_handler.getEvent(evt, nownext);
 }
 
+int eDVBServicePlay::getNumberOfTracks()
+{
+	eDVBServicePMTHandler::program program;
+	if (m_service_handler.getProgramInfo(program))
+		return 0;
+	return program.audioStreams.size();
+}
+
+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;
+
+	if (m_decoder->start())
+		return -5;
+	
+	return 0;
+}
+
+RESULT eDVBServicePlay::getTrackInfo(struct iAudioTrackInfo &info, unsigned int i)
+{
+	eDVBServicePMTHandler::program program;
+
+	if (m_service_handler.getProgramInfo(program))
+		return -1;
+	
+	if (i >= program.audioStreams.size())
+		return -2;
+	
+	if (program.audioStreams[i].type == eDVBServicePMTHandler::audioStream::atMPEG)
+		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::atDTS)
+		info.m_description = "DTS";
+	else
+		info.m_description = "???";
+	
+	return 0;
+}
+
 DEFINE_REF(eDVBServicePlay)
 
 eAutoInitPtr<eServiceFactoryDVB> init_eServiceFactoryDVB(eAutoInitNumbers::service+1, "eServiceFactoryDVB");