X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ce8e939502fb096515b84a16087bdcb2c498bfdc..d630d7d7715a6fbc97c1d322ceb2bc0452ab0740:/lib/service/servicemp3.cpp

diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp
index c76e346e..9c1972d7 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
 
@@ -36,6 +37,7 @@ eServiceFactoryMP3::eServiceFactoryMP3()
 		extensions.push_back("wave");
 		extensions.push_back("mkv");
 		extensions.push_back("avi");
+		extensions.push_back("divx");
 		extensions.push_back("dat");
 		extensions.push_back("flac");
 		extensions.push_back("mp4");
@@ -206,7 +208,7 @@ eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eAp
 		sourceinfo.containertype = ctMPEGTS;
 	else if ( strcasecmp(ext, ".mkv") == 0 )
 		sourceinfo.containertype = ctMKV;
-	else if ( strcasecmp(ext, ".avi") == 0 )
+	else if ( strcasecmp(ext, ".avi") == 0 || strcasecmp(ext, ".divx") == 0)
 		sourceinfo.containertype = ctAVI;
 	else if ( strcasecmp(ext, ".mp4") == 0 )
 		sourceinfo.containertype = ctMP4;
@@ -227,11 +229,29 @@ eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eAp
 	if (!m_gst_pipeline)
 		m_error_message = "failed to create GStreamer pipeline!\n";
 
-	if ( sourceinfo.containertype == ctCDA )
+	if ( sourceinfo.is_streaming )
+	{
+		eDebug("play webradio!");
+		source = gst_element_factory_make ("neonhttpsrc", "http-source");
+		if (source)
+		{
+			g_object_set (G_OBJECT (source), "location", filename, NULL);
+			g_object_set (G_OBJECT (source), "automatic-redirect", TRUE, NULL);
+		}
+		else
+			m_error_message = "GStreamer plugin neonhttpsrc not available!\n";
+	}
+	else if ( sourceinfo.containertype == ctCDA )
 	{
 		source = gst_element_factory_make ("cdiocddasrc", "cda-source");
 		if (source)
+		{
 			g_object_set (G_OBJECT (source), "device", "/dev/cdroms/cdrom0", NULL);
+			int track = atoi(filename+18);
+			eDebug("play audio CD track #%i",track);
+			if (track > 0)
+				g_object_set (G_OBJECT (source), "track", track, NULL);
+		}
 		else
 			sourceinfo.containertype = ctNone;
 	}
@@ -243,21 +263,6 @@ eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eAp
 		else
 			m_error_message = "GStreamer can't open filesrc " + (std::string)filename + "!\n";
 	}
-	else if ( sourceinfo.is_streaming ) 
-	{
-		source = gst_element_factory_make ("neonhttpsrc", "http-source");
-		if (source)
-			g_object_set (G_OBJECT (source), "automatic-redirect", TRUE, NULL);
-		else
-			m_error_message = "GStreamer plugin neonhttpsrc not available!\n";
-	}
-	else
-	{ 
-		int track = atoi(filename+18);
-		eDebug("play audio CD track #%i",track);
-		if (track > 0)
-			g_object_set (G_OBJECT (source), "track", track, NULL);
-	}
 	if ( sourceinfo.is_video )
 	{
 			/* filesrc -> mpegdemux -> | queue_audio -> dvbaudiosink
@@ -941,6 +946,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;
@@ -981,7 +997,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";