Merge commit 'origin/master' into tmbinc/FixTimingBugs

3 files changed, 27 insertions, 8 deletions

diff --git a/lib/service/event.cpp b/lib/service/event.cpp
index e78ddc4e..e15eebfc 100644
--- a/lib/service/event.cpp
+++ b/lib/service/event.cpp
@@ -88,7 +88,7 @@ bool eServiceEvent::loadLanguage(Event *evt, std::string lang, int tsidonid)
 					lang = cc;  // use first found language
 				if (cc == lang)
 				{
-					m_event_name = convertDVBUTF8(sed->getEventName(), table, tsidonid);
+					m_event_name = convertDVBUTF8(replace_all(replace_all(sed->getEventName(), "\n", " "), "\t", " "), table, tsidonid);
 					m_short_description = convertDVBUTF8(sed->getText(), table, tsidonid);
 					retval=1;
 				}
diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index 14c849db..7292e6df 100644
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -2291,8 +2291,18 @@ void eDVBServicePlay::updateDecoder()
 				}
 			}
 		}
-		m_decoder->setAC3Delay(ac3_delay == -1 ? 0 : ac3_delay);
-		m_decoder->setPCMDelay(pcm_delay == -1 ? 0 : pcm_delay);
+
+		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);
 
 		m_decoder->setVideoPID(vpid, vpidtype);
 		selectAudioStream();
diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp
index bbcb3b5c..569272b0 100644
--- a/lib/service/servicemp3.cpp
+++ b/lib/service/servicemp3.cpp
@@ -321,11 +321,11 @@ eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eAp
 		switch (sourceinfo.containertype)
 		{
 			case ctMPEGTS:
-				demux_type = "flutsdemux";
+				demux_type = "mpegtsdemux";
 				break;
 			case ctMPEGPS:
 			case ctVCD:
-				demux_type = "flupsdemux";
+				demux_type = "mpegpsdemux";
 				break;
 			case ctMKV:
 				demux_type = "matroskademux";
@@ -838,6 +838,7 @@ int eServiceMP3::getInfo(int w)
 	case sGenre:
 	case sVideoType:
 	case sTimeCreate:
+	case sUser+10:
 	case sUser+12:
 		return resIsString;
 	case sCurrentTitle:
@@ -886,6 +887,9 @@ std::string eServiceMP3::getInfoString(int w)
 	case sGenre:
 		tag = GST_TAG_GENRE;
 		break;
+	case sUser+10:
+		tag = GST_TAG_AUDIO_CODEC;
+		break;
 	case sVideoType:
 		tag = GST_TAG_VIDEO_CODEC;
 		break;
@@ -1025,7 +1029,7 @@ void eServiceMP3::gstBusCall(GstBus *bus, GstMessage *msg)
 
 	source = GST_MESSAGE_SRC(msg);
 	sourceName = gst_object_get_name(source);
-#if 0
+#if 1
 	if (gst_message_get_structure(msg))
 	{
 		gchar *string = gst_structure_to_string(gst_message_get_structure(msg));
@@ -1050,8 +1054,13 @@ void eServiceMP3::gstBusCall(GstBus *bus, GstMessage *msg)
 			eWarning("Gstreamer error: %s (%i) from %s", err->message, err->code, sourceName );
 			if ( err->domain == GST_STREAM_ERROR )
 			{
-				if ( err->code == GST_STREAM_ERROR_CODEC_NOT_FOUND && g_strrstr(sourceName, "videosink") )
-					m_event((iPlayableService*)this, evUser+11);
+				if ( err->code == GST_STREAM_ERROR_CODEC_NOT_FOUND )
+				{
+					if ( g_strrstr(sourceName, "videosink") )
+						m_event((iPlayableService*)this, evUser+11);
+					else if ( g_strrstr(sourceName, "audiosink") )
+						m_event((iPlayableService*)this, evUser+10);
+				}
 				else if ( err->code == GST_STREAM_ERROR_FAILED && g_strrstr(sourceName, "file-source") )
 				{
 					eWarning("error in tag parsing, linking mp3parse directly to file-sink, bypassing id3demux...");