X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/9b7c5648eaf5f63da9c4f871652e9334446d3bf7..11191e49b6c976338265d026ae33477a1d97fb9b:/lib/service/servicedvb.cpp

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index 10de6213..75b55215 100644
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -21,6 +21,7 @@
 #include <lib/gui/esubtitle.h>
 
 #include <sys/vfs.h>
+#include <sys/stat.h>
 
 #include <byteswap.h>
 #include <netinet/in.h>
@@ -312,6 +313,9 @@ eServiceFactoryDVB::eServiceFactoryDVB()
 	eServiceCenter::getPrivInstance(sc);
 	if (sc)
 		sc->addServiceFactory(eServiceFactoryDVB::id, this);
+
+	m_StaticServiceDVBInfo = new eStaticServiceDVBInformation;
+	m_StaticServiceDVBBouquetInfo = new eStaticServiceDVBBouquetInformation;
 }
 
 eServiceFactoryDVB::~eServiceFactoryDVB()
@@ -506,11 +510,11 @@ RESULT eDVBServiceList::startEdit(ePtr<iMutableServiceList> &res)
 	return -1;
 }
 
-RESULT eDVBServiceList::addService(eServiceReference &ref)
+RESULT eDVBServiceList::addService(eServiceReference &ref, eServiceReference before)
 {
 	if (!m_bouquet)
 		return -1;
-	return m_bouquet->addService(ref);
+	return m_bouquet->addService(ref, before);
 }
 
 RESULT eDVBServiceList::removeService(eServiceReference &ref)
@@ -584,9 +588,9 @@ RESULT eServiceFactoryDVB::info(const eServiceReference &ref, ePtr<iStaticServic
 	if ((ref.flags & eServiceReference::flagDirectory) == eServiceReference::flagDirectory) // bouquet
 	{
 		if ( !ref.name.empty() )  // satellites or providers list
-			ptr = new eStaticServiceDVBInformation;
+			ptr = m_StaticServiceDVBInfo;
 		else // a dvb bouquet
-			ptr = new eStaticServiceDVBBouquetInformation;
+			ptr = m_StaticServiceDVBBouquetInfo;
 	}
 	else if (!ref.path.empty()) /* do we have a PVR service? */
 		ptr = new eStaticServiceDVBPVRInformation(ref);
@@ -594,7 +598,7 @@ RESULT eServiceFactoryDVB::info(const eServiceReference &ref, ePtr<iStaticServic
 	{
 		ePtr<eDVBService> service;
 		if (lookupService(service, ref)) // no eDVBService avail for this reference ( Linkage Services... )
-			ptr = new eStaticServiceDVBInformation;
+			ptr = m_StaticServiceDVBInfo;
 		else
 			/* eDVBService has the iStaticServiceInformation interface, so we pass it here. */
 			ptr = service;
@@ -823,7 +827,12 @@ RESULT eDVBServicePlay::stop()
 	m_service_handler.free();
 	
 	if (m_is_pvr && m_cuesheet_changed)
-		saveCuesheet();
+	{
+		struct stat s;
+				/* save cuesheet only when main file is accessible. */
+		if (!::stat(m_reference.path.c_str(), &s))
+			saveCuesheet();
+	}
 	
 	return 0;
 }
@@ -1106,6 +1115,12 @@ RESULT eDVBServicePlay::audioDelay(ePtr<iAudioDelay> &ptr)
 	return 0;
 }
 
+RESULT eDVBServicePlay::radioText(ePtr<iRadioText> &ptr)
+{
+	ptr = this;
+	return 0;
+}
+
 RESULT eDVBServicePlay::getName(std::string &name)
 {
 	if (m_is_pvr)
@@ -1185,7 +1200,7 @@ int eDVBServicePlay::getInfo(int w)
 	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 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;
@@ -1296,21 +1311,23 @@ int eDVBServicePlay::selectAudioStream(int i)
 	if (m_decoder->setAudioPID(program.audioStreams[i].pid, program.audioStreams[i].type))
 		return -4;
 
+	if (m_radiotext_parser)
+		m_radiotext_parser->start(program.audioStreams[i].pid);
+
 	if (m_dvb_service && !m_is_pvr)
 	{
 		if (program.audioStreams[i].type == eDVBAudio::aMPEG)
 		{
 			m_dvb_service->setCacheEntry(eDVBService::cAPID, program.audioStreams[i].pid);
 			m_dvb_service->setCacheEntry(eDVBService::cAC3PID, -1);
-		}	else
+		}
+		else
 		{
 			m_dvb_service->setCacheEntry(eDVBService::cAPID, -1);
 			m_dvb_service->setCacheEntry(eDVBService::cAC3PID, program.audioStreams[i].pid);
 		}
 	}
 
-	m_current_audio_stream = i;
-
 	return 0;
 }
 
@@ -1330,6 +1347,22 @@ RESULT eDVBServicePlay::selectChannel(int i)
 	return 0;
 }
 
+std::string eDVBServicePlay::getRadioText(int x)
+{
+	if (m_radiotext_parser)
+		switch(x)
+		{
+			case 0:
+				return m_radiotext_parser->getCurrentText();
+		}
+	return "";
+}
+
+void eDVBServicePlay::radioTextUpdated()
+{
+	m_event((iPlayableService*)this, evUpdatedRadioText);
+}
+
 int eDVBServiceBase::getFrontendInfo(int w)
 {
 	eUsePtr<iDVBChannel> channel;
@@ -1602,7 +1635,9 @@ void eDVBServicePlay::switchToLive()
 	m_decoder = 0;
 	m_decode_demux = 0;
 	m_teletext_parser = 0;
+	m_radiotext_parser = 0;
 	m_new_subtitle_page_connection = 0;
+	m_radiotext_updated_connection = 0;
 	
 		/* free the timeshift service handler, we need the resources */
 	m_service_handler_timeshift.free();
@@ -1621,8 +1656,10 @@ void eDVBServicePlay::switchToTimeshift()
 	m_decode_demux = 0;
 	m_decoder = 0;
 	m_teletext_parser = 0;
+	m_radiotext_parser = 0;
 	m_new_subtitle_page_connection = 0;
-	
+	m_radiotext_updated_connection = 0;
+
 	m_timeshift_active = 1;
 
 	m_event((iPlayableService*)this, evSeekableStatusChanged);
@@ -1749,10 +1786,21 @@ void eDVBServicePlay::updateDecoder()
 		m_decoder->setPCMDelay(pcm_delay == -1 ? 0 : pcm_delay);
 
 		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))
+		{
 			m_decoder->setSyncPCR(pcrpid);
+			if (apid != -1)
+			{
+				ePtr<iDVBDemux> data_demux;
+				if (!h.getDataDemux(data_demux))
+				{
+					m_radiotext_parser = new eDVBRadioTextParser(data_demux);
+					m_radiotext_parser->connectUpdatedRadiotext(slot(*this, &eDVBServicePlay::radioTextUpdated), m_radiotext_updated_connection);
+					m_radiotext_parser->start(apid);
+				}
+			}
+		}
 		else
 			m_decoder->setSyncPCR(-1);