X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/9eea8eab34e64901920309548a5c05e636b25625..c50acf3391bec3f2abaf219c8f52c7d57d6149b5:/lib/service/servicedvb.cpp

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index a3450b89..fb67787a 100644
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -428,13 +428,38 @@ int eStaticServiceDVBBouquetInformation::isPlayable(const eServiceReference &ref
 			return 0;
 		}
 
+		int prio_order = eDVBFrontend::getTypePriorityOrder();
 		int cur=0;
 		eDVBChannelID chid, chid_ignore;
 		((const eServiceReferenceDVB&)ignore).getChannelID(chid_ignore);
 		for (std::list<eServiceReference>::iterator it(bouquet->m_services.begin()); it != bouquet->m_services.end(); ++it)
 		{
+			static unsigned char prio_map[6][3] = {
+				{ 3, 2, 1 }, // -S -C -T
+				{ 3, 1, 2 }, // -S -T -C
+				{ 2, 3, 1 }, // -C -S -T
+				{ 1, 3, 2 }, // -C -T -S
+				{ 1, 2, 3 }, // -T -C -S
+				{ 2, 1, 3 }  // -T -S -C
+			};
 			((const eServiceReferenceDVB&)*it).getChannelID(chid);
 			int tmp=res->canAllocateChannel(chid, chid_ignore);
+			switch(tmp)
+			{
+				case 0:
+					break;
+				case 30000: // cached DVB-T channel
+				case 1: // DVB-T frontend
+					tmp = prio_map[prio_order][2];
+					break;
+				case 40000: // cached DVB-C channel
+				case 2:
+					tmp = prio_map[prio_order][1];
+					break;
+				default: // DVB-S
+					tmp = prio_map[prio_order][0];
+					break;
+			}
 			if (tmp > cur)
 			{
 				m_playable_service = *it;
@@ -643,7 +668,11 @@ eServiceFactoryDVB::eServiceFactoryDVB()
 	
 	eServiceCenter::getPrivInstance(sc);
 	if (sc)
-		sc->addServiceFactory(eServiceFactoryDVB::id, this);
+	{
+		std::list<std::string> extensions;
+		extensions.push_back("ts");
+		sc->addServiceFactory(eServiceFactoryDVB::id, this, extensions);
+	}
 
 	m_StaticServiceDVBInfo = new eStaticServiceDVBInformation;
 	m_StaticServiceDVBBouquetInfo = new eStaticServiceDVBBouquetInformation;
@@ -784,7 +813,7 @@ PyObject *eDVBServiceList::getContent(const char* format, bool sorted)
 							sptr->getName(ref, name);
 
 							// filter short name brakets
-							unsigned int pos;
+							size_t pos;
 							while((pos = name.find("\xc2\x86")) != std::string::npos)
 								name.erase(pos,2);
 							while((pos = name.find("\xc2\x87")) != std::string::npos)
@@ -1078,6 +1107,7 @@ void eDVBServicePlay::serviceEvent(int event)
 	case eDVBServicePMTHandler::eventNoPATEntry:
 	case eDVBServicePMTHandler::eventNoPMT:
 	case eDVBServicePMTHandler::eventTuneFailed:
+	case eDVBServicePMTHandler::eventMisconfiguration:
 	{
 		eDebug("DVB service failed to tune - error %d", event);
 		m_event((iPlayableService*)this, evTuneFailed);
@@ -1416,6 +1446,12 @@ RESULT eDVBServicePlay::isCurrentlySeekable()
 	return m_is_pvr || m_timeshift_active;
 }
 
+RESULT eDVBServicePlay::seekChapter(int chapter)
+{
+		/* seekChapter N/I. */
+	return -1;
+}
+
 RESULT eDVBServicePlay::frontendInfo(ePtr<iFrontendInformation> &ptr)
 {
 	ptr = this;
@@ -1786,7 +1822,8 @@ int eDVBServicePlay::selectAudioStream(int i)
 				    anything in the best case, or destroy the default setting in
 				    case the real default is not yet available.)
 			*/
-	if (m_dvb_service && !m_is_pvr && (i != -1))
+	if (m_dvb_service && !m_is_pvr && ((i != -1)
+		|| ((m_dvb_service->getCacheEntry(eDVBService::cAPID) == -1) && (m_dvb_service->getCacheEntry(eDVBService::cAC3PID)==-1))))
 	{
 		if (apidtype == eDVBAudio::aMPEG)
 		{
@@ -2536,7 +2573,16 @@ void eDVBServicePlay::cutlistToCuesheet()
 			}
 		}
 		
-		if (in != out)
+		if (in < 0)
+			in = 0;
+		if (out < 0)
+			out = 0;
+		if (in > length)
+			in = length;
+		if (out > length)
+			out = length;
+		
+		if (in < out)
 			m_cue->addSourceSpan(in, out);
 		
 		in = length;
@@ -2828,11 +2874,11 @@ void eDVBServicePlay::checkSubtitleTiming()
 //			diff = 0;
 //		}
 	
-		if (!diff)
+		if ((diff/90)<20)
 		{
 			if (type == TELETEXT)
 			{
-//				eDebug("display teletext subtitle page");
+				eDebug("display teletext subtitle page %lld", show_time);
 				m_subtitle_widget->setPage(page);
 				m_subtitle_pages.pop_front();
 			}