mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-24 02:31:03 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge branch 'master' into 0.11

Browse source 
Conflicts:
	ext/pulse/pulseaudiosink.c
This commit is contained in:
Wim Taymans 2011-11-11 19:24:27 +01:00
commit b0ccc61ed3
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ext/pulse/pulseaudiosink.c
View file

@ -473,6 +473,8 @@ gst_pulse_audio_sink_dispose (GObject * object)
pbin->sinkpad = NULL;
pbin->psink = NULL;
G_OBJECT_CLASS (parent_class)->dispose (object);
}
static gboolean

5
ext/pulse/pulsesink.c
View file

@ -1822,6 +1822,7 @@ gst_pulsesink_class_init (GstPulseSinkClass * klass)
GstBaseSinkClass *bc;
GstAudioBaseSinkClass *gstaudiosink_class = GST_AUDIO_BASE_SINK_CLASS (klass);
GstElementClass *gstelement_class = GST_ELEMENT_CLASS (klass);
gchar *clientname;
gobject_class->finalize = gst_pulsesink_finalize;
gobject_class->set_property = gst_pulsesink_set_property;
@ -1877,12 +1878,14 @@ gst_pulsesink_class_init (GstPulseSinkClass * klass)
*
* Since: 0.10.25
*/
clientname = gst_pulse_client_name ();
g_object_class_install_property (gobject_class,
PROP_CLIENT,
g_param_spec_string ("client", "Client",
"The PulseAudio client name to use", gst_pulse_client_name (),
"The PulseAudio client name to use", clientname,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
GST_PARAM_MUTABLE_READY));
g_free (clientname);
/**
* GstPulseSink:stream-properties