X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/28dcf6be0ee22fedd728fef11ccff484f8a851e8..6c77c3ab8156d72dfd616d83c276ef7f3ca1b1a7:/lib/service/servicedvb.cpp

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index c8e64b80..558bf0c2 100644
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -1029,6 +1029,9 @@ void eDVBServicePlay::serviceEvent(int event)
 		m_event((iPlayableService*)this, evUpdatedInfo);
 		break;
 	}
+	case eDVBServicePMTHandler::eventPreStart:
+		loadCuesheet();
+		break;
 	case eDVBServicePMTHandler::eventEOF:
 		m_event((iPlayableService*)this, evEOF);
 		break;
@@ -1095,7 +1098,6 @@ RESULT eDVBServicePlay::start()
 			m_event_handler.inject(event, 0);
 			m_event_handler.inject(empty, 1);
 		}
-		loadCuesheet();
 		m_event(this, evStart);
 	}
 	return 0;
@@ -1126,11 +1128,7 @@ RESULT eDVBServicePlay::stop()
 			
 			if (length)
 			{
-				int perc = play_position * 100LL / length;
-			
-					/* only store last play position when between 1% and 99% */
-				if ((1 < perc) && (perc < 99))
-					m_cue_entries.insert(cueEntry(play_position, 3)); /* last play position */
+				m_cue_entries.insert(cueEntry(play_position, 3)); /* last play position */
 			}
 			m_cuesheet_changed = 1;
 		}
@@ -1385,7 +1383,14 @@ RESULT eDVBServicePlay::setTrickmode(int trick)
 
 RESULT eDVBServicePlay::isCurrentlySeekable()
 {
-	return m_is_pvr || m_timeshift_active ? 3 : 0; // fast forward/backward possible and seeking possible
+	int ret = 0;
+	if (m_decoder)
+	{
+		ret = (m_is_pvr || m_timeshift_active) ? 3 : 0; // fast forward/backward possible and seeking possible
+		if (m_decoder->getVideoProgressive() == -1)
+			ret &= ~2;
+	}
+	return ret;
 }
 
 RESULT eDVBServicePlay::frontendInfo(ePtr<iFrontendInformation> &ptr)
@@ -2080,12 +2085,13 @@ RESULT eDVBServicePlay::startTimeshift()
 	return 0;
 }
 
-RESULT eDVBServicePlay::stopTimeshift()
+RESULT eDVBServicePlay::stopTimeshift(bool swToLive)
 {
 	if (!m_timeshift_enabled)
 		return -1;
 	
-	switchToLive();
+	if (swToLive)
+		switchToLive();
 	
 	m_timeshift_enabled = 0;
 	
@@ -2258,9 +2264,7 @@ void eDVBServicePlay::switchToLive()
 	m_timeshift_active = 0;
 	m_timeshift_changed = 1;
 
-	m_event((iPlayableService*)this, evSeekableStatusChanged);
-
-	updateDecoder();
+	updateDecoder(true);
 }
 
 void eDVBServicePlay::switchToTimeshift()
@@ -2290,14 +2294,13 @@ void eDVBServicePlay::switchToTimeshift()
 
 	eDebug("eDVBServicePlay::switchToTimeshift, in pause mode now.");
 	pause();
-	updateDecoder(); /* mainly to switch off PCR, and to set pause */
-
-	m_event((iPlayableService*)this, evSeekableStatusChanged);
+	updateDecoder(true); /* mainly to switch off PCR, and to set pause */
 }
 
-void eDVBServicePlay::updateDecoder()
+void eDVBServicePlay::updateDecoder(bool sendSeekableStateChanged)
 {
 	int vpid = -1, vpidtype = -1, pcrpid = -1, tpid = -1, achannel = -1, ac3_delay=-1, pcm_delay=-1;
+	bool mustPlay = false;
 
 	eDVBServicePMTHandler &h = m_timeshift_active ? m_service_handler_timeshift : m_service_handler;
 
@@ -2378,17 +2381,17 @@ void eDVBServicePlay::updateDecoder()
 					Py_DECREF(subs);
 				}
 			}
-			m_decoder->play(); /* pids will be set later */
 		}
 		if (m_cue)
 			m_cue->setDecodingDemux(m_decode_demux, m_decoder);
-		m_decoder->play(); /* pids will be set later. */
+		mustPlay = true;
 	}
 
 	m_timeshift_changed = 0;
 
 	if (m_decoder)
 	{
+		bool wasSeekable = m_decoder->getVideoProgressive() != -1;
 		if (m_dvb_service)
 		{
 			achannel = m_dvb_service->getCacheEntry(eDVBService::cACHANNEL);
@@ -2447,7 +2450,11 @@ void eDVBServicePlay::updateDecoder()
 				m_decoder->setRadioPic(radio_pic);
 		}
 
-		m_decoder->set();
+		if (mustPlay)
+			m_decoder->play();
+		else
+			m_decoder->set();
+
 		m_decoder->setAudioChannel(achannel);
 
 		/* don't worry about non-existing services, nor pvr services */
@@ -2459,8 +2466,13 @@ void eDVBServicePlay::updateDecoder()
 			m_dvb_service->setCacheEntry(eDVBService::cPCRPID, pcrpid);
 			m_dvb_service->setCacheEntry(eDVBService::cTPID, tpid);
 		}
+		if (!sendSeekableStateChanged && (m_decoder->getVideoProgressive() != -1) != wasSeekable)
+			sendSeekableStateChanged = true;
 	}
 	m_have_video_pid = (vpid > 0 && vpid < 0x2000);
+
+	if (sendSeekableStateChanged)
+		m_event((iPlayableService*)this, evSeekableStatusChanged);
 }
 
 void eDVBServicePlay::loadCuesheet()
@@ -2561,7 +2573,7 @@ void eDVBServicePlay::cutlistToCuesheet()
 	{
 		if (i == m_cue_entries.end())
 		{
-			if (!have_any_span)
+			if (!have_any_span && !in)
 				break;
 			out = length;
 		} else {
@@ -2591,6 +2603,7 @@ void eDVBServicePlay::cutlistToCuesheet()
 		{
 			have_any_span = 1;
 			m_cue->addSourceSpan(in, out);
+			in = out = 0;
 		}
 		
 		in = length;