summaryrefslogtreecommitdiffstats
path: root/sys/sunaudio
diff options
context:
space:
mode:
authorJan Schmidt <thaytan@mad.scientist.com>2008-01-11 21:08:59 +0000
committerJan Schmidt <thaytan@mad.scientist.com>2008-01-11 21:08:59 +0000
commitc2dddd0201c8eafb89219defe186904a5c4ee102 (patch)
treec229ad723125453b16ca3d3a5ce3c3277902fce6 /sys/sunaudio
parenta206c7bd3e2e3a99048d626308c482db1db6f627 (diff)
Generate the image-type values correctly. Leave them out of the caps when outputting a "preview image" tag, since it ...
Original commit message from CVS: * ext/flac/gstflacdec.c: (gst_flac_extract_picture_buffer): * gst/id3demux/id3v2frames.c: (parse_picture_frame): Generate the image-type values correctly. Leave them out of the caps when outputting a "preview image" tag, since it only makes sense to have one of those - the type is irrelevant. * sys/sunaudio/gstsunaudiomixerctrl.c: (gst_sunaudiomixer_ctrl_open): If we can, mark the mixer multiple open when we use it, in case (for some reason) the process wants to open it again elsewhere.
Diffstat (limited to 'sys/sunaudio')
-rw-r--r--sys/sunaudio/gstsunaudiomixerctrl.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sys/sunaudio/gstsunaudiomixerctrl.c b/sys/sunaudio/gstsunaudiomixerctrl.c
index 067eb117..4a6244b6 100644
--- a/sys/sunaudio/gstsunaudiomixerctrl.c
+++ b/sys/sunaudio/gstsunaudiomixerctrl.c
@@ -29,6 +29,7 @@
#include <string.h>
#include <errno.h>
#include <sys/ioctl.h>
+#include <sys/mixer.h>
#include <gst/gst-i18n-plugin.h>
@@ -60,6 +61,8 @@ gst_sunaudiomixer_ctrl_open (GstSunAudioMixerCtrl * mixer)
return FALSE;
}
+ /* Try to set the multiple open flag if we can, but ignore errors */
+ ioctl (mixer->mixer_fd, AUDIO_MIXER_MULTIPLE_OPEN);
mixer->mixer_fd = fd;
return TRUE;