X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/3e45b153a93894c4c382d3ba5ded974c738e9589..2d7f4e102ee3231bdb600b0ac7e2d8f898034b78:/lib/service/servicedvb.cpp

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index b92965da..44a22ea9 100644
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -1133,7 +1133,7 @@ RESULT eDVBServicePlay::pause(ePtr<iPauseableService> &ptr)
 
 RESULT eDVBServicePlay::setSlowMotion(int ratio)
 {
-	assert(ratio); /* The API changed: instead of calling setSlowMotion(0), call play! */
+	ASSERT(ratio); /* The API changed: instead of calling setSlowMotion(0), call play! */
 	eDebug("eDVBServicePlay::setSlowMotion(%d)", ratio);
 	setFastForward_internal(0);
 	if (m_decoder)
@@ -1145,7 +1145,7 @@ RESULT eDVBServicePlay::setSlowMotion(int ratio)
 RESULT eDVBServicePlay::setFastForward(int ratio)
 {
 	eDebug("eDVBServicePlay::setFastForward(%d)", ratio);
-	assert(ratio);
+	ASSERT(ratio);
 	return setFastForward_internal(ratio);
 }
 
@@ -1184,7 +1184,7 @@ RESULT eDVBServicePlay::setFastForward_internal(int ratio)
 		return -1;
 		
 	if (ffratio == 0)
-		; /* return m_decoder->play(); is done in caller*/
+		return 0; /* return m_decoder->play(); is done in caller*/
 	else if (ffratio != 1)
 		return m_decoder->setFastForward(ffratio);
 	else
@@ -1684,6 +1684,8 @@ int eDVBServicePlay::selectAudioStream(int i)
 		eDebug("set audio pid failed");
 		return -4;
 	}
+	
+	m_decoder->set();
 
 		/* if we are not in PVR mode, timeshift is not active and we are not in pip mode, check if we need to enable the rds reader */
 	if (!(m_is_pvr || m_timeshift_active || !m_is_primary))
@@ -2439,11 +2441,16 @@ void eDVBServicePlay::cutlistToCuesheet()
 		
 	std::multiset<cueEntry>::iterator i(m_cue_entries.begin());
 	
+	int have_any_span = 0;
+	
 	while (1)
 	{
 		if (i == m_cue_entries.end())
+		{
+			if (!have_any_span)
+				break;
 			out = length;
-		else {
+		} else {
 			if (i->what == 0) /* in */
 			{
 				in = i++->where;
@@ -2467,7 +2474,10 @@ void eDVBServicePlay::cutlistToCuesheet()
 			out = length;
 		
 		if (in < out)
+		{
+			have_any_span = 1;
 			m_cue->addSourceSpan(in, out);
+		}
 		
 		in = length;