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

diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp
index c004d038..fb515e9b 100644
--- a/lib/service/servicemp3.cpp
+++ b/lib/service/servicemp3.cpp
@@ -140,20 +140,29 @@ eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eAp
 	int is_mp3 = !strcasecmp(ext, ".mp3"); /* force mp3 instead of decodebin */
 	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"));
 	
-	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", filename, is_mpeg_ps, is_mpeg_ts, is_video, is_streaming, is_mp3, is_matroska, is_avi);
+	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);
 	
 	int is_audio = !is_video;
 	
 	int all_ok = 0;
 
-	m_gst_pipeline = gst_pipeline_new ("audio-player");
+	m_gst_pipeline = gst_pipeline_new ("mediaplayer");
 	if (!m_gst_pipeline)
 		eWarning("failed to create pipeline");
 
-	if (!is_streaming)
+	if (is_AudioCD)
+	{
+		source = gst_element_factory_make ("cdiocddasrc", "cda-source");
+		if (source)
+			g_object_set (G_OBJECT (source), "device", "/dev/cdroms/cdrom0", NULL);
+		else
+			is_AudioCD = 0;
+	}
+	if ( !is_streaming && !is_AudioCD )
 		source = gst_element_factory_make ("filesrc", "file-source");
-	else
+	else if ( is_streaming ) 
 	{
 		source = gst_element_factory_make ("neonhttpsrc", "http-source");
 		if (source)
@@ -162,9 +171,16 @@ eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eAp
 
 	if (!source)
 		eWarning("failed to create %s", is_streaming ? "neonhttpsrc" : "filesrc");
-	else
 				/* configure source */
+	else if (!is_AudioCD)
 		g_object_set (G_OBJECT (source), "location", filename, NULL);
+	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 (is_audio)
 	{
@@ -195,7 +211,7 @@ eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eAp
 			/* endianness, however, is not required to be set anymore. */
 		if (flt)
 		{
-			GstCaps *caps = gst_caps_new_simple("audio/x-raw-int", /* "endianness", G_TYPE_INT, 4321, */ "depth", G_TYPE_INT, 16, "width", G_TYPE_INT, 16, "channels", G_TYPE_INT, 2, (char*)0);
+			GstCaps *caps = gst_caps_new_simple("audio/x-raw-int", /* "endianness", G_TYPE_INT, 4321, */ "depth", G_TYPE_INT, 16, "width", G_TYPE_INT, 16, /*"channels", G_TYPE_INT, 2, */(char*)0);
 			g_object_set (G_OBJECT (flt), "caps", caps, (char*)0);
 			gst_caps_unref(caps);
 		}
@@ -211,10 +227,10 @@ eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eAp
 			/* filesrc -> mpegdemux -> | queue_audio -> dvbaudiosink
 			                           | queue_video -> dvbvideosink */
 
-		audio = gst_element_factory_make("dvbaudiosink", "audio");
+		audio = gst_element_factory_make("dvbaudiosink", "audiosink");
 		queue_audio = gst_element_factory_make("queue", "queue_audio");
 		
-		video = gst_element_factory_make("dvbvideosink", "video");
+		video = gst_element_factory_make("dvbvideosink", "videosink");
 		queue_video = gst_element_factory_make("queue", "queue_video");
 		
 		if (is_mpeg_ps)
@@ -249,7 +265,14 @@ eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eAp
 	{
 		gst_bus_set_sync_handler(gst_pipeline_get_bus (GST_PIPELINE (m_gst_pipeline)), gstBusSyncHandler, this);
 
-		if (is_audio)
+		if (is_AudioCD)
+		{
+			queue_audio = gst_element_factory_make("queue", "queue_audio");
+			g_object_set (G_OBJECT (sink), "preroll-queue-len", 80, NULL);
+			gst_bin_add_many (GST_BIN (m_gst_pipeline), source, queue_audio, conv, sink, NULL);
+			gst_element_link_many(source, queue_audio, conv, sink, NULL);
+		}
+		else if (is_audio)
 		{
 			queue_audio = gst_element_factory_make("queue", "queue_audio");
 
@@ -536,6 +559,7 @@ int eServiceMP3::getInfo(int w)
 	case sComment:
 	case sTracknumber:
 	case sGenre:
+	case sVideoType:
 		return resIsString;
 	case sCurrentTitle:
 		tag = GST_TAG_TRACK_NUMBER;
@@ -581,6 +605,9 @@ std::string eServiceMP3::getInfoString(int w)
 	case sGenre:
 		tag = GST_TAG_GENRE;
 		break;
+	case sVideoType:
+		tag = GST_TAG_VIDEO_CODEC;
+		break;
 	default:
 		return "";
 	}
@@ -629,11 +656,21 @@ void eServiceMP3::gstBusCall(GstBus *bus, GstMessage *msg)
 		break;
 	case GST_MESSAGE_ERROR:
 	{
-		gchar *debug;
+		gchar *debug, *sourceName;
 		GError *err;
+		GstObject *source;
+
+		source = GST_MESSAGE_SRC(msg);
+		sourceName = gst_object_get_name(source);
+
 		gst_message_parse_error (msg, &err, &debug);
 		g_free (debug);
-		eWarning("Gstreamer error: %s", err->message);
+		eWarning("Gstreamer error: %s (%i) from %s", err->message, err->code, sourceName );
+		if ( err->domain == GST_STREAM_ERROR && err->code == GST_STREAM_ERROR_DECODE )
+		{
+			if ( g_strrstr(sourceName, "videosink") )
+				m_event((iPlayableService*)this, evUser+11);
+		}
 		g_error_free(err);
 			/* TODO: signal error condition to user */
 		break;