mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-09 08:55:33 +00:00
sys/sunaudio/gstsunaudiosrc.*: Remove device-name from GstSunAudioSrc. Fixes #412597.
Original commit message from CVS: * sys/sunaudio/gstsunaudiosrc.c: (gst_sunaudiosrc_class_init), (gst_sunaudiosrc_init), (gst_sunaudiosrc_get_property), (gst_sunaudiosrc_open): * sys/sunaudio/gstsunaudiosrc.h: Remove device-name from GstSunAudioSrc. Fixes #412597.
This commit is contained in:
parent
8b65d9d182
commit
6ae9e04ab3
3 changed files with 9 additions and 15 deletions
|
@ -1,3 +1,11 @@
|
|||
2007-03-02 Wim Taymans <wim@fluendo.com>
|
||||
|
||||
* sys/sunaudio/gstsunaudiosrc.c: (gst_sunaudiosrc_class_init),
|
||||
(gst_sunaudiosrc_init), (gst_sunaudiosrc_get_property),
|
||||
(gst_sunaudiosrc_open):
|
||||
* sys/sunaudio/gstsunaudiosrc.h:
|
||||
Remove device-name from GstSunAudioSrc. Fixes #412597.
|
||||
|
||||
2007-03-01 Sebastian Dröge <slomo@circular-chaos.org>
|
||||
|
||||
* ext/hal/gsthalaudiosink.c: (do_toggle_element):
|
||||
|
|
|
@ -83,13 +83,11 @@ static guint gst_sunaudiosrc_delay (GstAudioSrc * asrc);
|
|||
static void gst_sunaudiosrc_reset (GstAudioSrc * asrc);
|
||||
|
||||
#define DEFAULT_DEVICE "/dev/audio"
|
||||
#define DEFAULT_DEVICE_NAME ""
|
||||
|
||||
enum
|
||||
{
|
||||
PROP_0,
|
||||
PROP_DEVICE,
|
||||
PROP_DEVICE_NAME,
|
||||
PROP_DEVICE
|
||||
};
|
||||
|
||||
GST_BOILERPLATE_WITH_INTERFACE (GstSunAudioSrc, gst_sunaudiosrc,
|
||||
|
@ -159,11 +157,6 @@ gst_sunaudiosrc_class_init (GstSunAudioSrcClass * klass)
|
|||
g_param_spec_string ("device", "Device",
|
||||
"SunAudio device (usually /dev/audio)", DEFAULT_DEVICE,
|
||||
G_PARAM_READWRITE));
|
||||
|
||||
g_object_class_install_property (gobject_class, PROP_DEVICE_NAME,
|
||||
g_param_spec_string ("device-name", "Device name",
|
||||
"Human-readable name of the sound device", DEFAULT_DEVICE_NAME,
|
||||
G_PARAM_READABLE));
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -180,8 +173,6 @@ gst_sunaudiosrc_init (GstSunAudioSrc * sunaudiosrc,
|
|||
if (audiodev == NULL)
|
||||
audiodev = DEFAULT_DEVICE;
|
||||
sunaudiosrc->device = g_strdup (audiodev);
|
||||
|
||||
sunaudiosrc->device_name = g_strdup (DEFAULT_DEVICE_NAME);
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -216,9 +207,6 @@ gst_sunaudiosrc_get_property (GObject * object, guint prop_id,
|
|||
case PROP_DEVICE:
|
||||
g_value_set_string (value, sunaudiosrc->device);
|
||||
break;
|
||||
case PROP_DEVICE_NAME:
|
||||
g_value_set_string (value, sunaudiosrc->device_name);
|
||||
break;
|
||||
default:
|
||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
||||
break;
|
||||
|
@ -301,7 +289,6 @@ gst_sunaudiosrc_open (GstAudioSrc * asrc)
|
|||
sunaudiosrc->mixer = gst_sunaudiomixer_ctrl_new (device);
|
||||
g_free (device);
|
||||
}
|
||||
sunaudiosrc->device_name = g_strdup (sunaudiosrc->mixer->device);
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
|
|
|
@ -44,7 +44,6 @@ struct _GstSunAudioSrc {
|
|||
GstAudioSrc src;
|
||||
|
||||
gchar *device;
|
||||
gchar *device_name;
|
||||
gint fd;
|
||||
gint control_fd;
|
||||
|
||||
|
|
Loading…
Reference in a new issue