mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-25 00:28:21 +00:00
Code Issues 1 Projects Releases Wiki Activity

sys/sunaudio/gstsunaudiosrc.*: Remove device-name from GstSunAudioSrc. Fixes #412597.

Browse source 
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:
Wim Taymans 2007-03-02 10:54:49 +00:00
parent 8b65d9d182
commit 6ae9e04ab3
3 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -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> 2007-03-01 Sebastian Dröge <slomo@circular-chaos.org>
* ext/hal/gsthalaudiosink.c: (do_toggle_element): * ext/hal/gsthalaudiosink.c: (do_toggle_element):

15
sys/sunaudio/gstsunaudiosrc.c
View file

@ -83,13 +83,11 @@ static guint gst_sunaudiosrc_delay (GstAudioSrc * asrc);
static void gst_sunaudiosrc_reset (GstAudioSrc * asrc); static void gst_sunaudiosrc_reset (GstAudioSrc * asrc);
#define DEFAULT_DEVICE "/dev/audio" #define DEFAULT_DEVICE "/dev/audio"
#define DEFAULT_DEVICE_NAME ""
enum enum
{ {
PROP_0, PROP_0,
PROP_DEVICE, PROP_DEVICE
PROP_DEVICE_NAME,
}; };
GST_BOILERPLATE_WITH_INTERFACE (GstSunAudioSrc, gst_sunaudiosrc, GST_BOILERPLATE_WITH_INTERFACE (GstSunAudioSrc, gst_sunaudiosrc,
@ -159,11 +157,6 @@ gst_sunaudiosrc_class_init (GstSunAudioSrcClass * klass)
g_param_spec_string ("device", "Device", g_param_spec_string ("device", "Device",
"SunAudio device (usually /dev/audio)", DEFAULT_DEVICE, "SunAudio device (usually /dev/audio)", DEFAULT_DEVICE,
G_PARAM_READWRITE)); 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 static void
@ -180,8 +173,6 @@ gst_sunaudiosrc_init (GstSunAudioSrc * sunaudiosrc,
if (audiodev == NULL) if (audiodev == NULL)
audiodev = DEFAULT_DEVICE; audiodev = DEFAULT_DEVICE;
sunaudiosrc->device = g_strdup (audiodev); sunaudiosrc->device = g_strdup (audiodev);
sunaudiosrc->device_name = g_strdup (DEFAULT_DEVICE_NAME);
} }
static void static void
@ -216,9 +207,6 @@ gst_sunaudiosrc_get_property (GObject * object, guint prop_id,
case PROP_DEVICE: case PROP_DEVICE:
g_value_set_string (value, sunaudiosrc->device); g_value_set_string (value, sunaudiosrc->device);
break; break;
case PROP_DEVICE_NAME:
g_value_set_string (value, sunaudiosrc->device_name);
break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break; break;
@ -301,7 +289,6 @@ gst_sunaudiosrc_open (GstAudioSrc * asrc)
sunaudiosrc->mixer = gst_sunaudiomixer_ctrl_new (device); sunaudiosrc->mixer = gst_sunaudiomixer_ctrl_new (device);
g_free (device); g_free (device);
} }
sunaudiosrc->device_name = g_strdup (sunaudiosrc->mixer->device);
} }
return TRUE; return TRUE;

1
sys/sunaudio/gstsunaudiosrc.h
View file

@ -44,7 +44,6 @@ struct _GstSunAudioSrc {
GstAudioSrc src; GstAudioSrc src;
gchar *device; gchar *device;
gchar *device_name;
gint fd; gint fd;
gint control_fd; gint control_fd;