X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/5e7190db5e448aaebd7d41ce94eb16760f729f1d..3bc4feea6206761d48e7ead73dfd32721bf8e259:/lib/service/servicedvb.cpp

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index 21effd57..b5e2651f 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;
@@ -1743,6 +1745,7 @@ int eDVBServicePlay::selectAudioStream(int i)
 {
 	eDVBServicePMTHandler::program program;
 	eDVBServicePMTHandler &h = m_timeshift_active ? m_service_handler_timeshift : m_service_handler;
+	pts_t position = -1;
 
 	if (h.getProgramInfo(program))
 		return -1;
@@ -1765,6 +1768,9 @@ int eDVBServicePlay::selectAudioStream(int i)
 		apidtype = program.audioStreams[stream].type;
 	}
 
+	if (i != -1 && apid != m_current_audio_pid && (m_is_pvr || m_timeshift_active))
+		eDebug("getPlayPosition ret %d, pos %lld in selectAudioStream", getPlayPosition(position), position);
+
 	m_current_audio_pid = apid;
 
 	if (m_is_primary && m_decoder->setAudioPID(apid, apidtype))
@@ -1773,6 +1779,9 @@ int eDVBServicePlay::selectAudioStream(int i)
 		return -4;
 	}
 
+	if (position != -1)
+		eDebug("seekTo ret %d", seekTo(position));
+
 	int rdsPid = apid;
 
 		/* 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 */
@@ -2278,12 +2287,13 @@ void eDVBServicePlay::switchToTimeshift()
 	r.path = m_timeshift_file;
 
 	m_cue = new eCueSheet();
+	m_cue->seekTo(0, -1000);
 	m_service_handler_timeshift.tune(r, 1, m_cue, 0, m_dvb_service); /* use the decoder demux for everything */
 
 	eDebug("eDVBServicePlay::switchToTimeshift, in pause mode now.");
 	pause();
 	updateDecoder(); /* mainly to switch off PCR, and to set pause */
-	
+
 	m_event((iPlayableService*)this, evSeekableStatusChanged);
 }
 
@@ -2413,17 +2423,8 @@ void eDVBServicePlay::updateDecoder()
 			}
 		}
 
-		std::string config_delay;
-		int config_delay_int = 0;
-		if(ePythonConfigQuery::getConfigValue("config.av.generalAC3delay", config_delay) == 0)
-			config_delay_int = atoi(config_delay.c_str());
-		m_decoder->setAC3Delay(ac3_delay == -1 ? config_delay_int : ac3_delay + config_delay_int);
-
-		if(ePythonConfigQuery::getConfigValue("config.av.generalPCMdelay", config_delay) == 0)
-			config_delay_int = atoi(config_delay.c_str());
-		else
-			config_delay_int = 0;
-		m_decoder->setPCMDelay(pcm_delay == -1 ? config_delay_int : pcm_delay + config_delay_int);
+		setAC3Delay(ac3_delay == -1 ? 0 : ac3_delay);
+		setPCMDelay(pcm_delay == -1 ? 0 : pcm_delay);
 
 		m_decoder->setVideoPID(vpid, vpidtype);
 		selectAudioStream();
@@ -2947,16 +2948,28 @@ void eDVBServicePlay::setAC3Delay(int delay)
 {
 	if (m_dvb_service)
 		m_dvb_service->setCacheEntry(eDVBService::cAC3DELAY, delay ? delay : -1);
-	if (m_decoder)
-		m_decoder->setAC3Delay(delay);
+	if (m_decoder) {
+		std::string config_delay;
+		int config_delay_int = 0;
+		if(ePythonConfigQuery::getConfigValue("config.av.generalAC3delay", config_delay) == 0)
+			config_delay_int = atoi(config_delay.c_str());
+		m_decoder->setAC3Delay(delay + config_delay_int);
+	}
 }
 
 void eDVBServicePlay::setPCMDelay(int delay)
 {
 	if (m_dvb_service)
 		m_dvb_service->setCacheEntry(eDVBService::cPCMDELAY, delay ? delay : -1);
-	if (m_decoder)
-		m_decoder->setPCMDelay(delay);
+	if (m_decoder) {
+		std::string config_delay;
+		int config_delay_int = 0;
+		if(ePythonConfigQuery::getConfigValue("config.av.generalPCMdelay", config_delay) == 0)
+			config_delay_int = atoi(config_delay.c_str());
+		else
+			config_delay_int = 0;
+		m_decoder->setPCMDelay(delay + config_delay_int);
+	}
 }
 
 void eDVBServicePlay::video_event(struct iTSMPEGDecoder::videoEvent event)