diff options
| author | Dave Robillard <dave@drobilla.net> | 2009-06-19 21:01:54 -0400 |
|---|---|---|
| committer | Dave Robillard <dave@drobilla.net> | 2009-06-19 21:01:54 -0400 |
| commit | 925e83ee60c5406b2e5f0f39b0da0f90370efc27 (patch) | |
| tree | ce01d298ed0c5d31853fa43aedc2af0779417816 /sys | |
| parent | 7f3bcd484b465d8216ac419754450adf07e9b0d2 (diff) | |
| parent | c70dbe94b5ff9a0993d852605d40c21020c59552 (diff) | |
| download | gst-plugins-bad-925e83ee60c5406b2e5f0f39b0da0f90370efc27.tar.gz gst-plugins-bad-925e83ee60c5406b2e5f0f39b0da0f90370efc27.tar.bz2 gst-plugins-bad-925e83ee60c5406b2e5f0f39b0da0f90370efc27.zip | |
Merge branch 'master' of git://anongit.freedesktop.org/gstreamer/gst-plugins-bad into fdo
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/oss4/oss4-mixer.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/oss4/oss4-mixer.c b/sys/oss4/oss4-mixer.c index 91b14a2c..031549b3 100644 --- a/sys/oss4/oss4-mixer.c +++ b/sys/oss4/oss4-mixer.c @@ -103,7 +103,7 @@ static void gst_oss4_mixer_close (GstOss4Mixer * mixer); static gboolean gst_oss4_mixer_enum_control_update_enum_list (GstOss4Mixer * m, GstOss4MixerControl * mc); -#ifndef GST_DISABLE_DEBUG +#ifndef GST_DISABLE_GST_DEBUG static const gchar *mixer_ext_type_get_name (gint type); static const gchar *mixer_ext_flags_get_string (gint flags); #endif @@ -874,7 +874,7 @@ gst_oss4_mixer_control_get_translated_name (GstOss4MixerControl * mc) return g_quark_to_string (g_quark_from_string (name)); /* eek */ } -#ifndef GST_DISABLE_DEBUG +#ifndef GST_DISABLE_GST_DEBUG static const gchar * mixer_ext_type_get_name (gint type) { @@ -924,9 +924,9 @@ mixer_ext_type_get_name (gint type) } return "unknown"; } -#endif /* GST_DISABLE_DEBUG */ +#endif /* GST_DISABLE_GST_DEBUG */ -#ifndef GST_DISABLE_DEBUG +#ifndef GST_DISABLE_GST_DEBUG static const gchar * mixer_ext_flags_get_string (gint flags) { @@ -987,9 +987,9 @@ mixer_ext_flags_get_string (gint flags) return g_quark_to_string (q); } -#endif /* GST_DISABLE_DEBUG */ +#endif /* GST_DISABLE_GST_DEBUG */ -#ifndef GST_DISABLE_DEBUG +#ifndef GST_DISABLE_GST_DEBUG static void gst_oss4_mixer_control_dump_tree (GstOss4MixerControl * mc, gint depth) { @@ -1010,7 +1010,7 @@ gst_oss4_mixer_control_dump_tree (GstOss4MixerControl * mc, gint depth) gst_oss4_mixer_control_dump_tree (child_mc, depth + 2); } } -#endif /* GST_DISABLE_DEBUG */ +#endif /* GST_DISABLE_GST_DEBUG */ static GList * gst_oss4_mixer_get_controls (GstOss4Mixer * mixer) @@ -1103,7 +1103,7 @@ gst_oss4_mixer_get_controls (GstOss4Mixer * mixer) controls = g_list_prepend (controls, mc); } -#ifndef GST_DISABLE_DEBUG +#ifndef GST_DISABLE_GST_DEBUG gst_oss4_mixer_control_dump_tree (root_mc, 0); #endif |