diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-09-19 12:02:17 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-19 12:02:17 +0400 |
commit | 83a2f02a78cd01aaf31b9b4ae8a217a1ecea6a49 (patch) | |
tree | 9a2b9e2d5aa4f5b5bc4835848c3dc78029643d9a /intern/audaspace | |
parent | 425a81a29b8adf1fc2d913dfc679d6ca62cd05fa (diff) |
cleanup endian handling
- define __BIG_ENDIAN__ or __LITTLE_ENDIAN__ with cmake & scons.
- ENDIAN_ORDER is now a define rather than a global short.
- replace checks like this with single ifdef: #if defined(__sgi) || defined (__sparc) || defined (__sparc__) || defined (__PPC__) || defined (__ppc__) || defined (__hppa__) || defined (__BIG_ENDIAN__)
- remove BKE_endian.h which isn't used
Diffstat (limited to 'intern/audaspace')
-rw-r--r-- | intern/audaspace/intern/AUD_ConverterReader.cpp | 12 | ||||
-rw-r--r-- | intern/audaspace/intern/AUD_Mixer.cpp | 13 |
2 files changed, 11 insertions, 14 deletions
diff --git a/intern/audaspace/intern/AUD_ConverterReader.cpp b/intern/audaspace/intern/AUD_ConverterReader.cpp index b3d669379f8..7665f276c0a 100644 --- a/intern/audaspace/intern/AUD_ConverterReader.cpp +++ b/intern/audaspace/intern/AUD_ConverterReader.cpp @@ -36,9 +36,6 @@ AUD_ConverterReader::AUD_ConverterReader(AUD_Reference<AUD_IReader> reader, AUD_EffectReader(reader), m_format(specs.format) { - int bigendian = 1; - bigendian = (((char*)&bigendian)[0]) ? 0: 1; // 1 if Big Endian - switch(m_format) { case AUD_FORMAT_U8: @@ -48,10 +45,11 @@ AUD_ConverterReader::AUD_ConverterReader(AUD_Reference<AUD_IReader> reader, m_convert = AUD_convert_float_s16; break; case AUD_FORMAT_S24: - if(bigendian) - m_convert = AUD_convert_float_s24_be; - else - m_convert = AUD_convert_float_s24_le; +#ifdef __BIG_ENDIAN__ + m_convert = AUD_convert_float_s24_be; +#else + m_convert = AUD_convert_float_s24_le; +#endif break; case AUD_FORMAT_S32: m_convert = AUD_convert_float_s32; diff --git a/intern/audaspace/intern/AUD_Mixer.cpp b/intern/audaspace/intern/AUD_Mixer.cpp index 74ff180627a..caeeac8d43c 100644 --- a/intern/audaspace/intern/AUD_Mixer.cpp +++ b/intern/audaspace/intern/AUD_Mixer.cpp @@ -37,9 +37,6 @@ AUD_Mixer::AUD_Mixer(AUD_DeviceSpecs specs) : m_specs(specs) { - int bigendian = 1; - bigendian = (((char*)&bigendian)[0]) ? 0: 1; // 1 if Big Endian - switch(m_specs.format) { case AUD_FORMAT_U8: @@ -49,10 +46,12 @@ AUD_Mixer::AUD_Mixer(AUD_DeviceSpecs specs) : m_convert = AUD_convert_float_s16; break; case AUD_FORMAT_S24: - if(bigendian) - m_convert = AUD_convert_float_s24_be; - else - m_convert = AUD_convert_float_s24_le; + +#ifdef __BIG_ENDIAN__ + m_convert = AUD_convert_float_s24_be; +#else + m_convert = AUD_convert_float_s24_le; +#endif break; case AUD_FORMAT_S32: m_convert = AUD_convert_float_s32; |