mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 11:45:25 +00:00
Code Issues 1 Projects Releases Wiki Activity

sys/oss/gstosselement.c: Kick the hell out of gcc for not warning me about a symbol conflict.

Browse source 
Original commit message from CVS:
* sys/oss/gstosselement.c: (gst_osselement_class_probe_devices):
Kick the hell out of gcc for not warning me about a symbol conflict.
This commit is contained in:
Ronald S. Bultje 2005-02-22 15:23:05 +00:00
parent 0c606747f1
commit 294f780cff
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2005-02-22 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* sys/oss/gstosselement.c: (gst_osselement_class_probe_devices):
Kick the hell out of gcc for not warning me about a symbol conflict.
2005-02-22 Luca Ognibene <luogni@tin.it> 2005-02-22 Luca Ognibene <luogni@tin.it>
Reviewed by: Tim-Philipp Müller <tim at centricular dot net> Reviewed by: Tim-Philipp Müller <tim at centricular dot net>

8
sys/oss/gstosselement.c
View file

@ -245,7 +245,7 @@ gst_osselement_class_probe_devices (GstOssElementClass * klass, gboolean check)
static GList *device_combinations; static GList *device_combinations;
GList *padtempllist; GList *padtempllist;
gint openmode = O_RDONLY; gint openmode = O_RDONLY;
gboolean mixer = FALSE; gboolean is_mixer = FALSE;
/* Ok, so how do we open the device? We assume that we have (max.) one /* 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 * pad, and if this is a sinkpad, we're osssink (w). else, we're osssrc
@ -257,7 +257,7 @@ gst_osselement_class_probe_devices (GstOssElementClass * klass, gboolean check)
if (GST_PAD_TEMPLATE_DIRECTION (firstpadtempl) == GST_PAD_SINK) { if (GST_PAD_TEMPLATE_DIRECTION (firstpadtempl) == GST_PAD_SINK) {
openmode = O_WRONLY; openmode = O_WRONLY;
} }
mixer = TRUE; is_mixer = TRUE;
} }
if (!init && !check) { if (!init && !check) {
@ -303,7 +303,7 @@ gst_osselement_class_probe_devices (GstOssElementClass * klass, gboolean check)
/* we just check the dsp. we assume the mixer always works. /* we just check the dsp. we assume the mixer always works.
* we don't need a mixer anyway (says OSS)... If we are a * we don't need a mixer anyway (says OSS)... If we are a
* mixer element, we use the mixer anyway. */ * mixer element, we use the mixer anyway. */
if ((fd = open (mixer ? mixer : if ((fd = open (is_mixer ? mixer :
dsp, openmode | O_NONBLOCK)) > 0 || errno == EBUSY) { dsp, openmode | O_NONBLOCK)) > 0 || errno == EBUSY) {
GstOssDeviceCombination *combi; GstOssDeviceCombination *combi;
@ -314,7 +314,7 @@ gst_osselement_class_probe_devices (GstOssElementClass * klass, gboolean check)
combi = g_new0 (GstOssDeviceCombination, 1); combi = g_new0 (GstOssDeviceCombination, 1);
combi->dsp = dsp; combi->dsp = dsp;
combi->mixer = mixer; combi->mixer = mixer;
combi->dev = mixer ? mixer_dev : dsp_dev; combi->dev = is_mixer ? mixer_dev : dsp_dev;
device_combinations = device_combination_append (device_combinations, device_combinations = device_combination_append (device_combinations,
combi); combi);
} else { } else {