set the device property to the correct value before opening the mixer.

2007-05-28  Jan Arne Petersen  <jpetersen@jpetersen.org>

	* actions/acme-volume-gstreamer.c: (acme_volume_gstreamer_open): set
	the device property to the correct value before opening the mixer.
	(closes bug #441552)


svn path=/trunk/; revision=7668
This commit is contained in:
Jan Arne Petersen 2007-05-28 12:25:56 +00:00 committed by Jan Arne Petersen
parent 3ba13b0c46
commit d2b6d5ef48
2 changed files with 15 additions and 10 deletions

View file

@ -1,3 +1,9 @@
2007-05-28 Jan Arne Petersen <jpetersen@jpetersen.org>
* actions/acme-volume-gstreamer.c: (acme_volume_gstreamer_open): set
the device property to the correct value before opening the mixer.
(closes bug #441552)
2007-05-28 Jens Granseuer <jensgr@gmx.net>
* GNOME_SettingsDaemon.server.in: remove file

View file

@ -296,20 +296,19 @@ acme_volume_gstreamer_open (AcmeVolumeGStreamer *vol)
element = gst_element_factory_make (factory_and_device[0], NULL);
if (element != NULL) {
if (factory_and_device[1] != NULL &&
g_object_class_find_property (G_OBJECT_GET_CLASS (element), "device"))
{
g_object_set (G_OBJECT (element), "device", factory_and_device[1], NULL);
}
gst_element_set_state (element, GST_STATE_READY);
if (!GST_IS_MIXER (element))
{
if (GST_IS_MIXER (element)) {
self->_priv->mixer = GST_MIXER (element);
} else {
gst_element_set_state (element, GST_STATE_NULL);
gst_object_unref (element);
} else {
self->_priv->mixer = GST_MIXER (element);
if (factory_and_device[1] != NULL &&
g_object_class_find_property (G_OBJECT_GET_CLASS (self->_priv->mixer), "device"))
{
g_object_set (G_OBJECT (self->_priv->mixer), "device", &factory_and_device[1], NULL);
}
}
}
}