X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/cc8dceba41cdc3f1cb5a16c86bd3676101233c00..4053f8453d48e7552227611fa7ca1d264bcd4311:/lib/dvb/pmt.cpp

diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp
index 4047be5c..39a2c3d7 100644
--- a/lib/dvb/pmt.cpp
+++ b/lib/dvb/pmt.cpp
@@ -50,9 +50,9 @@ void eDVBServicePMTHandler::channelStateChanged(iDVBChannel *channel)
 			eDebug("ok ... now we start!!");
 
 			if (m_pmt_pid == -1)
-				m_PAT.begin(eApp, eDVBPATSpec(), m_demux);
+				m_PAT.begin(eApp, eDVBPATSpec(m_reference.path.empty() ? false : true), m_demux);
 			else
-				m_PMT.begin(eApp, eDVBPMTSpec(m_pmt_pid, m_reference.getServiceID().get()), m_demux);
+				m_PMT.begin(eApp, eDVBPMTSpec(m_pmt_pid, m_reference.getServiceID().get(), m_reference.path.empty() ? false : true), m_demux);
 
 			if ( m_service && !m_service->cacheEmpty() )
 				serviceEvent(eventNewProgramInfo);
@@ -135,7 +135,7 @@ void eDVBServicePMTHandler::PATready(int)
 		if (pmtpid == -1)
 			serviceEvent(eventNoPATEntry);
 		else
-			m_PMT.begin(eApp, eDVBPMTSpec(pmtpid, m_reference.getServiceID().get()), m_demux);
+			m_PMT.begin(eApp, eDVBPMTSpec(pmtpid, m_reference.getServiceID().get(), m_reference.path.empty() ? false : true), m_demux);
 	} else
 		serviceEvent(eventNoPAT);
 }
@@ -251,11 +251,22 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program)
 									for (SubtitlingConstIterator it(list->begin()); it != list->end(); ++it)
 									{
 										s.subtitling_type = (*it)->getSubtitlingType();
+										switch(s.subtitling_type)
+										{
+										case 0x10 ... 0x13:
+										case 0x20 ... 0x23: // dvb subtitles
+											break;
+										default:
+											eDebug("dvb subtitle %s PID %04x with wrong subtitling type (%02x)... force 0x10!!",
+												s.language_code.c_str(), s.pid, s.subtitling_type);
+											s.subtitling_type = 0x10;
+											break;
+										}
 										s.composition_page_id = (*it)->getCompositionPageId();
 										s.ancillary_page_id = (*it)->getAncillaryPageId();
 										s.language_code = (*it)->getIso639LanguageCode();
-	//									eDebug("add dvb subtitle %s PID %04x, type %d, composition page %d, ancillary_page %d",
-	//										s.language_code.c_str(), s.pid, s.subtitling_type, s.composition_page_id, s.ancillary_page_id);
+//										eDebug("add dvb subtitle %s PID %04x, type %d, composition page %d, ancillary_page %d",
+//											s.language_code.c_str(), s.pid, s.subtitling_type, s.composition_page_id, s.ancillary_page_id);
 										program.subtitleStreams.push_back(s);
 									}
 									break;
@@ -524,9 +535,9 @@ void eDVBServicePMTHandler::SDTScanEvent(int event)
 	}
 }
 
-int eDVBServicePMTHandler::tune(eServiceReferenceDVB &ref, int use_decode_demux, eCueSheet *cue)
+int eDVBServicePMTHandler::tune(eServiceReferenceDVB &ref, int use_decode_demux, eCueSheet *cue, bool simulate)
 {
-	RESULT res;
+	RESULT res=0;
 	m_reference = ref;
 	
 	m_use_decode_demux = use_decode_demux;
@@ -536,16 +547,17 @@ int eDVBServicePMTHandler::tune(eServiceReferenceDVB &ref, int use_decode_demux,
 	{
 		eDVBChannelID chid;
 		ref.getChannelID(chid);
-		res = m_resourceManager->allocateChannel(chid, m_channel);
-		eDebug("allocate Channel: res %d", res);
+		res = m_resourceManager->allocateChannel(chid, m_channel, simulate);
+		if (!simulate)
+			eDebug("allocate Channel: res %d", res);
 
 		ePtr<iDVBChannelList> db;
 		if (!m_resourceManager->getChannelList(db))
-				db->getService((eServiceReferenceDVB&)m_reference, m_service);
+			db->getService((eServiceReferenceDVB&)m_reference, m_service);
 
-		if (!res)
+		if (!res && !simulate)
 			eDVBCIInterfaces::getInstance()->addPMTHandler(this);
-	} else
+	} else if (!simulate) // no simulation of playback services
 	{
 		eDVBMetaParser parser;
 
@@ -577,37 +589,40 @@ int eDVBServicePMTHandler::tune(eServiceReferenceDVB &ref, int use_decode_demux,
 		m_channel = m_pvr_channel;
 	}
 
-	if (m_channel)
+	if (!simulate)
 	{
-		m_channel->connectStateChange(
-			slot(*this, &eDVBServicePMTHandler::channelStateChanged), 
-			m_channelStateChanged_connection);
-		m_last_channel_state = -1;
-		channelStateChanged(m_channel);
-
-		m_channel->connectEvent(
-			slot(*this, &eDVBServicePMTHandler::channelEvent), 
-			m_channelEvent_connection);
+		if (m_channel)
+		{
+			m_channel->connectStateChange(
+				slot(*this, &eDVBServicePMTHandler::channelStateChanged), 
+				m_channelStateChanged_connection);
+			m_last_channel_state = -1;
+			channelStateChanged(m_channel);
+	
+			m_channel->connectEvent(
+				slot(*this, &eDVBServicePMTHandler::channelEvent), 
+				m_channelEvent_connection);
 
-		if (ref.path.empty())
+			if (ref.path.empty())
+			{
+				delete m_dvb_scan;
+				m_dvb_scan = new eDVBScan(m_channel, true, false);
+				m_dvb_scan->connectEvent(slot(*this, &eDVBServicePMTHandler::SDTScanEvent), m_scan_event_connection);
+			}
+		} else
 		{
-			delete m_dvb_scan;
-			m_dvb_scan = new eDVBScan(m_channel, true, false);
-			m_dvb_scan->connectEvent(slot(*this, &eDVBServicePMTHandler::SDTScanEvent), m_scan_event_connection);
+			if (res == eDVBResourceManager::errAllSourcesBusy)
+				serviceEvent(eventNoResources);
+			else /* errChidNotFound, errNoChannelList, errChannelNotInList, errNoSourceFound */
+				serviceEvent(eventMisconfiguration);
+			return res;
 		}
-	} else
-	{
-		if (res == eDVBResourceManager::errAllSourcesBusy)
-			serviceEvent(eventNoResources);
-		else /* errChidNotFound, errNoChannelList, errChannelNotInList, errNoSourceFound */
-			serviceEvent(eventMisconfiguration);
-		return res;
-	}
 
-	if (m_pvr_channel)
-	{
-		m_pvr_channel->setCueSheet(cue);
-		m_pvr_channel->playFile(ref.path.c_str());
+		if (m_pvr_channel)
+		{
+			m_pvr_channel->setCueSheet(cue);
+			m_pvr_channel->playFile(ref.path.c_str());
+		}
 	}
 
 	return res;
@@ -642,6 +657,7 @@ void eDVBServicePMTHandler::free()
 		m_pvr_channel->stopFile();
 		m_pvr_channel->setCueSheet(0);
 	}
+
 	m_PMT.stop();
 	m_PAT.stop();
 	m_service = 0;