X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/230e936d158bc6375043a455857e36857a78dcea..c69bb079fef352b7b34eac8739b0dc051629cb7b:/lib/service/servicemp3.cpp?ds=sidebyside

diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp
index 516ce6eb..e435863c 100644
--- a/lib/service/servicemp3.cpp
+++ b/lib/service/servicemp3.cpp
@@ -12,6 +12,7 @@
 #include <lib/base/init_num.h>
 #include <lib/base/init.h>
 #include <gst/gst.h>
+#include <gst/pbutils/missing-plugins.h>find 
 #include <sys/stat.h>
 /* for subtitles */
 #include <lib/gui/esubtitle.h>
@@ -34,6 +35,8 @@ eServiceFactoryMP3::eServiceFactoryMP3()
 		extensions.push_back("wave");
 		extensions.push_back("mkv");
 		extensions.push_back("avi");
+		extensions.push_back("dat");
+		extensions.push_back("flac");
 		sc->addServiceFactory(eServiceFactoryMP3::id, this, extensions);
 	}
 
@@ -203,8 +206,9 @@ eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eAp
 	int is_video = is_mpeg_ps || is_mpeg_ts || is_matroska || is_avi;
 	int is_streaming = !strncmp(filename, "http://", 7);
 	int is_AudioCD = !(strncmp(filename, "/autofs/", 8) || strncmp(filename+strlen(filename)-13, "/track-", 7) || strcasecmp(ext, ".wav"));
+	int is_VCD = !strcasecmp(ext, ".dat");
 	
-	eDebug("filename: %s, is_mpeg_ps: %d, is_mpeg_ts: %d, is_video: %d, is_streaming: %d, is_mp3: %d, is_matroska: %d, is_avi: %d, is_AudioCD: %d", filename, is_mpeg_ps, is_mpeg_ts, is_video, is_streaming, is_mp3, is_matroska, is_avi, is_AudioCD);
+	eDebug("filename: %s, is_mpeg_ps: %d, is_mpeg_ts: %d, is_video: %d, is_streaming: %d, is_mp3: %d, is_matroska: %d, is_avi: %d, is_AudioCD: %d, is_VCD: %d", filename, is_mpeg_ps, is_mpeg_ts, is_video, is_streaming, is_mp3, is_matroska, is_avi, is_AudioCD, is_VCD);
 	
 	int is_audio = !is_video;
 
@@ -378,6 +382,7 @@ eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eAp
 				g_object_set (G_OBJECT(switch_subtitles), "select-all", TRUE, NULL);
 				g_object_set (G_OBJECT(sink), "signal-handoffs", TRUE, NULL);
 				g_object_set (G_OBJECT(sink), "sync", TRUE, NULL);
+				g_object_set (G_OBJECT(parser), "subtitle-encoding", "ISO-8859-15", NULL);
 				g_signal_connect(sink, "handoff", G_CALLBACK(gstCBsubtitleAvail), this);
 				subtitleStream subs;
 				subs.language_code = std::string(".srt file");
@@ -391,7 +396,16 @@ eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eAp
 				gst_bin_add(GST_BIN(m_gst_pipeline), switch_audio);
 				gst_element_link(switch_audio, queue_audio);
 			}
-			gst_element_link(source, videodemux);
+
+			if (is_VCD)
+			{
+				GstElement *cdxaparse = gst_element_factory_make("cdxaparse", "cdxaparse");
+				gst_bin_add(GST_BIN(m_gst_pipeline), cdxaparse);
+				gst_element_link(source, cdxaparse);
+				gst_element_link(cdxaparse, videodemux);
+			}
+			else
+				gst_element_link(source, videodemux);
 			gst_element_link(queue_audio, audio);
 			gst_element_link(queue_video, video);
 			g_signal_connect(videodemux, "pad-added", G_CALLBACK (gstCBpadAdded), this);
@@ -667,6 +681,7 @@ int eServiceMP3::getInfo(int w)
 	case sTracknumber:
 	case sGenre:
 	case sVideoType:
+	case sUser+12:
 		return resIsString;
 	case sCurrentTitle:
 		tag = GST_TAG_TRACK_NUMBER;
@@ -715,6 +730,8 @@ std::string eServiceMP3::getInfoString(int w)
 	case sVideoType:
 		tag = GST_TAG_VIDEO_CODEC;
 		break;
+	case sUser+12:
+		return m_error_message;
 	default:
 		return "";
 	}
@@ -844,7 +861,7 @@ void eServiceMP3::gstBusCall(GstBus *bus, GstMessage *msg)
 
 	source = GST_MESSAGE_SRC(msg);
 	sourceName = gst_object_get_name(source);
-
+#if 0
 	if (gst_message_get_structure(msg))
 	{
 		gchar *string = gst_structure_to_string(gst_message_get_structure(msg));
@@ -853,7 +870,7 @@ void eServiceMP3::gstBusCall(GstBus *bus, GstMessage *msg)
 	}
 	else
 		eDebug("gst_message from %s: %s (without structure)", sourceName, GST_MESSAGE_TYPE_NAME(msg));
-
+#endif
 	switch (GST_MESSAGE_TYPE (msg))
 	{
 	case GST_MESSAGE_EOS:
@@ -935,6 +952,19 @@ void eServiceMP3::gstBusCall(GstBus *bus, GstMessage *msg)
 			}
 		}
 	}
+        case GST_MESSAGE_ELEMENT:
+	{
+		if ( gst_is_missing_plugin_message(msg) )
+		{
+			gchar *description = gst_missing_plugin_message_get_description(msg);			
+			if ( description )
+			{
+				m_error_message = description;
+				g_free(description);
+				m_event((iPlayableService*)this, evUser+12);
+			}
+		}
+	}
 	default:
 		break;
 	}
@@ -1124,9 +1154,6 @@ void eServiceMP3::gstPoll(const int&)
 }
 
 eAutoInitPtr<eServiceFactoryMP3> init_eServiceFactoryMP3(eAutoInitNumbers::service+1, "eServiceFactoryMP3");
-#else
-#warning gstreamer not available, not building media player
-#endif
 
 void eServiceMP3::gstCBsubtitleAvail(GstElement *element, GstBuffer *buffer, GstPad *pad, gpointer user_data)
 {
@@ -1226,3 +1253,7 @@ PyObject *eServiceMP3::getSubtitleList()
 
 	return l;
 }
+
+#else
+#warning gstreamer not available, not building media player
+#endif