From 4506e60ea0aacfba4fc90136fb20e27dd13b2acf Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Fri, 10 Oct 2003 12:24:20 +0000 Subject: Make GstMixerTrack a GObject. I also want to make it emit several signals, starting work is in here but it's not full... Original commit message from CVS: Make GstMixerTrack a GObject. I also want to make it emit several signals, starting work is in here but it's not fully implemented yet. for OSS, this will cause issues, but for ALSA, this is all automated. --- sys/oss/gstosselement.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'sys/oss/gstosselement.c') diff --git a/sys/oss/gstosselement.c b/sys/oss/gstosselement.c index 0d7a03a6..ccf55766 100644 --- a/sys/oss/gstosselement.c +++ b/sys/oss/gstosselement.c @@ -40,6 +40,7 @@ enum { ARG_0, ARG_DEVICE, ARG_MIXERDEV, + ARG_DEVICE_NAME, }; /* elementfactory information */ @@ -124,12 +125,15 @@ gst_osselement_class_init (GstOssElementClass *klass) parent_class = g_type_class_ref (GST_TYPE_ELEMENT); g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_DEVICE, - g_param_spec_string ("device", "device", "oss device (/dev/dspN usually)", + g_param_spec_string ("device", "Device", "OSS device (/dev/dspN usually)", "default", G_PARAM_READWRITE)); g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_MIXERDEV, - g_param_spec_string ("mixerdev", "mixer device", - "oss mixer device (/dev/mixerN usually)", + g_param_spec_string ("mixerdev", "Mixer device", + "OSS mixer device (/dev/mixerN usually)", "default", G_PARAM_READWRITE)); + g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_MIXERDEV, + g_param_spec_string ("device_name", "Device name", "Name of the device", + NULL, G_PARAM_READABLE)); gobject_class->set_property = gst_osselement_set_property; gobject_class->get_property = gst_osselement_get_property; @@ -146,6 +150,7 @@ gst_osselement_init (GstOssElement *oss) oss->fd = -1; oss->mixer_fd = -1; oss->tracklist = NULL; + oss->device_name = NULL; gst_osselement_reset (oss); } @@ -632,6 +637,9 @@ gst_osselement_get_property (GObject *object, case ARG_MIXERDEV: g_value_set_string (value, oss->mixer_dev); break; + case ARG_DEVICE_NAME: + g_value_set_string (value, oss->device_name); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; -- cgit