Commit a7efc5ce authored by jerry tan's avatar jerry tan Committed by Wim Taymans

sys/sunaudio/gstsunaudiosrc.c: it is the application's responsibility to make...

sys/sunaudio/gstsunaudiosrc.c: it is the application's responsibility to make sure it open the device once.

Original commit message from CVS:
Patch by: jerry tan <jerry dot tan at sun dot com>
* sys/sunaudio/gstsunaudiosrc.c: (gst_sunaudiosrc_open):
remove the call of  ioctl (fd, AUDIO_MIXER_MULTIPLE_OPEN), it is the
application's responsibility to make sure it open the device once.
Remove a careless error if AUDIODEV is set. Fixes #392620.
parent eae68a64
2007-04-12 Wim Taymans <wim@fluendo.com>
Patch by: jerry tan <jerry dot tan at sun dot com>
* sys/sunaudio/gstsunaudiosrc.c: (gst_sunaudiosrc_open):
remove the call of ioctl (fd, AUDIO_MIXER_MULTIPLE_OPEN), it is the
application's responsibility to make sure it open the device once.
Remove a careless error if AUDIODEV is set. Fixes #392620.
2007-04-12 Wim Taymans <wim@fluendo.com>
* gst/rtsp/gstrtpdec.c: (gst_rtp_dec_marshal_BOXED__UINT_UINT),
......
......@@ -234,12 +234,11 @@ static gboolean
gst_sunaudiosrc_open (GstAudioSrc * asrc)
{
GstSunAudioSrc *sunaudiosrc = GST_SUNAUDIO_SRC (asrc);
int fd, ret, err;
int fd, ret;
fd = open (sunaudiosrc->device, O_RDONLY);
err = ioctl (fd, AUDIO_MIXER_MULTIPLE_OPEN);
if (fd == -1 || err == -1) {
if (fd == -1) {
GST_ELEMENT_ERROR (sunaudiosrc, RESOURCE, OPEN_READ, (NULL),
("can't open connection to Sun Audio device %s", sunaudiosrc->device));
......@@ -284,7 +283,7 @@ gst_sunaudiosrc_open (GstAudioSrc * asrc)
if (audiodev == NULL) {
sunaudiosrc->mixer = gst_sunaudiomixer_ctrl_new ("/dev/audioctl");
} else {
gchar *device = g_strdup_printf ("/dev/%sctl", audiodev);
gchar *device = g_strdup_printf ("%sctl", audiodev);
sunaudiosrc->mixer = gst_sunaudiomixer_ctrl_new (device);
g_free (device);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment