mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-23 18:21:04 +00:00
Code Issues 1 Projects Releases Wiki Activity

sys/oss/gstosselement.c: Fix the ossmixer case where we shouldn't open /dev/dsp* because it might block operations (w...

Browse source 
Original commit message from CVS:
2004-01-22  Ronald Bultje  <rbultje@ronald.bitfreak.net>

* sys/oss/gstosselement.c: (gst_osselement_class_probe_devices):
Fix the ossmixer case where we shouldn't open /dev/dsp* because
it might block operations (which is bad for a mixer).
This commit is contained in:
Ronald S. Bultje 2004-01-22 20:51:08 +00:00
parent 396397ee7c
commit 6eac1f9c4c
2 changed files with 26 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2004-01-22 Ronald Bultje <rbultje@ronald.bitfreak.net>
* sys/oss/gstosselement.c: (gst_osselement_class_probe_devices):
Fix the ossmixer case where we shouldn't open /dev/dsp* because
it might block operations (which is bad for a mixer).
2004-01-22 Thomas Vander Stichele <thomas at apestaart dot org>
* gst-libs/gst/media-info/media-info-priv.c: (have_type_callback),

22
sys/oss/gstosselement.c
View file

@ -207,8 +207,24 @@ static gboolean
gst_osselement_class_probe_devices (GstOssElementClass *klass,
gboolean check)
{
GstElementClass *eklass = GST_ELEMENT_CLASS (klass);
static gboolean init = FALSE;
static GList *device_combinations;
GList *padtempllist;
gint openmode = O_RDONLY;
gboolean mixer = FALSE;
/* Ok, so how do we open the device? We assume that we have (max.) one
* pad, and if this is a sinkpad, we're osssink (w). else, we're osssrc
* (r) */
padtempllist = gst_element_class_get_pad_template_list (eklass);
if (padtempllist != NULL) {
GstPadTemplate *firstpadtempl = padtempllist->data;
if (GST_PAD_TEMPLATE_DIRECTION (firstpadtempl) == GST_PAD_SINK) {
openmode = O_WRONLY;
}
mixer = TRUE;
}
if (!init && !check) {
gchar *dsp_base[] = { "/dev/dsp", "/dev/sound/dsp", NULL };
@ -249,8 +265,10 @@ gst_osselement_class_probe_devices (GstOssElementClass *klass,
continue;
/* we just check the dsp. we assume the mixer always works.
* we don't need a mixer anyway (says OSS)... */
if ((fd = open (devices[n].dsp, O_RDONLY)) > 0 || errno == EBUSY) {
* we don't need a mixer anyway (says OSS)... If we are a
* mixer element, we use the mixer anyway. */
if ((fd = open (mixer ? devices[n].mixer :
devices[n].dsp, openmode)) > 0 || errno == EBUSY) {
GstOssDeviceCombination *combi;
if (fd > 0)