[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/multimedia/amarok
From:       Gábor Lehel <illissius () gmail ! com>
Date:       2005-09-09 16:41:45
Message-ID: 1126284105.875431.5176.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 459037 by illissius:

Fix crashing issues with GStreamer engine + alsasink. Thanks to Vincent Tondellier for the patch.
BUG: 112103
CCMAIL: amarok-devel@lists.sourceforge.net


 M  +2 -0      ChangeLog  
 M  +2 -6      src/engine/gst/gstengine.cpp  


--- trunk/extragear/multimedia/amarok/ChangeLog #459036:459037
@@ -16,6 +16,8 @@
       it'll now play the first and queue the rest.
 
   BUGFIXES:
+    * Fix issues with the GStreamer engine and alsasink, and reenable it.
+      Patch by Vincent Tondellier <tonton-lists@team1664.org>. (BR 112103)
     * Dynamic playlist shuffle had some incorrect smart playlist handling.
     * Robustified the code for handling the '# of tracks in the playlist'
       part of the statusbar, it should not ever get out of sync with
--- trunk/extragear/multimedia/amarok/src/engine/gst/gstengine.cpp #459036:459037
@@ -806,7 +806,6 @@
 
                     if ( g_strrstr ( factory->details.klass, classname ) ) {
                         name = g_strdup ( GST_OBJECT_NAME ( factory ) );
-                        if ( name != "alsasink" && name != "autoaudiosink" && name != "gconfaudiosink")
                         results << name;
                     }
                 }
@@ -830,10 +829,7 @@
 
     destroyPipeline();
 
-    if ( GstConfig::soundOutput().isEmpty() 
-        || GstConfig::soundOutput() == "alsasink" 
-        || GstConfig::soundOutput() ==  "autoaudiosink" 
-        || GstConfig::soundOutput() ==  "gconfaudiosink") {
+    if ( GstConfig::soundOutput().isEmpty()) {
         QTimer::singleShot( 0, this, SLOT( errorNoOutput() ) );
         return false;
     }
@@ -856,7 +852,6 @@
     }
 
     m_gst_audiobin = gst_bin_new( "audiobin" );
-    gst_bin_add( GST_BIN( m_gst_audiobin ), m_gst_audiosink );
 
     /* setting device property for AudioSink*/
     if ( GstConfig::useCustomSoundDevice() && !GstConfig::soundDevice().isEmpty() )
@@ -875,6 +870,7 @@
     gst_element_link_many( m_gst_audioconvert, m_gst_equalizer, m_gst_identity,
                            m_gst_volume, m_gst_audioscale, m_gst_audiosink, NULL );
 
+    gst_bin_add( GST_BIN( m_gst_audiobin ), m_gst_audiosink );
     gst_element_set_state( m_gst_audiobin, GST_STATE_PAUSED );
 
     m_pipelineFilled = true;
[prev in list] [next in list] [prev in thread] [next in thread]