X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d3eca61ede32dd385b2e53fb33c669efa26cbcfb..76fe69e113637a200aafdc2d6dede772706e4b09:/lib/service/servicedvb.cpp?ds=sidebyside

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index 6b6e2e68..53bc17a8 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;
@@ -1025,7 +1050,7 @@ eDVBServicePlay::eDVBServicePlay(const eServiceReference &ref, eDVBService *serv
 	m_subtitle_widget = 0;
 	
 	m_tune_state = -1;
-	
+
 	CONNECT(m_subtitle_sync_timer.timeout, eDVBServicePlay::checkSubtitleTiming);
 }
 
@@ -1345,6 +1370,9 @@ RESULT eDVBServicePlay::seekTo(pts_t to)
 		return -1;
 	
 	m_cue->seekTo(0, to);
+	m_dvb_subtitle_pages.clear();
+	m_subtitle_pages.clear();
+
 	return 0;
 }
 
@@ -1372,6 +1400,8 @@ RESULT eDVBServicePlay::seekRelative(int direction, pts_t to)
 		return 0;
 	
 	m_cue->seekTo(mode, to);
+	m_dvb_subtitle_pages.clear();
+	m_subtitle_pages.clear();
 	return 0;
 }
 
@@ -1781,7 +1811,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)
 		{
@@ -2770,6 +2801,10 @@ void eDVBServicePlay::newSubtitlePage(const eDVBTeletextSubtitlePage &page)
 {
 	if (m_subtitle_widget)
 	{
+		pts_t pos = 0;
+		if (m_decoder)
+			m_decoder->getPTS(0, pos);
+		eDebug("got new subtitle page %lld %lld %d", pos, page.m_pts, page.m_have_pts);
 		m_subtitle_pages.push_back(page);
 		checkSubtitleTiming();
 	}
@@ -2777,7 +2812,7 @@ void eDVBServicePlay::newSubtitlePage(const eDVBTeletextSubtitlePage &page)
 
 void eDVBServicePlay::checkSubtitleTiming()
 {
-//	eDebug("checkSubtitleTiming");
+	eDebug("checkSubtitleTiming");
 	if (!m_subtitle_widget)
 		return;
 	while (1)
@@ -2806,11 +2841,11 @@ void eDVBServicePlay::checkSubtitleTiming()
 		if (m_decoder)
 			m_decoder->getPTS(0, pos);
 
-//		eDebug("%lld %lld", pos, show_time);
+		eDebug("%lld %lld", pos, show_time);
 		int diff =  show_time - pos;
 		if (diff < 0)
 		{
-//			eDebug("[late (%d ms)]", -diff / 90);
+			eDebug("[late (%d ms)]", -diff / 90);
 			diff = 0;
 		}
 //		if (diff > 900000)
@@ -2819,23 +2854,23 @@ 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();
 			}
 			else
 			{
-//				eDebug("display dvb subtitle Page %lld", show_time);
+				eDebug("display dvb subtitle Page %lld", show_time);
 				m_subtitle_widget->setPage(dvb_page);
 				m_dvb_subtitle_pages.pop_front();
 			}
 		} else
 		{
-//			eDebug("start subtitle delay %d", diff / 90);
+			eDebug("start subtitle delay %d", diff / 90);
 			m_subtitle_sync_timer.start(diff / 90, 1);
 			break;
 		}
@@ -2846,6 +2881,10 @@ void eDVBServicePlay::newDVBSubtitlePage(const eDVBSubtitlePage &p)
 {
 	if (m_subtitle_widget)
 	{
+		pts_t pos = 0;
+		if (m_decoder)
+			m_decoder->getPTS(0, pos);
+		eDebug("got new subtitle page %lld %lld", pos, p.m_show_time);
 		m_dvb_subtitle_pages.push_back(p);
 		checkSubtitleTiming();
 	}