fix pid changes

[enigma2.git] / lib / service / servicemp3.cpp

diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp
index f8eb194e14da7fbfabe3aa9bd64f9303fc55d25c..7c00121d61c265b49d3bfc31c45211351bfcb9e8 100644 (file)
--- a/lib/service/servicemp3.cpp
+++ b/lib/service/servicemp3.cpp
@@ -17,6 +17,12 @@
 /* for subtitles */
 #include <lib/gui/esubtitle.h>
 
+#ifndef GST_SEEK_FLAG_SKIP
+#warning Compiling for legacy gstreamer, things will break
+#define GST_SEEK_FLAG_SKIP 0
+#define GST_TAG_HOMEPAGE ""
+#endif
+
 // eServiceFactoryMP3
 
 eServiceFactoryMP3::eServiceFactoryMP3()
@@ -441,6 +447,7 @@ RESULT eServiceMP3::pause()
 
 RESULT eServiceMP3::unpause()
 {
+       m_subtitle_pages.clear();
        if (!m_gst_playbin || m_state != stRunning)
                return -1;
 
@@ -476,6 +483,8 @@ RESULT eServiceMP3::getLength(pts_t &pts)
 
 RESULT eServiceMP3::seekTo(pts_t to)
 {
+       m_subtitle_pages.clear();
+
        if (!m_gst_playbin)
                return -1;
 
@@ -600,7 +609,7 @@ RESULT eServiceMP3::getName(std::string &name)
 
 int eServiceMP3::getInfo(int w)
 {
-       gchar *tag = 0;
+       const gchar *tag = 0;
 
        switch (w)
        {
@@ -699,9 +708,9 @@ int eServiceMP3::getInfo(int w)
 
 std::string eServiceMP3::getInfoString(int w)
 {
-       if ( !m_stream_tags )
+       if ( !m_stream_tags && w < sUser && w > 26 )
                return "";
-       gchar *tag = 0;
+       const gchar *tag = 0;
        switch (w)
        {
        case sTagTitle:
@@ -797,7 +806,6 @@ std::string eServiceMP3::getInfoString(int w)
        case sTagChannelMode:
                tag = "channel-mode";
                break;
-
        case sUser+12:
                return m_error_message;
        default:
@@ -817,7 +825,7 @@ std::string eServiceMP3::getInfoString(int w)
 
 PyObject *eServiceMP3::getInfoObject(int w)
 {
-       gchar *tag = 0;
+       const gchar *tag = 0;
        bool isBuffer = false;
        switch (w)
        {
@@ -989,7 +997,50 @@ void eServiceMP3::gstBusCall(GstBus *bus, GstMessage *msg)
                eDebug("eServiceMP3::gst_message from %s: %s (without structure)", sourceName, GST_MESSAGE_TYPE_NAME(msg));
 #endif
        if ( GST_MESSAGE_TYPE (msg) == GST_MESSAGE_STATE_CHANGED )
-               return;
+       {
+               // only the pipeline message
+               if(GST_MESSAGE_SRC(msg) != GST_OBJECT(m_gst_playbin))
+                       return;
+
+               GstState old_state, new_state;
+               gst_message_parse_state_changed(msg, &old_state, &new_state, NULL);
+       
+               if(old_state == new_state)
+                       return;
+
+               eDebug("eServiceMP3::state transition %s -> %s", gst_element_state_get_name(old_state), gst_element_state_get_name(new_state));
+
+               GstStateChange transition = (GstStateChange)GST_STATE_TRANSITION(old_state, new_state);
+
+               switch(transition)
+               {
+                       case GST_STATE_CHANGE_NULL_TO_READY:
+                       {
+                       }
+                               break;
+                       case GST_STATE_CHANGE_READY_TO_PAUSED:
+                       {
+
+                       }       break;
+                       case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
+                       {
+
+                       }       break;
+                       case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
+                       {
+       
+                       }       break;
+                       case GST_STATE_CHANGE_PAUSED_TO_READY:
+                       {
+
+                       }       break;
+                       case GST_STATE_CHANGE_READY_TO_NULL:
+                       {
+
+                       }       break;
+               }
+       }
+
        switch (GST_MESSAGE_TYPE (msg))
        {
                case GST_MESSAGE_EOS:
@@ -1036,7 +1087,7 @@ void eServiceMP3::gstBusCall(GstBus *bus, GstMessage *msg)
                        GstTagList *tags, *result;
                        gst_message_parse_tag(msg, &tags);
        
-                       result = gst_tag_list_merge(m_stream_tags, tags, GST_TAG_MERGE_PREPEND);
+                       result = gst_tag_list_merge(m_stream_tags, tags, GST_TAG_MERGE_REPLACE);
                        if (result)
                        {
                                if (m_stream_tags)
@@ -1125,6 +1176,7 @@ eDebug("AUDIO STRUCT=%s", g_type);
                                g_free (g_lang);
 //                             g_free (g_type);
                        }
+                       m_event((iPlayableService*)this, evUpdatedEventInfo);
                }
                case GST_MESSAGE_ELEMENT:
                {
@@ -1274,20 +1326,21 @@ void eServiceMP3::pushSubtitles()
        ePangoSubtitlePage page;
        GstClockTime base_time;
        pts_t running_pts;
-       GstElement *appsink = gst_bin_get_by_name(GST_BIN(m_gst_playbin),"subtitle_sink");
+       GstElement *syncsink;
+       g_object_get (G_OBJECT (m_gst_playbin), "audio-sink", &syncsink, NULL);
        GstClock *clock;
-       clock = gst_element_get_clock (appsink);
-       do
+       clock = gst_element_get_clock (syncsink);
+       while ( !m_subtitle_pages.empty() )
        {
                page = m_subtitle_pages.front();
 
-               base_time = gst_element_get_base_time (appsink);
-               running_pts = ( gst_clock_get_time (clock) - base_time ) / 11111L;
+               base_time = gst_element_get_base_time (syncsink);
+               running_pts = gst_clock_get_time (clock) / 11111L;
                gint64 diff_ms = ( page.show_pts - running_pts ) / 90;
-//             eDebug("eServiceMP3::pushSubtitles show_pts = %lld  running_pts = %lld  diff = %lld", page.show_pts, running_pts, diff_ms);
+//             eDebug("eServiceMP3::pushSubtitles show_pts = %lld  running_pts = %lld  diff = %lld", page.show_pts, running_pts, diff_ms);
                if ( diff_ms > 20 )
                {
-//                     eDebug("m_subtitle_sync_timer->start(%lld,1)", diff_ms);
+//                     eDebug("m_subtitle_sync_timer->start(%lld,1)", diff_ms);
                        m_subtitle_sync_timer->start(diff_ms, 1);
                        break;
                }
@@ -1296,7 +1349,7 @@ void eServiceMP3::pushSubtitles()
                        m_subtitle_widget->setPage(page);
                        m_subtitle_pages.pop_front();
                }
-       } while ( !m_subtitle_pages.empty() );
+       } ;
 
        gst_object_unref (clock);
 }
@@ -1330,6 +1383,7 @@ RESULT eServiceMP3::enableSubtitles(eWidget *parent, ePyObject tuple)
        g_object_get (G_OBJECT (m_gst_playbin), "current-text", &text_pid, NULL);
 
        eDebug ("eServiceMP3::switched to subtitle stream %i", text_pid);
+       m_subtitle_pages.clear();
 
        return 0;
 
@@ -1342,6 +1396,7 @@ error_out:
 RESULT eServiceMP3::disableSubtitles(eWidget *parent)
 {
        eDebug("eServiceMP3::disableSubtitles");
+       m_subtitle_pages.clear();
        delete m_subtitle_widget;
        m_subtitle_widget = 0;
        return 0;