From 294f780cff637442d9b3c22a2e0135524b6909c3 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Tue, 22 Feb 2005 15:23:05 +0000 Subject: [PATCH] sys/oss/gstosselement.c: Kick the hell out of gcc for not warning me about a symbol conflict. 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. --- ChangeLog | 5 +++++ sys/oss/gstosselement.c | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index c620dcc..3e7fdee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-02-22 Ronald S. Bultje + + * 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 Reviewed by: Tim-Philipp Müller diff --git a/sys/oss/gstosselement.c b/sys/oss/gstosselement.c index b2d6526..e8fc345 100644 --- a/sys/oss/gstosselement.c +++ b/sys/oss/gstosselement.c @@ -245,7 +245,7 @@ gst_osselement_class_probe_devices (GstOssElementClass * klass, gboolean check) static GList *device_combinations; GList *padtempllist; 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 * 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) { openmode = O_WRONLY; } - mixer = TRUE; + is_mixer = TRUE; } 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 don't need a mixer anyway (says OSS)... If we are a * 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) { GstOssDeviceCombination *combi; @@ -314,7 +314,7 @@ gst_osselement_class_probe_devices (GstOssElementClass * klass, gboolean check) combi = g_new0 (GstOssDeviceCombination, 1); combi->dsp = dsp; 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, combi); } else { -- 2.7.4