parse element messages from video sink for VIDEO_EVENTs
[enigma2.git] / lib / service / servicemp3.cpp
index 25c529332ee91415aaa3d53b90fedd3a8448b79d..86b7696f979099b9ebdf3a187b75c11e5d2b470f 100644 (file)
@@ -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>
 #include <sys/stat.h>
 /* for subtitles */
 #include <lib/gui/esubtitle.h>
@@ -26,6 +27,7 @@ eServiceFactoryMP3::eServiceFactoryMP3()
        if (sc)
        {
                std::list<std::string> extensions;
+               extensions.push_back("mp2");
                extensions.push_back("mp3");
                extensions.push_back("ogg");
                extensions.push_back("mpg");
@@ -34,6 +36,11 @@ 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");
+               extensions.push_back("m4a");
                sc->addServiceFactory(eServiceFactoryMP3::id, this, extensions);
        }
 
@@ -170,20 +177,17 @@ int eStaticServiceMP3Info::getLength(const eServiceReference &ref)
 
 eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eApp, 1)
 {
+       m_seekTimeout = eTimer::create(eApp);
        m_stream_tags = 0;
-       m_audioStreams.clear();
-       m_subtitleStreams.clear();
        m_currentAudioStream = 0;
        m_currentSubtitleStream = 0;
        m_subtitle_widget = 0;
        m_currentTrickRatio = 0;
-       CONNECT(m_seekTimeout.timeout, eServiceMP3::seekTimeoutCB);
+       CONNECT(m_seekTimeout->timeout, eServiceMP3::seekTimeoutCB);
        CONNECT(m_pump.recv_msg, eServiceMP3::gstPoll);
        GstElement *source = 0;
-       
-       GstElement *filter = 0, *decoder = 0, *conv = 0, *flt = 0, *sink = 0; /* for audio */
-       
-       GstElement *audio = 0, *switch_audio = 0, *queue_audio = 0, *video = 0, *queue_video = 0, *videodemux = 0;
+       GstElement *decoder = 0, *conv = 0, *flt = 0, *parser = 0, *sink = 0; /* for audio */
+       GstElement *audio = 0, *switch_audio = 0, *queue_audio = 0, *video = 0, *queue_video = 0, *videodemux = 0, *audiodemux = 0, *id3demux;
        
        m_state = stIdle;
        eDebug("SERVICEMP3 construct!");
@@ -195,123 +199,149 @@ eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eAp
        if (!ext)
                ext = filename;
 
-       int is_mpeg_ps = !(strcasecmp(ext, ".mpeg") && strcasecmp(ext, ".mpg") && strcasecmp(ext, ".vob") && strcasecmp(ext, ".bin"));
-       int is_mpeg_ts = !strcasecmp(ext, ".ts");
-       int is_matroska = !strcasecmp(ext, ".mkv");
-       int is_avi = !strcasecmp(ext, ".avi");
-       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, 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;
+       sourceStream sourceinfo;
+       sourceinfo.is_video = FALSE;
+       sourceinfo.audiotype = atUnknown;
+       if ( (strcasecmp(ext, ".mpeg") && strcasecmp(ext, ".mpg") && strcasecmp(ext, ".vob") && strcasecmp(ext, ".bin") && strcasecmp(ext, ".dat") ) == 0 )
+       {
+               sourceinfo.containertype = ctMPEGPS;
+               sourceinfo.is_video = TRUE;
+       }
+       else if ( strcasecmp(ext, ".ts") == 0 )
+       {
+               sourceinfo.containertype = ctMPEGTS;
+               sourceinfo.is_video = TRUE;
+       }
+       else if ( strcasecmp(ext, ".mkv") == 0 )
+       {
+               sourceinfo.containertype = ctMKV;
+               sourceinfo.is_video = TRUE;
+       }
+       else if ( strcasecmp(ext, ".avi") == 0 || strcasecmp(ext, ".divx") == 0)
+       {
+               sourceinfo.containertype = ctAVI;
+               sourceinfo.is_video = TRUE;
+       }
+       else if ( strcasecmp(ext, ".mp4") == 0 )
+       {
+               sourceinfo.containertype = ctMP4;
+               sourceinfo.is_video = TRUE;
+       }
+       else if ( strcasecmp(ext, ".m4a") == 0 )
+       {
+               sourceinfo.containertype = ctMP4;
+               sourceinfo.audiotype = atAAC;
+       }
+       else if ( strcasecmp(ext, ".mp3") == 0 )
+               sourceinfo.audiotype = atMP3;
+       else if ( (strncmp(filename, "/autofs/", 8) || strncmp(filename+strlen(filename)-13, "/track-", 7) || strcasecmp(ext, ".wav")) == 0 )
+               sourceinfo.containertype = ctCDA;
+       if ( strcasecmp(ext, ".dat") == 0 )
+       {
+               sourceinfo.containertype = ctVCD;
+               sourceinfo.is_video = TRUE;
+       }
+       if ( (strncmp(filename, "http://", 7)) == 0 )
+               sourceinfo.is_streaming = TRUE;
+
+       eDebug("filename=%s, containertype=%d, is_video=%d, is_streaming=%d", filename, sourceinfo.containertype, sourceinfo.is_video, sourceinfo.is_streaming);
 
        int all_ok = 0;
 
        m_gst_pipeline = gst_pipeline_new ("mediaplayer");
        if (!m_gst_pipeline)
-               eWarning("failed to create pipeline");
+               m_error_message = "failed to create GStreamer pipeline!\n";
 
-       if (is_AudioCD)
+       if ( sourceinfo.is_streaming )
        {
-               source = gst_element_factory_make ("cdiocddasrc", "cda-source");
+               eDebug("play webradio!");
+               source = gst_element_factory_make ("neonhttpsrc", "http-source");
                if (source)
-                       g_object_set (G_OBJECT (source), "device", "/dev/cdroms/cdrom0", NULL);
+               {
+                       g_object_set (G_OBJECT (source), "location", filename, NULL);
+                       g_object_set (G_OBJECT (source), "automatic-redirect", TRUE, NULL);
+               }
                else
-                       is_AudioCD = 0;
+                       m_error_message = "GStreamer plugin neonhttpsrc not available!\n";
        }
-       if ( !is_streaming && !is_AudioCD )
-               source = gst_element_factory_make ("filesrc", "file-source");
-       else if ( is_streaming ) 
+       else if ( sourceinfo.containertype == ctCDA )
        {
-               source = gst_element_factory_make ("neonhttpsrc", "http-source");
+               source = gst_element_factory_make ("cdiocddasrc", "cda-source");
                if (source)
-                       g_object_set (G_OBJECT (source), "automatic-redirect", TRUE, NULL);
+               {
+                       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);
+               }
        }
-
-       if (!source)
-               eWarning("failed to create %s", is_streaming ? "neonhttpsrc" : "filesrc");
-                               /* 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);
+       else if ( sourceinfo.containertype == ctVCD )
+       {
+               int fd = open(filename,O_RDONLY);
+               char tmp[128*1024];
+               int ret = read(fd, tmp, 128*1024);
+               close(fd);
+               if ( ret == -1 ) // this is a "REAL" VCD
+                       source = gst_element_factory_make ("vcdsrc", "vcd-source");
+                       if (source)
+                               g_object_set (G_OBJECT (source), "device", "/dev/cdroms/cdrom0", NULL);
        }
-
-       if (is_audio)
+       if ( !source && !sourceinfo.is_streaming )
        {
-                       /* filesrc -> decodebin -> audioconvert -> capsfilter -> alsasink */
-               const char *decodertype = is_mp3 ? "mad" : "decodebin";
-
-               decoder = gst_element_factory_make (decodertype, "decoder");
-               if (!decoder)
-                       eWarning("failed to create %s decoder", decodertype);
-
-                       /* mp3 decoding needs id3demux to extract ID3 data. 'decodebin' would do that internally. */
-               if (is_mp3)
-               {
-                       filter = gst_element_factory_make ("id3demux", "filter");
-                       if (!filter)
-                               eWarning("failed to create id3demux");
-               }
-
-               conv = gst_element_factory_make ("audioconvert", "converter");
-               if (!conv)
-                       eWarning("failed to create audioconvert");
-
-               flt = gst_element_factory_make ("capsfilter", "flt");
-               if (!flt)
-                       eWarning("failed to create capsfilter");
-
-                       /* for some reasons, we need to set the sample format to depth/width=16, because auto negotiation doesn't work. */
-                       /* 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);
-                       g_object_set (G_OBJECT (flt), "caps", caps, (char*)0);
-                       gst_caps_unref(caps);
-               }
-
-               sink = gst_element_factory_make ("alsasink", "alsa-output");
-               if (!sink)
-                       eWarning("failed to create osssink");
-
-               if (source && decoder && conv && sink)
-                       all_ok = 1;
-       } else /* is_video */
+               source = gst_element_factory_make ("filesrc", "file-source");
+               if (source)
+                       g_object_set (G_OBJECT (source), "location", filename, NULL);
+               else
+                       m_error_message = "GStreamer can't open filesrc " + (std::string)filename + "!\n";
+       }
+       if ( sourceinfo.is_video )
        {
                        /* filesrc -> mpegdemux -> | queue_audio -> dvbaudiosink
                                                   | queue_video -> dvbvideosink */
 
                audio = gst_element_factory_make("dvbaudiosink", "audiosink");
-               queue_audio = gst_element_factory_make("queue", "queue_audio");
-               
+               if (!audio)
+                       m_error_message += "failed to create Gstreamer element dvbaudiosink\n";
+
                video = gst_element_factory_make("dvbvideosink", "videosink");
+               if (!video)
+                       m_error_message += "failed to create Gstreamer element dvbvideosink\n";
+
+               queue_audio = gst_element_factory_make("queue", "queue_audio");
                queue_video = gst_element_factory_make("queue", "queue_video");
-               
-               if (is_mpeg_ps)
-                       videodemux = gst_element_factory_make("flupsdemux", "videodemux");
-               else if (is_mpeg_ts)
-                       videodemux = gst_element_factory_make("flutsdemux", "videodemux");
-               else if (is_matroska)
-                       videodemux = gst_element_factory_make("matroskademux", "videodemux");
-               else if (is_avi)
-                       videodemux = gst_element_factory_make("avidemux", "videodemux");
 
-               if (!videodemux)
+               std::string demux_type;
+               switch (sourceinfo.containertype)
                {
-                       eDebug("fluendo mpegdemux not available, falling back to mpegdemux\n");
-                       videodemux = gst_element_factory_make("mpegdemux", "videodemux");
+                       case ctMPEGTS:
+                               demux_type = "flutsdemux";
+                               break;
+                       case ctMPEGPS:
+                       case ctVCD:
+                               demux_type = "flupsdemux";
+                               break;
+                       case ctMKV:
+                               demux_type = "matroskademux";
+                               break;
+                       case ctAVI:
+                               demux_type = "avidemux";
+                               break;
+                       case ctMP4:
+                               demux_type = "qtdemux";
+                               break;
+                       default:
+                               break;
                }
+               videodemux = gst_element_factory_make(demux_type.c_str(), "videodemux");
+               if (!videodemux)
+                       m_error_message = "GStreamer plugin " + demux_type + " not available!\n";
+
+               switch_audio = gst_element_factory_make ("input-selector", "switch_audio");
+               if (!switch_audio)
+                       m_error_message = "GStreamer plugin input-selector not available!\n";
 
-               eDebug("audio: %p, queue_audio %p, video %p, queue_video %p, videodemux %p", audio, queue_audio, video, queue_video, videodemux);
-               if (audio && queue_audio && video && queue_video && videodemux)
+               if (audio && queue_audio && video && queue_video && videodemux && switch_audio)
                {
                        g_object_set (G_OBJECT (queue_audio), "max-size-bytes", 256*1024, NULL);
                        g_object_set (G_OBJECT (queue_audio), "max-size-buffers", 0, NULL);
@@ -319,62 +349,123 @@ eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eAp
                        g_object_set (G_OBJECT (queue_video), "max-size-buffers", 0, NULL);
                        g_object_set (G_OBJECT (queue_video), "max-size-bytes", 2*1024*1024, NULL);
                        g_object_set (G_OBJECT (queue_video), "max-size-time", (guint64)0, NULL);
+                       g_object_set (G_OBJECT (switch_audio), "select-all", TRUE, NULL);
                        all_ok = 1;
                }
+       } else /* is audio */
+       {
+               std::string demux_type;
+               switch ( sourceinfo.containertype )
+               {
+                       case ctMP4:
+                               demux_type = "qtdemux";
+                               break;
+                       default:
+                               break;
+               }
+               if ( demux_type.length() )
+               {
+                       audiodemux = gst_element_factory_make(demux_type.c_str(), "audiodemux");
+                       if (!audiodemux)
+                               m_error_message = "GStreamer plugin " + demux_type + " not available!\n";
+               }
+               switch ( sourceinfo.audiotype )
+               {
+                       case atMP3:
+                       {
+                               id3demux = gst_element_factory_make("id3demux", "id3demux");
+                               if ( !id3demux )
+                               {
+                                       m_error_message += "failed to create Gstreamer element id3demux\n";
+                                       break;
+                               }
+                               parser = gst_element_factory_make("mp3parse", "audiosink");
+                               if ( !parser )
+                               {
+                                       m_error_message += "failed to create Gstreamer element mp3parse\n";
+                                       break;
+                               }
+                               sink = gst_element_factory_make("dvbaudiosink", "audiosink2");
+                               if ( !sink )
+                                       m_error_message += "failed to create Gstreamer element dvbaudiosink\n";
+                               else
+                                       all_ok = 1;
+                               break;
+                       }
+                       case atAAC:
+                       {
+                               if ( !audiodemux )
+                               {
+                                       m_error_message += "cannot parse raw AAC audio\n";
+                                       break;
+                               }
+                               sink = gst_element_factory_make("dvbaudiosink", "audiosink");
+                               if (!sink)
+                                       m_error_message += "failed to create Gstreamer element dvbaudiosink\n";
+                               else
+                                       all_ok = 1;
+                               break;
+                       }
+                       case atAC3:
+                       {
+                               if ( !audiodemux )
+                               {
+                                       m_error_message += "cannot parse raw AC3 audio\n";
+                                       break;
+                               }
+                               sink = gst_element_factory_make("dvbaudiosink", "audiosink");
+                               if ( !sink )
+                                       m_error_message += "failed to create Gstreamer element dvbaudiosink\n";
+                               else
+                                       all_ok = 1;
+                               break;
+                       }
+                       default:
+                       {       /* filesrc -> decodebin -> audioconvert -> capsfilter -> alsasink */
+                               decoder = gst_element_factory_make ("decodebin", "decoder");
+                               if (!decoder)
+                                       m_error_message += "failed to create Gstreamer element decodebin\n";
+               
+                               conv = gst_element_factory_make ("audioconvert", "converter");
+                               if (!conv)
+                                       m_error_message += "failed to create Gstreamer element audioconvert\n";
+               
+                               flt = gst_element_factory_make ("capsfilter", "flt");
+                               if (!flt)
+                                       m_error_message += "failed to create Gstreamer element capsfilter\n";
+               
+                                       /* for some reasons, we need to set the sample format to depth/width=16, because auto negotiation doesn't work. */
+                                       /* 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, */NULL);
+                                       g_object_set (G_OBJECT (flt), "caps", caps, NULL);
+                                       gst_caps_unref(caps);
+                               }
+               
+                               sink = gst_element_factory_make ("alsasink", "alsa-output");
+                               if (!sink)
+                                       m_error_message += "failed to create Gstreamer element alsasink\n";
+               
+                               if (source && decoder && conv && sink)
+                                       all_ok = 1;
+                               break;
+                       }
+               }
+
        }
-       
        if (m_gst_pipeline && all_ok)
        {
                gst_bus_set_sync_handler(gst_pipeline_get_bus (GST_PIPELINE (m_gst_pipeline)), gstBusSyncHandler, this);
 
-               if (is_AudioCD)
+               if ( sourceinfo.containertype == ctCDA )
                {
                        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");
-
-                       if (!is_mp3)
-                       {
-                                       /* decodebin has dynamic pads. When they get created, we connect them to the audio bin */
-                               g_signal_connect (decoder, "new-decoded-pad", G_CALLBACK(gstCBnewPad), this);
-                               g_signal_connect (decoder, "unknown-type", G_CALLBACK(gstCBunknownType), this);
-                               g_object_set (G_OBJECT (sink), "preroll-queue-len", 80, NULL);
-                       }
-
-                               /* gst_bin will take the 'floating references' */
-                       gst_bin_add_many (GST_BIN (m_gst_pipeline),
-                                               source, queue_audio, decoder, NULL);
-
-                       if (filter)
-                       {
-                                       /* id3demux also has dynamic pads, which need to be connected to the decoder (this is done in the 'gstCBfilterPadAdded' CB) */
-                               gst_bin_add(GST_BIN(m_gst_pipeline), filter);
-                               gst_element_link(source, filter);
-                               g_signal_connect (filter, "pad-added", G_CALLBACK(gstCBfilterPadAdded), this);
-                       } else
-                                       /* in decodebin's case we can just connect the source with the decodebin, and decodebin will take care about id3demux (or whatever is required) */
-                               gst_element_link_many(source, queue_audio, decoder, NULL);
-
-                               /* create audio bin with the audioconverter, the capsfilter and the audiosink */
-                       audio = gst_bin_new ("audiobin");
-
-                       GstPad *audiopad = gst_element_get_static_pad (conv, "sink");
-                       gst_bin_add_many(GST_BIN(audio), conv, flt, sink, (char*)0);
-                       gst_element_link_many(conv, flt, sink, (char*)0);
-                       gst_element_add_pad(audio, gst_ghost_pad_new ("sink", audiopad));
-                       gst_object_unref(audiopad);
-                       gst_bin_add (GST_BIN(m_gst_pipeline), audio);
-                               /* in mad's case, we can directly connect the decoder to the audiobin. otherwise, we do this in gstCBnewPad */
-                       if (is_mp3)
-                               gst_element_link(decoder, audio);
-                       audioStream audioStreamElem;
-                       m_audioStreams.push_back(audioStreamElem);
-               } else /* is_video */
+               else if ( sourceinfo.is_video )
                {
                        char srt_filename[strlen(filename)+1];
                        strncpy(srt_filename,filename,strlen(filename)-3);
@@ -384,42 +475,88 @@ eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eAp
                        if (stat(srt_filename, &buffer) == 0)
                        {
                                eDebug("subtitle file found: %s",srt_filename);
-                               GstElement *subsource;
-                               subsource = gst_element_factory_make ("filesrc", "srt_source");
-                               g_object_set (G_OBJECT (subsource), "location", filename, NULL);
-                               GstElement *parser = gst_element_factory_make("subparse", "srt_parse");
-                               eDebug ("subparse = %p", parser);
-                               GstElement *sink = gst_element_factory_make("fakesink", "srt_sink");
-                               eDebug ("fakesink = %p", sink);
-                               g_object_set (G_OBJECT(sink), "signal-handoffs", TRUE, NULL);
-                               gst_bin_add_many(GST_BIN (m_gst_pipeline), subsource, parser, sink, NULL);
-                               GstPadLinkReturn res = gst_element_link(subsource, parser);
-                               eDebug ("parser link = %d", res);
-                               res = gst_element_link(parser, sink);
-                               eDebug ("sink link = %d", res);
-                               g_signal_connect(sink, "handoff", G_CALLBACK(gstCBsubtitleAvail), this);
+                               GstElement *subsource = gst_element_factory_make ("filesrc", "srt_source");
+                               g_object_set (G_OBJECT (subsource), "location", srt_filename, NULL);
+                               gst_bin_add(GST_BIN (m_gst_pipeline), subsource);
+                               GstPad *switchpad = gstCreateSubtitleSink(this, stSRT);
+                               gst_pad_link(gst_element_get_pad (subsource, "src"), switchpad);
                                subtitleStream subs;
-                               subs.element = sink;
+                               subs.pad = switchpad;
+                               subs.type = stSRT;
+                               subs.language_code = std::string("und");
                                m_subtitleStreams.push_back(subs);
                        }
-                       else
-                               eDebug("subtitle file not found: %s",srt_filename);
+                       gst_bin_add_many(GST_BIN(m_gst_pipeline), source, videodemux, audio, queue_audio, video, queue_video, switch_audio, NULL);
 
-                       gst_bin_add_many(GST_BIN(m_gst_pipeline), source, videodemux, audio, queue_audio, video, queue_video, NULL);
-                       switch_audio = gst_element_factory_make ("input-selector", "switch_audio");
-                       if (switch_audio)
+                       if ( sourceinfo.containertype == ctVCD && gst_bin_get_by_name(GST_BIN(m_gst_pipeline),"file-source") )
                        {
-                               g_object_set (G_OBJECT (switch_audio), "select-all", TRUE, NULL);
-                               gst_bin_add(GST_BIN(m_gst_pipeline), switch_audio);
-                               gst_element_link(switch_audio, queue_audio);
+                               eDebug("this is a fake video cd... we use filesrc ! cdxaparse !");
+                               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);
                        }
-                       gst_element_link(source, videodemux);
+                       else
+                               gst_element_link(source, videodemux);
+
+                       gst_element_link(switch_audio, queue_audio);
                        gst_element_link(queue_audio, audio);
                        gst_element_link(queue_video, video);
                        g_signal_connect(videodemux, "pad-added", G_CALLBACK (gstCBpadAdded), this);
+
+               } else /* is audio*/
+               {
+                       if ( decoder )
+                       {
+                               queue_audio = gst_element_factory_make("queue", "queue_audio");
+       
+                               g_signal_connect (decoder, "new-decoded-pad", G_CALLBACK(gstCBnewPad), this);
+                               g_signal_connect (decoder, "unknown-type", G_CALLBACK(gstCBunknownType), this);
+       
+                               g_object_set (G_OBJECT (sink), "preroll-queue-len", 80, NULL);
+       
+                                       /* gst_bin will take the 'floating references' */
+                               gst_bin_add_many (GST_BIN (m_gst_pipeline),
+                                                       source, queue_audio, decoder, NULL);
+       
+                                       /* in decodebin's case we can just connect the source with the decodebin, and decodebin will take care about id3demux (or whatever is required) */
+                               gst_element_link_many(source, queue_audio, decoder, NULL);
+       
+                                       /* create audio bin with the audioconverter, the capsfilter and the audiosink */
+                               audio = gst_bin_new ("audiobin");
+       
+                               GstPad *audiopad = gst_element_get_static_pad (conv, "sink");
+                               gst_bin_add_many(GST_BIN(audio), conv, flt, sink, NULL);
+                               gst_element_link_many(conv, flt, sink, NULL);
+                               gst_element_add_pad(audio, gst_ghost_pad_new ("sink", audiopad));
+                               gst_object_unref(audiopad);
+                               gst_bin_add (GST_BIN(m_gst_pipeline), audio);
+                       }
+                       else
+                       {
+                               gst_bin_add_many (GST_BIN (m_gst_pipeline), source, sink, NULL);
+                               if ( parser && id3demux )
+                               {
+                                       gst_bin_add_many (GST_BIN (m_gst_pipeline), parser, id3demux, NULL);
+                                       gst_element_link(source, id3demux);
+                                       g_signal_connect(id3demux, "pad-added", G_CALLBACK (gstCBpadAdded), this);
+                                       gst_element_link(parser, sink);
+                               }
+                               if ( audiodemux )
+                               {
+                                       gst_bin_add (GST_BIN (m_gst_pipeline), audiodemux);
+                                       g_signal_connect(audiodemux, "pad-added", G_CALLBACK (gstCBpadAdded), this);
+                                       gst_element_link(source, audiodemux);
+                               }
+                               audioStream audio;
+                               audio.type = sourceinfo.audiotype;
+                               m_audioStreams.push_back(audio);
+                       }
                }
        } else
        {
+               m_event((iPlayableService*)this, evUser+12);
+
                if (m_gst_pipeline)
                        gst_object_unref(GST_OBJECT(m_gst_pipeline));
                if (source)
@@ -444,10 +581,10 @@ eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eAp
                if (switch_audio)
                        gst_object_unref(GST_OBJECT(switch_audio));
 
-               eDebug("sorry, can't play.");
+               eDebug("sorry, can't play: %s",m_error_message.c_str());
                m_gst_pipeline = 0;
        }
-       
+
        gst_element_set_state (m_gst_pipeline, GST_STATE_PLAYING);
 }
 
@@ -521,9 +658,9 @@ RESULT eServiceMP3::setFastForward(int ratio)
 {
        m_currentTrickRatio = ratio;
        if (ratio)
-               m_seekTimeout.start(1000, 0);
+               m_seekTimeout->start(1000, 0);
        else
-               m_seekTimeout.stop();
+               m_seekTimeout->stop();
        return 0;
 }
 
@@ -537,13 +674,13 @@ void eServiceMP3::seekTimeoutCB()
        if (ppos < 0)
        {
                ppos = 0;
-               m_seekTimeout.stop();
+               m_seekTimeout->stop();
        }
        if (ppos > len)
        {
                ppos = 0;
                stop();
-               m_seekTimeout.stop();
+               m_seekTimeout->stop();
                return;
        }
        seekTo(ppos);
@@ -689,6 +826,8 @@ int eServiceMP3::getInfo(int w)
        case sTracknumber:
        case sGenre:
        case sVideoType:
+       case sTimeCreate:
+       case sUser+12:
                return resIsString;
        case sCurrentTitle:
                tag = GST_TAG_TRACK_NUMBER;
@@ -713,6 +852,8 @@ int eServiceMP3::getInfo(int w)
 
 std::string eServiceMP3::getInfoString(int w)
 {
+       if ( !m_stream_tags )
+               return "";
        gchar *tag = 0;
        switch (w)
        {
@@ -737,22 +878,29 @@ std::string eServiceMP3::getInfoString(int w)
        case sVideoType:
                tag = GST_TAG_VIDEO_CODEC;
                break;
+       case sTimeCreate:
+               GDate *date;
+               if (gst_tag_list_get_date(m_stream_tags, GST_TAG_DATE, &date))
+               {
+                       gchar res[5];
+                       g_date_strftime (res, sizeof(res), "%Y", date); 
+                       return (std::string)res;
+               }
+               break;
+       case sUser+12:
+               return m_error_message;
        default:
                return "";
        }
-       
-       if (!m_stream_tags || !tag)
+       if ( !tag )
                return "";
-       
        gchar *value;
-       
        if (gst_tag_list_get_string(m_stream_tags, tag, &value))
        {
                std::string res = value;
                g_free(value);
                return res;
        }
-       
        return "";
 }
 
@@ -799,19 +947,19 @@ int eServiceMP3::selectAudioStream(int i)
 {
        gint nb_sources;
        GstPad *active_pad;
-       GstElement *selector = gst_bin_get_by_name(GST_BIN(m_gst_pipeline),"switch_audio");
-       if ( !selector)
+       GstElement *switch_audio = gst_bin_get_by_name(GST_BIN(m_gst_pipeline),"switch_audio");
+       if ( !switch_audio )
        {
                eDebug("can't switch audio tracks! gst-plugin-selector needed");
                return -1;
        }
-       g_object_get (G_OBJECT (selector), "n-pads", &nb_sources, NULL);
-       if ( i >= m_audioStreams.size() || i >= nb_sources || m_currentAudioStream >= m_audioStreams.size() )
+       g_object_get (G_OBJECT (switch_audio), "n-pads", &nb_sources, NULL);
+       if ( (unsigned int)i >= m_audioStreams.size() || i >= nb_sources || (unsigned int)m_currentAudioStream >= m_audioStreams.size() )
                return -2;
        char sinkpad[8];
        sprintf(sinkpad, "sink%d", i);
-       g_object_set (G_OBJECT (selector), "active-pad", gst_element_get_pad (selector, sinkpad), NULL);
-       g_object_get (G_OBJECT (selector), "active-pad", &active_pad, NULL);
+       g_object_set (G_OBJECT (switch_audio), "active-pad", gst_element_get_pad (switch_audio, sinkpad), NULL);
+       g_object_get (G_OBJECT (switch_audio), "active-pad", &active_pad, NULL);
        gchar *name;
        name = gst_pad_get_name (active_pad);
        eDebug ("switched audio to (%s)", name);
@@ -836,19 +984,19 @@ RESULT eServiceMP3::getTrackInfo(struct iAudioTrackInfo &info, unsigned int i)
 //     eDebug("eServiceMP3::getTrackInfo(&info, %i)",i);
        if (i >= m_audioStreams.size())
                return -2;
-       if (m_audioStreams[i].type == audioStream::atMP2)
-               info.m_description = "MP2";
-       else if (m_audioStreams[i].type == audioStream::atMP3)
+       if (m_audioStreams[i].type == atMPEG)
+               info.m_description = "MPEG";
+       else if (m_audioStreams[i].type == atMP3)
                info.m_description = "MP3";
-       else if (m_audioStreams[i].type == audioStream::atAC3)
+       else if (m_audioStreams[i].type == atAC3)
                info.m_description = "AC3";
-       else if (m_audioStreams[i].type == audioStream::atAAC)
+       else if (m_audioStreams[i].type == atAAC)
                info.m_description = "AAC";
-       else if (m_audioStreams[i].type == audioStream::atDTS)
+       else if (m_audioStreams[i].type == atDTS)
                info.m_description = "DTS";
-       else if (m_audioStreams[i].type == audioStream::atPCM)
+       else if (m_audioStreams[i].type == atPCM)
                info.m_description = "PCM";
-       else if (m_audioStreams[i].type == audioStream::atOGG)
+       else if (m_audioStreams[i].type == atOGG)
                info.m_description = "OGG";
        else
                info.m_description = "???";
@@ -866,7 +1014,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));
@@ -875,65 +1023,158 @@ 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:
-               m_event((iPlayableService*)this, evEOF);
-               break;
-       case GST_MESSAGE_ERROR:
-       {
-               gchar *debug;
-               GError *err;
-
-               gst_message_parse_error (msg, &err, &debug);
-               g_free (debug);
-               eWarning("Gstreamer error: %s (%i)", err->message, err->code );
-               if ( err->domain == GST_STREAM_ERROR && err->code == GST_STREAM_ERROR_DECODE )
+               case GST_MESSAGE_EOS:
+                       m_event((iPlayableService*)this, evEOF);
+                       break;
+               case GST_MESSAGE_ERROR:
                {
-                       if ( g_strrstr(sourceName, "videosink") )
-                               m_event((iPlayableService*)this, evUser+11);
+                       gchar *debug;
+                       GError *err;
+       
+                       gst_message_parse_error (msg, &err, &debug);
+                       g_free (debug);
+                       eWarning("Gstreamer error: %s (%i)", err->message, err->code );
+                       if ( err->domain == GST_STREAM_ERROR && err->code == GST_STREAM_ERROR_CODEC_NOT_FOUND )
+                       {
+                               if ( g_strrstr(sourceName, "videosink") )
+                                       m_event((iPlayableService*)this, evUser+11);
+                       }
+                       g_error_free(err);
+                       break;
                }
-               g_error_free(err);
-                       /* TODO: signal error condition to user */
-               break;
-       }
-       case GST_MESSAGE_TAG:
-       {
-               GstTagList *tags, *result;
-               gst_message_parse_tag(msg, &tags);
-
-               result = gst_tag_list_merge(m_stream_tags, tags, GST_TAG_MERGE_PREPEND);
-               if (result)
+               case GST_MESSAGE_INFO:
                {
-                       if (m_stream_tags)
-                               gst_tag_list_free(m_stream_tags);
-                       m_stream_tags = result;
+                       gchar *debug;
+                       GError *inf;
+       
+                       gst_message_parse_info (msg, &inf, &debug);
+                       g_free (debug);
+                       if ( inf->domain == GST_STREAM_ERROR && inf->code == GST_STREAM_ERROR_DECODE )
+                       {
+                               if ( g_strrstr(sourceName, "videosink") )
+                                       m_event((iPlayableService*)this, evUser+14);
+                       }
+                       g_error_free(inf);
+                       break;
                }
-               gchar *g_audiocodec;
-               if (gst_tag_list_get_string(tags, GST_TAG_AUDIO_CODEC, &g_audiocodec) && m_audioStreams.size())
+               case GST_MESSAGE_TAG:
                {
-                       std::vector<audioStream>::iterator IterAudioStream = m_audioStreams.begin();
-                       while ( IterAudioStream->language_code.length() && IterAudioStream != m_audioStreams.end())
-                               IterAudioStream++;
-                       if ( g_strrstr(g_audiocodec, "MPEG-1 layer 2") )
-                               IterAudioStream->type = audioStream::atMP2;
-                       else if ( g_strrstr(g_audiocodec, "MPEG-1 layer 3") )
-                               IterAudioStream->type = audioStream::atMP3;
-                       else if ( g_strrstr(g_audiocodec, "AC-3 audio") )
-                               IterAudioStream->type = audioStream::atAC3;
-                       else if ( g_strrstr(g_audiocodec, "Uncompressed 16-bit PCM audio") )
-                               IterAudioStream->type = audioStream::atPCM;
-                       gchar *g_language;
-                       if ( gst_tag_list_get_string(tags, GST_TAG_LANGUAGE_CODE, &g_language) )
-                               IterAudioStream->language_code = std::string(g_language);
-                       g_free (g_language);
-                       g_free (g_audiocodec);
+                       GstTagList *tags, *result;
+                       gst_message_parse_tag(msg, &tags);
+       
+                       result = gst_tag_list_merge(m_stream_tags, tags, GST_TAG_MERGE_PREPEND);
+                       if (result)
+                       {
+                               if (m_stream_tags)
+                                       gst_tag_list_free(m_stream_tags);
+                               m_stream_tags = result;
+                       }
+       
+                       gchar *g_audiocodec;
+                       if ( gst_tag_list_get_string(tags, GST_TAG_AUDIO_CODEC, &g_audiocodec) && m_audioStreams.size() == 0 )
+                       {
+                               GstPad* pad = gst_element_get_pad (GST_ELEMENT(source), "src");
+                               GstCaps* caps = gst_pad_get_caps(pad);
+                               GstStructure* str = gst_caps_get_structure(caps, 0);
+                               if ( !str )
+                                       break;
+                               audioStream audio;
+                               audio.type = gstCheckAudioPad(str);
+                               m_audioStreams.push_back(audio);
+                       }
+       
+                       const 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);
+                               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;
                }
-               break;
-       }
-       default:
-               break;
+               case GST_MESSAGE_ASYNC_DONE:
+               {
+                       GstTagList *tags;
+                       for (std::vector<audioStream>::iterator IterAudioStream(m_audioStreams.begin()); IterAudioStream != m_audioStreams.end(); ++IterAudioStream)
+                       {
+                               if ( IterAudioStream->pad )
+                               {
+                                       g_object_get(IterAudioStream->pad, "tags", &tags, NULL);
+                                       gchar *g_language;
+                                       if ( tags && gst_is_tag_list(tags) && gst_tag_list_get_string(tags, GST_TAG_LANGUAGE_CODE, &g_language) )
+                                       {
+                                               eDebug("found audio language %s",g_language);
+                                               IterAudioStream->language_code = std::string(g_language);
+                                               g_free (g_language);
+                                       }
+                               }
+                       }
+                       for (std::vector<subtitleStream>::iterator IterSubtitleStream(m_subtitleStreams.begin()); IterSubtitleStream != m_subtitleStreams.end(); ++IterSubtitleStream)
+                       {
+                               if ( IterSubtitleStream->pad )
+                               {
+                                       g_object_get(IterSubtitleStream->pad, "tags", &tags, NULL);
+                                       gchar *g_language;
+                                       if ( tags && gst_is_tag_list(tags) && gst_tag_list_get_string(tags, GST_TAG_LANGUAGE_CODE, &g_language) )
+                                       {
+                                               eDebug("found subtitle language %s",g_language);
+                                               IterSubtitleStream->language_code = std::string(g_language);
+                                               g_free (g_language);
+                                       }
+                               }
+                       }
+               }
+               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 = "GStreamer plugin " + (std::string)description + " not available!\n";
+                                       g_free(description);
+                                       m_event((iPlayableService*)this, evUser+12);
+                               }
+                       }
+                       else if (const GstStructure *msgstruct = gst_message_get_structure(msg))
+                       {
+                               const gchar *eventname;
+                               if ( eventname = gst_structure_get_name(msgstruct) )
+                               {
+                                       if (!strcmp(eventname, "eventSizeChanged"))
+                                       {
+                                               gint aspect_ratio, width, height = 0;
+                                               gst_structure_get_int (msgstruct, "aspect_ratio", &aspect_ratio);
+                                               gst_structure_get_int (msgstruct, "width", &width);
+                                               gst_structure_get_int (msgstruct, "height", &height);
+                                               eDebug("****** decoder threw eventSizeChanged! aspect_ratio=%i, width=%i, height=%i", aspect_ratio, width, height);
+                                       }
+                                       if (!strcmp(eventname, "eventFrameRateChanged"))
+                                       {
+                                               gint frame_rate = 0;
+                                               gst_structure_get_int (msgstruct, "frame_rate", &frame_rate);
+                                               eDebug("****** decoder threw eventFrameRateChanged! frame_rate=%i", frame_rate);
+                                       }
+                                       if (!strcmp(eventname, "eventProgressiveChanged"))
+                                       {
+                                               gint progressive = 0;
+                                               gst_structure_get_int (msgstruct, "progressive", &progressive);
+                                               eDebug("****** decoder threw eventProgressiveChanged! progressive=%i", progressive);
+                                       }
+                               }
+                       }
+               }
+               default:
+                       break;
        }
        g_free (sourceName);
 }
@@ -946,62 +1187,162 @@ GstBusSyncReply eServiceMP3::gstBusSyncHandler(GstBus *bus, GstMessage *message,
        return GST_BUS_PASS;
 }
 
+audiotype_t eServiceMP3::gstCheckAudioPad(GstStructure* structure)
+{
+       const gchar* type;
+       type = gst_structure_get_name(structure);
+
+       if (!strcmp(type, "audio/mpeg")) {
+                       gint mpegversion, layer = 0;
+                       gst_structure_get_int (structure, "mpegversion", &mpegversion);
+                       gst_structure_get_int (structure, "layer", &layer);
+                       eDebug("mime audio/mpeg version %d layer %d", mpegversion, layer);
+                       switch (mpegversion) {
+                               case 1:
+                               {
+                                       if ( layer == 3 )
+                                               return atMP3;
+                                       else
+                                               return atMPEG;
+                               }
+                               case 2:
+                                       return atMPEG;
+                               case 4:
+                                       return atAAC;
+                               default:
+                                       return atUnknown;
+                       }
+               }
+       else
+       {
+               eDebug("mime %s", type);
+               if (!strcmp(type, "audio/x-ac3") || !strcmp(type, "audio/ac3"))
+                       return atAC3;
+               else if (!strcmp(type, "audio/x-dts") || !strcmp(type, "audio/dts"))
+                       return atDTS;
+               else if (!strcmp(type, "audio/x-raw-int"))
+                       return atPCM;
+       }
+       return atUnknown;
+}
+
 void eServiceMP3::gstCBpadAdded(GstElement *decodebin, GstPad *pad, gpointer user_data)
 {
+       const gchar* type;
+       GstCaps* caps;
+       GstStructure* str;
+       caps = gst_pad_get_caps(pad);
+       str = gst_caps_get_structure(caps, 0);
+       type = gst_structure_get_name(str);
+
+       eDebug("A new pad %s:%s was created", GST_OBJECT_NAME (decodebin), GST_OBJECT_NAME (pad));
+
        eServiceMP3 *_this = (eServiceMP3*)user_data;
        GstBin *pipeline = GST_BIN(_this->m_gst_pipeline);
-       gchar *name;
-       name = gst_pad_get_name (pad);
-       eDebug ("A new pad %s was created", name);
-       if (g_strrstr(name,"audio")) // mpegdemux, matroskademux, avidemux use video_nn with n=0,1,.., flupsdemux uses stream id
+       if (g_strrstr(type,"audio"))
        {
-               GstElement *selector = gst_bin_get_by_name(pipeline , "switch_audio" );
                audioStream audio;
-               audio.pad = pad;
-               _this->m_audioStreams.push_back(audio);
-               if ( selector )
+               audio.type = _this->gstCheckAudioPad(str);
+               GstElement *switch_audio = gst_bin_get_by_name(pipeline , "switch_audio");
+               if ( switch_audio )
                {
-                       gst_pad_link(pad, gst_element_get_request_pad (selector, "sink%d"));
+                       GstPad *sinkpad = gst_element_get_request_pad (switch_audio, "sink%d");
+                       gst_pad_link(pad, sinkpad);
+                       audio.pad = sinkpad;
+                       _this->m_audioStreams.push_back(audio);
+               
                        if ( _this->m_audioStreams.size() == 1 )
                        {
                                _this->selectAudioStream(0);
                                gst_element_set_state (_this->m_gst_pipeline, GST_STATE_PLAYING);
                        }
                        else
-                               g_object_set (G_OBJECT (selector), "select-all", FALSE, NULL);
+                               g_object_set (G_OBJECT (switch_audio), "select-all", FALSE, NULL);
                }
                else
-                       gst_pad_link(pad, gst_element_get_static_pad(gst_bin_get_by_name(pipeline,"queue_audio"), "sink"));
+               {
+                       GstElement *queue_audio = gst_bin_get_by_name(pipeline , "queue_audio");
+                       if ( queue_audio )
+                       {
+                               gst_pad_link(pad, gst_element_get_static_pad(queue_audio, "sink"));
+                               _this->m_audioStreams.push_back(audio);
+                       }
+                       else
+                               gst_pad_link(pad, gst_element_get_static_pad(gst_bin_get_by_name(pipeline , "audiosink"), "sink"));
+               }
        }
-       if (g_strrstr(name,"video"))
+       if (g_strrstr(type,"video"))
        {
                gst_pad_link(pad, gst_element_get_static_pad(gst_bin_get_by_name(pipeline,"queue_video"), "sink"));
        }
-       if (g_strrstr(name,"subtitle"))
+       if (g_strrstr(type,"application/x-ssa") || g_strrstr(type,"application/x-ass"))
        {
-//             GstCaps *caps;
-//             const GstStructure *structure;  
-//             caps = gst_pad_get_caps(name);
-//             structure = gst_caps_get_structure(caps, 0);
-               char elemname[17];
-               sprintf(elemname, "%s_pars", name);
-               GstElement *parser = gst_element_factory_make("ssaparse", elemname);
-               eDebug ("ssaparse %s = %p", elemname, parser);
-               sprintf(elemname, "%s_sink", name);
-               GstElement *sink = gst_element_factory_make("fakesink", elemname);
-               eDebug ("fakesink %s = %p", elemname, sink);
-               g_object_set (G_OBJECT(sink), "signal-handoffs", TRUE, NULL);
-               gst_bin_add_many(pipeline, parser, sink, NULL);
-               GstPadLinkReturn res = gst_pad_link(pad, gst_element_get_static_pad(parser, "sink"));
-               eDebug ("parser link = %d", res);
-               res = gst_element_link(parser, sink);
-               eDebug ("sink link = %d", res);
-               g_signal_connect(sink, "handoff", G_CALLBACK(gstCBsubtitleAvail), _this);
+               GstPad *switchpad = _this->gstCreateSubtitleSink(_this, stSSA);
+               gst_pad_link(pad, switchpad);
                subtitleStream subs;
-               subs.element = sink;
+               subs.pad = switchpad;
+               subs.type = stSSA;
                _this->m_subtitleStreams.push_back(subs);
        }
-       g_free (name);
+       if (g_strrstr(type,"text/plain"))
+       {
+               GstPad *switchpad = _this->gstCreateSubtitleSink(_this, stPlainText);
+               gst_pad_link(pad, switchpad);
+               subtitleStream subs;
+               subs.pad = switchpad;
+               subs.type = stPlainText;
+               _this->m_subtitleStreams.push_back(subs);
+       }
+}
+
+GstPad* eServiceMP3::gstCreateSubtitleSink(eServiceMP3* _this, subtype_t type)
+{
+       GstBin *pipeline = GST_BIN(_this->m_gst_pipeline);
+       GstElement *switch_subparse = gst_bin_get_by_name(pipeline,"switch_subparse");
+       if ( !switch_subparse )
+       {
+               switch_subparse = gst_element_factory_make ("input-selector", "switch_subparse");
+               GstElement *sink = gst_element_factory_make("fakesink", "sink_subtitles");
+               gst_bin_add_many(pipeline, switch_subparse, sink, NULL);
+               gst_element_link(switch_subparse, sink);
+               g_object_set (G_OBJECT(sink), "signal-handoffs", TRUE, NULL);
+               g_object_set (G_OBJECT(sink), "sync", TRUE, NULL);
+               g_object_set (G_OBJECT(sink), "async", FALSE, NULL);
+               g_signal_connect(sink, "handoff", G_CALLBACK(_this->gstCBsubtitleAvail), _this);
+       
+               // order is essential since requested sink pad names can't be explicitely chosen
+               GstElement *switch_substream_plain = gst_element_factory_make ("input-selector", "switch_substream_plain");
+               gst_bin_add(pipeline, switch_substream_plain);
+               GstPad *sinkpad_plain = gst_element_get_request_pad (switch_subparse, "sink%d");
+               gst_pad_link(gst_element_get_pad (switch_substream_plain, "src"), sinkpad_plain);
+       
+               GstElement *switch_substream_ssa = gst_element_factory_make ("input-selector", "switch_substream_ssa");
+               GstElement *ssaparse = gst_element_factory_make("ssaparse", "ssaparse");
+               gst_bin_add_many(pipeline, switch_substream_ssa, ssaparse, NULL);
+               GstPad *sinkpad_ssa = gst_element_get_request_pad (switch_subparse, "sink%d");
+               gst_element_link(switch_substream_ssa, ssaparse);
+               gst_pad_link(gst_element_get_pad (ssaparse, "src"), sinkpad_ssa);
+       
+               GstElement *switch_substream_srt = gst_element_factory_make ("input-selector", "switch_substream_srt");
+               GstElement *srtparse = gst_element_factory_make("subparse", "srtparse");
+               gst_bin_add_many(pipeline, switch_substream_srt, srtparse, NULL);
+               GstPad *sinkpad_srt = gst_element_get_request_pad (switch_subparse, "sink%d");
+               gst_element_link(switch_substream_srt, srtparse);
+               gst_pad_link(gst_element_get_pad (srtparse, "src"), sinkpad_srt);
+               g_object_set (G_OBJECT(srtparse), "subtitle-encoding", "ISO-8859-15", NULL);
+       }
+
+       switch (type)
+       {
+               case stSSA:
+                       return gst_element_get_request_pad (gst_bin_get_by_name(pipeline,"switch_substream_ssa"), "sink%d");
+               case stSRT:
+                       return gst_element_get_request_pad (gst_bin_get_by_name(pipeline,"switch_substream_srt"), "sink%d");
+               case stPlainText:
+               default:
+                       break;
+       }
+       return gst_element_get_request_pad (gst_bin_get_by_name(pipeline,"switch_substream_plain"), "sink%d");
 }
 
 void eServiceMP3::gstCBfilterPadAdded(GstElement *filter, GstPad *pad, gpointer user_data)
@@ -1019,8 +1360,8 @@ void eServiceMP3::gstCBnewPad(GstElement *decodebin, GstPad *pad, gboolean last,
        GstPad *audiopad;
 
        /* only link once */
-       GstElement *audio = gst_bin_get_by_name(GST_BIN(_this->m_gst_pipeline),"audiobin");
-       audiopad = gst_element_get_static_pad (audio, "sink");
+       GstElement *audiobin = gst_bin_get_by_name(GST_BIN(_this->m_gst_pipeline),"audiobin");
+       audiopad = gst_element_get_static_pad (audiobin, "sink");
        if ( !audiopad || GST_PAD_IS_LINKED (audiopad)) {
                eDebug("audio already linked!");
                g_object_unref (audiopad);
@@ -1031,7 +1372,7 @@ void eServiceMP3::gstCBnewPad(GstElement *decodebin, GstPad *pad, gboolean last,
        caps = gst_pad_get_caps (pad);
        str = gst_caps_get_structure (caps, 0);
        eDebug("gst new pad! %s", gst_structure_get_name (str));
-       
+
        if (!g_strrstr (gst_structure_get_name (str), "audio")) {
                gst_caps_unref (caps);
                gst_object_unref (audiopad);
@@ -1073,63 +1414,88 @@ 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)
 {
-       const char *text = (unsigned char *)GST_BUFFER_DATA(buffer);
+       gint64 duration_ns = GST_BUFFER_DURATION(buffer);
+       const unsigned char *text = (unsigned char *)GST_BUFFER_DATA(buffer);
+       eDebug("gstCBsubtitleAvail: %s",text);
        eServiceMP3 *_this = (eServiceMP3*)user_data;
-       gchar *sourceName;
-       sourceName = gst_object_get_name(GST_OBJECT(element));
-       if ( _this->m_subtitle_widget && _this->m_subtitleStreams.at(_this->m_currentSubtitleStream).element == element)
+       if ( _this->m_subtitle_widget )
        {
-               eDVBTeletextSubtitlePage page;
+               ePangoSubtitlePage page;
                gRGB rgbcol(0xD0,0xD0,0xD0);
-               page.m_elements.push_back(eDVBTeletextSubtitlePageElement(rgbcol, text));
+               page.m_elements.push_back(ePangoSubtitlePageElement(rgbcol, (const char*)text));
+               page.m_timeout = duration_ns / 1000000;
                (_this->m_subtitle_widget)->setPage(page);
        }
-       else
-               eDebug("on inactive element: %s (%p) saw subtitle: %s",sourceName, element, text);
-       return TRUE;
 }
 
 RESULT eServiceMP3::enableSubtitles(eWidget *parent, ePyObject tuple)
 {
-       eDebug("eServiceMP3::enableSubtitles");
-
        ePyObject entry;
        int tuplesize = PyTuple_Size(tuple);
-       int type = 0;
-       int page, magazine, pid;
+       int pid;
+       int type;
+       gint nb_sources;
+       GstPad *active_pad;
+       GstElement *switch_substream = NULL;
+       GstElement *switch_subparse = gst_bin_get_by_name (GST_BIN(m_gst_pipeline), "switch_subparse");
 
        if (!PyTuple_Check(tuple))
                goto error_out;
-
        if (tuplesize < 1)
                goto error_out;
-
-       entry = PyTuple_GET_ITEM(tuple, 0);
-
-       if (!PyInt_Check(entry))
-               goto error_out;
-
-       type = PyInt_AsLong(entry);
-
        entry = PyTuple_GET_ITEM(tuple, 1);
        if (!PyInt_Check(entry))
                goto error_out;
        pid = PyInt_AsLong(entry);
+       entry = PyTuple_GET_ITEM(tuple, 2);
+       if (!PyInt_Check(entry))
+               goto error_out;
+       type = PyInt_AsLong(entry);
+
+       switch ((subtype_t)type)
+       {
+               case stPlainText:
+                       switch_substream = gst_bin_get_by_name(GST_BIN(m_gst_pipeline),"switch_substream_plain");
+                       break;
+               case stSSA:
+                       switch_substream = gst_bin_get_by_name(GST_BIN(m_gst_pipeline),"switch_substream_ssa");
+                       break;
+               case stSRT:
+                       switch_substream = gst_bin_get_by_name(GST_BIN(m_gst_pipeline),"switch_substream_srt");
+                       break;
+               default:
+                       goto error_out;
+       }
 
        m_subtitle_widget = new eSubtitleWidget(parent);
        m_subtitle_widget->resize(parent->size()); /* full size */
+
+       if ( !switch_substream )
+       {
+               eDebug("can't switch subtitle tracks! gst-plugin-selector needed");
+               return -2;
+       }
+       g_object_get (G_OBJECT (switch_substream), "n-pads", &nb_sources, NULL);
+       if ( (unsigned int)pid >= m_subtitleStreams.size() || pid >= nb_sources || (unsigned int)m_currentSubtitleStream >= m_subtitleStreams.size() )
+               return -2;
+       g_object_get (G_OBJECT (switch_subparse), "n-pads", &nb_sources, NULL);
+       if ( type < 0 || type >= nb_sources )
+               return -2;
+
+       char sinkpad[6];
+       sprintf(sinkpad, "sink%d", type);
+       g_object_set (G_OBJECT (switch_subparse), "active-pad", gst_element_get_pad (switch_subparse, sinkpad), NULL);
+       sprintf(sinkpad, "sink%d", pid);
+       g_object_set (G_OBJECT (switch_substream), "active-pad", gst_element_get_pad (switch_substream, sinkpad), NULL);
        m_currentSubtitleStream = pid;
 
        return 0;
 error_out:
        eDebug("enableSubtitles needs a tuple as 2nd argument!\n"
-               "for gst subtitles (2, subtitle_stream_count)");
+               "for gst subtitles (2, subtitle_stream_count, subtitle_type)");
        return -1;
 }
 
@@ -1143,7 +1509,7 @@ RESULT eServiceMP3::disableSubtitles(eWidget *parent)
 
 PyObject *eServiceMP3::getCachedSubtitle()
 {
-       eDebug("eServiceMP3::eDVBServicePlay");
+       eDebug("eServiceMP3::getCachedSubtitle");
        Py_RETURN_NONE;
 }
 
@@ -1152,22 +1518,26 @@ PyObject *eServiceMP3::getSubtitleList()
        eDebug("eServiceMP3::getSubtitleList");
 
        ePyObject l = PyList_New(0);
-       gchar *sourceName;
-       int stream_count = 0;
+       int stream_count[sizeof(subtype_t)];
+       for ( unsigned int i = 0; i < sizeof(subtype_t); i++ )
+               stream_count[i] = 0;
 
        for (std::vector<subtitleStream>::iterator IterSubtitleStream(m_subtitleStreams.begin()); IterSubtitleStream != m_subtitleStreams.end(); ++IterSubtitleStream)
        {
+               subtype_t type = IterSubtitleStream->type;
                ePyObject tuple = PyTuple_New(5);
                PyTuple_SET_ITEM(tuple, 0, PyInt_FromLong(2));
-               PyTuple_SET_ITEM(tuple, 1, PyInt_FromLong(stream_count));
-               PyTuple_SET_ITEM(tuple, 2, PyInt_FromLong(0));
+               PyTuple_SET_ITEM(tuple, 1, PyInt_FromLong(stream_count[type]));
+               PyTuple_SET_ITEM(tuple, 2, PyInt_FromLong(int(type)));
                PyTuple_SET_ITEM(tuple, 3, PyInt_FromLong(0));
-               sourceName = gst_object_get_name(GST_OBJECT (IterSubtitleStream->element));
-               PyTuple_SET_ITEM(tuple, 4, PyString_FromString(sourceName));
+               PyTuple_SET_ITEM(tuple, 4, PyString_FromString((IterSubtitleStream->language_code).c_str()));
                PyList_Append(l, tuple);
                Py_DECREF(tuple);
-               stream_count++;
+               stream_count[type]++;
        }
-
        return l;
 }
+
+#else
+#warning gstreamer not available, not building media player
+#endif