Merge branch 'master' of /home/tmbinc/enigma2-git
authorFelix Domke <tmbinc@elitedvb.net>
Sat, 16 May 2009 17:04:44 +0000 (19:04 +0200)
committerFelix Domke <tmbinc@elitedvb.net>
Sat, 16 May 2009 17:04:44 +0000 (19:04 +0200)
1  2 
lib/service/servicemp3.cpp

  /* 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()
@@@ -609,7 -603,7 +609,7 @@@ RESULT eServiceMP3::getName(std::strin
  
  int eServiceMP3::getInfo(int w)
  {
 -      gchar *tag = 0;
 +      const gchar *tag = 0;
  
        switch (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:
        case sTagChannelMode:
                tag = "channel-mode";
                break;
        case sUser+12:
                return m_error_message;
        default:
  
  PyObject *eServiceMP3::getInfoObject(int w)
  {
 -      gchar *tag = 0;
 +      const gchar *tag = 0;
        bool isBuffer = false;
        switch (w)
        {
@@@ -1134,6 -1127,7 +1133,7 @@@ eDebug("AUDIO STRUCT=%s", g_type)
                                g_free (g_lang);
  //                            g_free (g_type);
                        }
+                       m_event((iPlayableService*)this, evUpdatedEventInfo);
                }
                case GST_MESSAGE_ELEMENT:
                {