X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/a29bbc0a4ee2eb5f0d86407088380de9887359a0..0c59a4279f93f08fe95fca5f2e55f3e025f0cceb:/lib/dvb/pmt.cpp?ds=sidebyside

diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp
index 4408bde4..80fbcab3 100644
--- a/lib/dvb/pmt.cpp
+++ b/lib/dvb/pmt.cpp
@@ -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, false, 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;
@@ -655,10 +671,10 @@ ChannelMap eDVBCAService::exist_channels;
 ePtr<eConnection> eDVBCAService::m_chanAddedConn;
 
 eDVBCAService::eDVBCAService()
-	:m_sn(0), m_prev_build_hash(0), m_sendstate(0), m_retryTimer(eApp)
+	: m_prev_build_hash(0), m_sendstate(0), m_retryTimer(eTimer::create(eApp))
 {
 	memset(m_used_demux, 0xFF, sizeof(m_used_demux));
-	CONNECT(m_retryTimer.timeout, eDVBCAService::sendCAPMT);
+	CONNECT(m_retryTimer->timeout, eDVBCAService::sendCAPMT);
 	Connect();
 }
 
@@ -666,7 +682,6 @@ eDVBCAService::~eDVBCAService()
 {
 	eDebug("[eDVBCAService] free service %s", m_service.toString().c_str());
 	::close(m_sock);
-	delete m_sn;
 }
 
 // begin static methods
@@ -860,10 +875,7 @@ void eDVBCAService::socketCB(int what)
 
 void eDVBCAService::Connect()
 {
-	if (m_sn) {
-		delete m_sn;
-		m_sn=0;
-	}
+	m_sn=0;
 	memset(&m_servaddr, 0, sizeof(struct sockaddr_un));
 	m_servaddr.sun_family = AF_UNIX;
 	strcpy(m_servaddr.sun_path, "/tmp/camd.socket");
@@ -876,7 +888,7 @@ void eDVBCAService::Connect()
 			int val=1;
 			fcntl(m_sock, F_SETFL, O_NONBLOCK);
 			setsockopt(m_sock, SOL_SOCKET, SO_REUSEADDR, &val, 4);
-			m_sn = new eSocketNotifier(eApp, m_sock,
+			m_sn = eSocketNotifier::create(eApp, m_sock,
 				eSocketNotifier::Read|eSocketNotifier::Priority|eSocketNotifier::Error|eSocketNotifier::Hungup);
 			CONNECT(m_sn->activated, eDVBCAService::socketCB);
 			
@@ -1028,11 +1040,11 @@ void eDVBCAService::sendCAPMT()
 		{
 			case 0xFFFFFFFF:
 				++m_sendstate;
-				m_retryTimer.start(0,true);
+				m_retryTimer->start(0,true);
 //				eDebug("[eDVBCAService] send failed .. immediate retry");
 				break;
 			default:
-				m_retryTimer.start(5000,true);
+				m_retryTimer->start(5000,true);
 //				eDebug("[eDVBCAService] send failed .. retry in 5 sec");
 				break;
 		}