diff options
author | Tim-Philipp Müller <tim@centricular.net> | 2008-05-22 15:14:26 +0000 |
---|---|---|
committer | Tim-Philipp Müller <tim@centricular.net> | 2008-05-22 15:14:26 +0000 |
commit | 80ef4ca4d7449550b2c5aa05d55d7c697a7c1fab (patch) | |
tree | 800d89d8acdb6af889aa56d44253c3d1f889684c /sys/oss4/oss4-source.c | |
parent | b3bc29bc641b8a4c380d100b60d709aa08e61f28 (diff) | |
download | gst-plugins-bad-80ef4ca4d7449550b2c5aa05d55d7c697a7c1fab.tar.gz gst-plugins-bad-80ef4ca4d7449550b2c5aa05d55d7c697a7c1fab.tar.bz2 gst-plugins-bad-80ef4ca4d7449550b2c5aa05d55d7c697a7c1fab.zip |
sys/oss4/: Make device-name probing in NULL state work better (e.g. for the gnome-control-center sound capplet).
Original commit message from CVS:
* sys/oss4/oss4-mixer.c: (gst_oss4_mixer_open):
* sys/oss4/oss4-property-probe.c:
(gst_oss4_property_probe_find_device_name),
(gst_oss4_property_probe_find_device_name_nofd):
* sys/oss4/oss4-property-probe.h:
* sys/oss4/oss4-sink.c: (gst_oss4_sink_get_property):
* sys/oss4/oss4-source.c: (gst_oss4_source_get_property):
Make device-name probing in NULL state work better (e.g. for the
gnome-control-center sound capplet).
Diffstat (limited to 'sys/oss4/oss4-source.c')
-rw-r--r-- | sys/oss4/oss4-source.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sys/oss4/oss4-source.c b/sys/oss4/oss4-source.c index 90c12b0f..c7579721 100644 --- a/sys/oss4/oss4-source.c +++ b/sys/oss4/oss4-source.c @@ -256,11 +256,17 @@ gst_oss4_source_get_property (GObject * object, guint prop_id, g_value_set_string (value, oss->device_name); gst_oss4_source_close (GST_AUDIO_SRC (oss)); } else { - g_value_set_string (value, NULL); + gchar *name = NULL; + + gst_oss4_property_probe_find_device_name_nofd (GST_OBJECT (oss), + oss->device, &name); + g_value_set_string (value, name); + g_free (name); } } else { g_value_set_string (value, oss->device_name); } + GST_OBJECT_UNLOCK (oss); break; default: |