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

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.

diff --git a/ChangeLog b/ChangeLog
index 3ae6face281ac5cd578c60392c0aa7f4eb66ef2e..25c7b7248070c8961130e932b73f8a8d72953389 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+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),

diff --git a/sys/sunaudio/gstsunaudiosrc.c b/sys/sunaudio/gstsunaudiosrc.c
index e0fdcd4259b90b3b13ef177b383e2a2e20ed5174..c2fd12e9434a6224a3fe20a862289cbff75a6aa2 100644 (file)
--- a/sys/sunaudio/gstsunaudiosrc.c
+++ b/sys/sunaudio/gstsunaudiosrc.c
@@ -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);