From: Fraxinas <andreas.frisch@multimedia-labs.de>
Date: Thu, 20 Nov 2008 11:17:28 +0000 (+0100)
Subject: decode id3 cover art images embedded into mp3 files and show them in mediaplayer
X-Git-Tag: 2.6.0~581
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/5a626462406c008da1c81cf304a448d9abd19576?ds=sidebyside

decode id3 cover art images embedded into mp3 files and show them in mediaplayer
---

diff --git a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
index 8477ecc1..b6d87a6e 100644
--- a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
+++ b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
@@ -82,10 +82,10 @@ class MediaPixmap(Pixmap):
 	def showDefaultCover(self):
 		self.instance.setPixmap(self.noCoverPixmap)
 
-	#def destroy(self):
-		#Pixmap.destroy(self)
-		#print "mediapixmap ***********+ destroy"
-		
+	def embeddedCoverArt(self):
+		print "[embeddedCoverArt] found"
+		self.coverArtFileName = "/tmp/.id3coverart"
+		self.picload.startDecode(self.coverArtFileName)
 
 class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoBarCueSheetSupport, InfoBarNotifications, InfoBarSubtitleSupport, HelpableScreen):
 	ALLOW_SUSPEND = True
@@ -224,7 +224,8 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB
 			{
 				iPlayableService.evUpdatedInfo: self.__evUpdatedInfo,
 				iPlayableService.evUser+11: self.__evDecodeError,
-				iPlayableService.evUser+12: self.__evPluginError
+				iPlayableService.evUser+12: self.__evPluginError,
+				iPlayableService.evUser+13: self["coverArt"].embeddedCoverArt
 			})
 
 	def doNothing(self):
diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp
index 19b7735b..017c58f0 100644
--- a/lib/service/servicemp3.cpp
+++ b/lib/service/servicemp3.cpp
@@ -16,6 +16,7 @@
 #include <sys/stat.h>
 /* for subtitles */
 #include <lib/gui/esubtitle.h>
+#include <errno.h>
 
 // eServiceFactoryMP3
 
@@ -944,6 +945,17 @@ void eServiceMP3::gstBusCall(GstBus *bus, GstMessage *msg)
 			m_audioStreams.push_back(audio);
 		}
 
+		GValue *gv_image = gst_tag_list_get_value_index(tags, GST_TAG_IMAGE, 0);
+		if ( gv_image )
+		{
+			GstBuffer *buf_image;
+			buf_image = gst_value_get_buffer (gv_image);
+			int fd = open("/tmp/.id3coverart", O_CREAT|O_WRONLY|O_TRUNC, 0644);
+			int ret = write(fd, GST_BUFFER_DATA(buf_image), GST_BUFFER_SIZE(buf_image));
+			close(fd);
+			m_event((iPlayableService*)this, evUser+13);
+		}
+
 		gst_tag_list_free(tags);
 		m_event((iPlayableService*)this, evUpdatedInfo);
 		break;
@@ -984,7 +996,7 @@ void eServiceMP3::gstBusCall(GstBus *bus, GstMessage *msg)
 	{
 		if ( gst_is_missing_plugin_message(msg) )
 		{
-			gchar *description = gst_missing_plugin_message_get_description(msg);			
+			gchar *description = gst_missing_plugin_message_get_description(msg);
 			if ( description )
 			{
 				m_error_message = "GStreamer plugin " + (std::string)description + " not available!\n";