From bc1f125abd01358aef10857f06553c3ddaef154d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Thu, 10 Aug 2017 01:30:02 +0300 Subject: [PATCH] Rename native endianness audio format constants to prevent conflicts --- gstreamer-audio/src/audio_format_info.rs | 56 ++++++++++++------------ 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/gstreamer-audio/src/audio_format_info.rs b/gstreamer-audio/src/audio_format_info.rs index ce4f1d119..647713abe 100644 --- a/gstreamer-audio/src/audio_format_info.rs +++ b/gstreamer-audio/src/audio_format_info.rs @@ -80,62 +80,62 @@ impl str::FromStr for ::AudioFormat { } #[cfg(target_endian = "big")] -pub const FORMAT_S16: ::AudioFormat = ::AudioFormat::S16be; +pub const AUDIO_FORMAT_S16: ::AudioFormat = ::AudioFormat::S16be; #[cfg(target_endian = "big")] -pub const FORMAT_U16: ::AudioFormat = ::AudioFormat::U16be; +pub const AUDIO_FORMAT_U16: ::AudioFormat = ::AudioFormat::U16be; #[cfg(target_endian = "big")] -pub const FORMAT_S2432: ::AudioFormat = ::AudioFormat::S2432be; +pub const AUDIO_FORMAT_S2432: ::AudioFormat = ::AudioFormat::S2432be; #[cfg(target_endian = "big")] -pub const FORMAT_U2432: ::AudioFormat = ::AudioFormat::U2432be; +pub const AUDIO_FORMAT_U2432: ::AudioFormat = ::AudioFormat::U2432be; #[cfg(target_endian = "big")] -pub const FORMAT_S32: ::AudioFormat = ::AudioFormat::S32be; +pub const AUDIO_FORMAT_S32: ::AudioFormat = ::AudioFormat::S32be; #[cfg(target_endian = "big")] -pub const FORMAT_U32: ::AudioFormat = ::AudioFormat::S32be; +pub const AUDIO_FORMAT_U32: ::AudioFormat = ::AudioFormat::S32be; #[cfg(target_endian = "big")] -pub const FORMAT_S24: ::AudioFormat = ::AudioFormat::S24be; +pub const AUDIO_FORMAT_S24: ::AudioFormat = ::AudioFormat::S24be; #[cfg(target_endian = "big")] -pub const FORMAT_U24: ::AudioFormat = ::AudioFormat::S24be; +pub const AUDIO_FORMAT_U24: ::AudioFormat = ::AudioFormat::S24be; #[cfg(target_endian = "big")] -pub const FORMAT_S20: ::AudioFormat = ::AudioFormat::S20be; +pub const AUDIO_FORMAT_S20: ::AudioFormat = ::AudioFormat::S20be; #[cfg(target_endian = "big")] -pub const FORMAT_U20: ::AudioFormat = ::AudioFormat::S20be; +pub const AUDIO_FORMAT_U20: ::AudioFormat = ::AudioFormat::S20be; #[cfg(target_endian = "big")] -pub const FORMAT_S18: ::AudioFormat = ::AudioFormat::S18be; +pub const AUDIO_FORMAT_S18: ::AudioFormat = ::AudioFormat::S18be; #[cfg(target_endian = "big")] -pub const FORMAT_U18: ::AudioFormat = ::AudioFormat::S18be; +pub const AUDIO_FORMAT_U18: ::AudioFormat = ::AudioFormat::S18be; #[cfg(target_endian = "big")] -pub const FORMAT_F32: ::AudioFormat = ::AudioFormat::F32be; +pub const AUDIO_FORMAT_F32: ::AudioFormat = ::AudioFormat::F32be; #[cfg(target_endian = "big")] -pub const FORMAT_F64: ::AudioFormat = ::AudioFormat::F64be; +pub const AUDIO_FORMAT_F64: ::AudioFormat = ::AudioFormat::F64be; #[cfg(target_endian = "little")] -pub const FORMAT_S16: ::AudioFormat = ::AudioFormat::S16le; +pub const AUDIO_FORMAT_S16: ::AudioFormat = ::AudioFormat::S16le; #[cfg(target_endian = "little")] -pub const FORMAT_U16: ::AudioFormat = ::AudioFormat::U16le; +pub const AUDIO_FORMAT_U16: ::AudioFormat = ::AudioFormat::U16le; #[cfg(target_endian = "little")] -pub const FORMAT_S2432: ::AudioFormat = ::AudioFormat::S2432le; +pub const AUDIO_FORMAT_S2432: ::AudioFormat = ::AudioFormat::S2432le; #[cfg(target_endian = "little")] -pub const FORMAT_U2432: ::AudioFormat = ::AudioFormat::U2432le; +pub const AUDIO_FORMAT_U2432: ::AudioFormat = ::AudioFormat::U2432le; #[cfg(target_endian = "little")] -pub const FORMAT_S32: ::AudioFormat = ::AudioFormat::S32le; +pub const AUDIO_FORMAT_S32: ::AudioFormat = ::AudioFormat::S32le; #[cfg(target_endian = "little")] -pub const FORMAT_U32: ::AudioFormat = ::AudioFormat::S32le; +pub const AUDIO_FORMAT_U32: ::AudioFormat = ::AudioFormat::S32le; #[cfg(target_endian = "little")] -pub const FORMAT_S24: ::AudioFormat = ::AudioFormat::S24le; +pub const AUDIO_FORMAT_S24: ::AudioFormat = ::AudioFormat::S24le; #[cfg(target_endian = "little")] -pub const FORMAT_U24: ::AudioFormat = ::AudioFormat::S24le; +pub const AUDIO_FORMAT_U24: ::AudioFormat = ::AudioFormat::S24le; #[cfg(target_endian = "little")] -pub const FORMAT_S20: ::AudioFormat = ::AudioFormat::S20le; +pub const AUDIO_FORMAT_S20: ::AudioFormat = ::AudioFormat::S20le; #[cfg(target_endian = "little")] -pub const FORMAT_U20: ::AudioFormat = ::AudioFormat::S20le; +pub const AUDIO_FORMAT_U20: ::AudioFormat = ::AudioFormat::S20le; #[cfg(target_endian = "little")] -pub const FORMAT_S18: ::AudioFormat = ::AudioFormat::S18le; +pub const AUDIO_FORMAT_S18: ::AudioFormat = ::AudioFormat::S18le; #[cfg(target_endian = "little")] -pub const FORMAT_U18: ::AudioFormat = ::AudioFormat::S18le; +pub const AUDIO_FORMAT_U18: ::AudioFormat = ::AudioFormat::S18le; #[cfg(target_endian = "little")] -pub const FORMAT_F32: ::AudioFormat = ::AudioFormat::F32le; +pub const AUDIO_FORMAT_F32: ::AudioFormat = ::AudioFormat::F32le; #[cfg(target_endian = "little")] -pub const FORMAT_F64: ::AudioFormat = ::AudioFormat::F64le; +pub const AUDIO_FORMAT_F64: ::AudioFormat = ::AudioFormat::F64le; pub struct AudioFormatInfo(&'static ffi::GstAudioFormatInfo);