move #endif of HAVE_GSTREAMER to the end of code
[enigma2.git] / lib / service / servicemp3.cpp
index 8ff816b164bc28458cd2d4165bd6a825d226d3b9..5181ce6c2badc4273ef623dd76869d22d29612be 100644 (file)
@@ -366,27 +366,23 @@ 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);
+                               GstElement *subsource = gst_element_factory_make ("filesrc", "srt_source");
+                               g_object_set (G_OBJECT (subsource), "location", srt_filename, NULL);
+                               GstElement *parser = gst_element_factory_make("subparse", "parse_subtitles");
+                               GstElement *switch_subtitles = gst_element_factory_make ("input-selector", "switch_subtitles");
+                               GstElement *sink = gst_element_factory_make("fakesink", "sink_subtitles");
+                               gst_bin_add_many(GST_BIN (m_gst_pipeline), subsource, switch_subtitles, parser, sink, NULL);
+                               gst_element_link(subsource, switch_subtitles);
+                               gst_element_link(switch_subtitles, parser);
+                               gst_element_link(parser, sink);
+                               g_object_set (G_OBJECT(switch_subtitles), "select-all", TRUE, NULL);
                                g_object_set (G_OBJECT(sink), "signal-handoffs", TRUE, NULL);
-                               gst_bin_add_many(GST_BIN (m_gst_pipeline), subsource, parser, sink, NULL);
-                               gboolean res = gst_element_link(subsource, parser);
-                               eDebug ("parser link = %d", res);
-                               res = gst_element_link(parser, sink);
-                               eDebug ("sink link = %d", res);
+                               g_object_set (G_OBJECT(sink), "sync", TRUE, NULL);
                                g_signal_connect(sink, "handoff", G_CALLBACK(gstCBsubtitleAvail), this);
                                subtitleStream subs;
-//                             subs.element = sink;
+                               subs.language_code = std::string(".srt file");
                                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, NULL);
                        switch_audio = gst_element_factory_make ("input-selector", "switch_audio");
                        if (switch_audio)
@@ -818,19 +814,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::atMPEG)
+       if (m_audioStreams[i].type == atMPEG)
                info.m_description = "MPEG";
-       else if (m_audioStreams[i].type == audioStream::atMP3)
+       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 = "???";
@@ -926,7 +922,7 @@ void eServiceMP3::gstBusCall(GstBus *bus, GstMessage *msg)
                }
                for (std::vector<subtitleStream>::iterator IterSubtitleStream(m_subtitleStreams.begin()); IterSubtitleStream != m_subtitleStreams.end(); ++IterSubtitleStream)
                {
-                       if ( IterAudioStream->pad )
+                       if ( IterSubtitleStream->pad )
                        {
                                g_object_get(IterSubtitleStream->pad, "tags", &tags, NULL);
                                gchar *g_language;
@@ -953,7 +949,7 @@ GstBusSyncReply eServiceMP3::gstBusSyncHandler(GstBus *bus, GstMessage *message,
        return GST_BUS_PASS;
 }
 
-int eServiceMP3::gstCheckAudioPad(GstStructure* structure)
+audiotype_t eServiceMP3::gstCheckAudioPad(GstStructure* structure)
 {
        const gchar* type;
        type = gst_structure_get_name(structure);
@@ -967,29 +963,29 @@ int eServiceMP3::gstCheckAudioPad(GstStructure* structure)
                                case 1:
                                {
                                        if ( layer == 3 )
-                                               return audioStream::atMP3;
+                                               return atMP3;
                                        else
-                                               return audioStream::atMPEG;
+                                               return atMPEG;
                                }
                                case 2:
-                                       return audioStream::atMPEG;
+                                       return atMPEG;
                                case 4:
-                                       return audioStream::atAAC;
+                                       return atAAC;
                                default:
-                                       return audioStream::atUnknown;
+                                       return atUnknown;
                        }
                }
        else
        {
                eDebug("mime %s", type);
                if (!strcmp(type, "audio/x-ac3") || !strcmp(type, "audio/ac3"))
-                       return audioStream::atAC3;
+                       return atAC3;
                else if (!strcmp(type, "audio/x-dts") || !strcmp(type, "audio/dts"))
-                       return audioStream::atDTS;
+                       return atDTS;
                else if (!strcmp(type, "audio/x-raw-int"))
-                       return audioStream::atPCM;
+                       return atPCM;
        }
-       return audioStream::atUnknown;
+       return atUnknown;
 }
 
 void eServiceMP3::gstCBpadAdded(GstElement *decodebin, GstPad *pad, gpointer user_data)
@@ -1037,7 +1033,6 @@ void eServiceMP3::gstCBpadAdded(GstElement *decodebin, GstPad *pad, gpointer use
        }
        if (g_strrstr(type,"application/x-ssa") || g_strrstr(type,"application/x-ass"))
        {
-GstPadLinkReturn res;
                GstElement *switch_subtitles = gst_bin_get_by_name(pipeline,"switch_subtitles");
                if ( !switch_subtitles )
                {
@@ -1049,12 +1044,11 @@ GstPadLinkReturn res;
                        gst_bin_add_many(pipeline, switch_subtitles, parser, sink, NULL);
                        gst_element_link(switch_subtitles, parser);
                        gst_element_link(parser, sink);
-                       g_object_set (G_OBJECT(switch_subtitles), "select-all", TRUE, NULL);
                        g_object_set (G_OBJECT(sink), "signal-handoffs", TRUE, NULL);
                        g_signal_connect(sink, "handoff", G_CALLBACK(gstCBsubtitleAvail), _this);
                }
                GstPad *sinkpad = gst_element_get_request_pad (switch_subtitles, "sink%d");
-               res = gst_pad_link(pad, sinkpad);
+               gst_pad_link(pad, sinkpad);
                subtitleStream subs;
                subs.pad = sinkpad;
                _this->m_subtitleStreams.push_back(subs);
@@ -1130,18 +1124,14 @@ 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)
 {
-       eDebug("gstCBsubtitleAvail");
        const unsigned char *text = (unsigned char *)GST_BUFFER_DATA(buffer);
+       eDebug("gstCBsubtitleAvail: %s",text);
        eServiceMP3 *_this = (eServiceMP3*)user_data;
        if ( _this->m_subtitle_widget )
        {
-               eDebug("subtitle text: %s",text);
                eDVBTeletextSubtitlePage page;
                gRGB rgbcol(0xD0,0xD0,0xD0);
                page.m_elements.push_back(eDVBTeletextSubtitlePageElement(rgbcol, (const char*)text));
@@ -1184,7 +1174,6 @@ RESULT eServiceMP3::enableSubtitles(eWidget *parent, ePyObject tuple)
        sprintf(sinkpad, "sink%d", pid);
        g_object_set (G_OBJECT (switch_subtitles), "active-pad", gst_element_get_pad (switch_subtitles, sinkpad), NULL);
        g_object_get (G_OBJECT (switch_subtitles), "active-pad", &active_pad, NULL);
-       g_object_set (G_OBJECT (switch_subtitles), "select-all", FALSE, NULL);
        gchar *name;
        name = gst_pad_get_name (active_pad);
        eDebug ("switched subtitles to (%s)", name);
@@ -1234,3 +1223,7 @@ PyObject *eServiceMP3::getSubtitleList()
 
        return l;
 }
+
+#else
+#warning gstreamer not available, not building media player
+#endif