1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
|
diff -ur amarok-1.3.1/amarok/src/engine/gst/gstengine.cpp amarok-1.3.1-alsa/amarok/src/engine/gst/gstengine.cpp
--- amarok-1.3.1/amarok/src/engine/gst/gstengine.cpp 2005-09-04 22:47:19.000000000 +0200
+++ amarok-1.3.1-alsa/amarok/src/engine/gst/gstengine.cpp 2005-09-11 14:02:18.000000000 +0200
@@ -806,7 +806,6 @@
if ( g_strrstr ( factory->details.klass, classname ) ) {
name = g_strdup ( GST_OBJECT_NAME ( factory ) );
- if ( name != "alsasink" )
results << name;
}
}
@@ -830,7 +829,7 @@
destroyPipeline();
- if ( GstConfig::soundOutput().isEmpty() || GstConfig::soundOutput() == "alsasink" ) {
+ if ( GstConfig::soundOutput().isEmpty()) {
QTimer::singleShot( 0, this, SLOT( errorNoOutput() ) );
return false;
}
@@ -853,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() )
@@ -872,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;
|
GitWeb
