From: Fraxinas <andreas.frisch@multimedia-labs.de>
Date: Mon, 23 Feb 2009 14:42:59 +0000 (+0100)
Subject: show warning message when trying to play video container with DTS stream (requires... 
X-Git-Tag: 2.6.0~406
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/4b8fe9d6650b7527b3c588f72540cea3c04423b9

show warning message when trying to play video container with DTS stream (requires gst-plugins-dvbmedisink > 20090223)
---

diff --git a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
index 3e023841..e81750ba 100644
--- a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
+++ b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
@@ -224,7 +224,8 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB
 		self.__event_tracker = ServiceEventTracker(screen=self, eventmap=
 			{
 				iPlayableService.evUpdatedInfo: self.__evUpdatedInfo,
-				iPlayableService.evUser+11: self.__evDecodeError,
+				iPlayableService.evUser+10: self.__evAudioDecodeError,
+				iPlayableService.evUser+11: self.__evVideoDecodeError,
 				iPlayableService.evUser+12: self.__evPluginError,
 				iPlayableService.evUser+13: self["coverArt"].embeddedCoverArt
 			})
@@ -268,11 +269,17 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB
 		print "[__evUpdatedInfo] title %d of %d (%s)" % (currenttitle, totaltitles, sTitle)
 		self.readTitleInformation()
 
-	def __evDecodeError(self):
+	def __evAudioDecodeError(self):
+		currPlay = self.session.nav.getCurrentService()
+		sAudioType = currPlay.info().getInfoString(iServiceInformation.sUser+10)
+		print "[__evAudioDecodeError] audio-codec %s can't be decoded by hardware" % (sAudioType)
+		self.session.open(MessageBox, _("This Dreambox can't decode %s streams!") % sAudioType, type = MessageBox.TYPE_INFO,timeout = 20 )
+
+	def __evVideoDecodeError(self):
 		currPlay = self.session.nav.getCurrentService()
 		sVideoType = currPlay.info().getInfoString(iServiceInformation.sVideoType)
-		print "[__evDecodeError] video-codec %s can't be decoded by hardware" % (sVideoType)
-		self.session.open(MessageBox, _("This Dreambox can't decode %s video streams!") % sVideoType, type = MessageBox.TYPE_INFO,timeout = 20 )
+		print "[__evVideoDecodeError] video-codec %s can't be decoded by hardware" % (sVideoType)
+		self.session.open(MessageBox, _("This Dreambox can't decode %s streams!") % sVideoType, type = MessageBox.TYPE_INFO,timeout = 20 )
 
 	def __evPluginError(self):
 		currPlay = self.session.nav.getCurrentService()
diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp
index bbcb3b5c..d90186a5 100644
--- a/lib/service/servicemp3.cpp
+++ b/lib/service/servicemp3.cpp
@@ -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...");