OS(MACOSX) and USE(WEBAUDIO_FFMPEG) are mutually exclusive

Source/platform/audio/FFTFrame.h

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 14 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef FFTFrame_h
 #define FFTFrame_h
 
 #include "platform/PlatformExport.h"
 #include "platform/audio/AudioArray.h"
 
-#if OS(MACOSX) && !USE(WEBAUDIO_FFMPEG)
-#define USE_ACCELERATE_FFT 1
-#else
-#define USE_ACCELERATE_FFT 0
-#endif
-
-#if USE_ACCELERATE_FFT
+#if OS(MACOSX)
 #include <Accelerate/Accelerate.h>
-#endif
-
-#if !USE_ACCELERATE_FFT
-
-#if USE(WEBAUDIO_OPENMAX_DL_FFT)
+#elif USE(WEBAUDIO_OPENMAX_DL_FFT)
 #include <dl/sp/api/omxSP.h>
 #elif USE(WEBAUDIO_FFMPEG)
 struct RDFTContext;
 #endif
 
-#endif // !USE_ACCELERATE_FFT
-
 #if USE(WEBAUDIO_IPP)
 #include <ipps.h>
 #endif // USE(WEBAUDIO_IPP)
 
 #include "wtf/Forward.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/Threading.h"
 
 namespace WebCore {
 
@@ skipping 32 matching lines @@
 
     unsigned fftSize() const { return m_FFTSize; }
     unsigned log2FFTSize() const { return m_log2FFTSize; }
 
 private:
     unsigned m_FFTSize;
     unsigned m_log2FFTSize;
 
     void interpolateFrequencyComponents(const FFTFrame& frame1, const FFTFrame& frame2, double x);
 
-#if USE_ACCELERATE_FFT
+#if OS(MACOSX)
     DSPSplitComplex& dspSplitComplex() { return m_frame; }
     DSPSplitComplex dspSplitComplex() const { return m_frame; }
 
     static FFTSetup fftSetupForSize(unsigned fftSize);
 
     static FFTSetup* fftSetups;
 
     FFTSetup m_FFTSetup;
 
     DSPSplitComplex m_frame;
     AudioFloatArray m_realData;
     AudioFloatArray m_imagData;
-#else // !USE_ACCELERATE_FFT
+#else // !OS(MACOSX)
 
 #if USE(WEBAUDIO_FFMPEG)
     static RDFTContext* contextForSize(unsigned fftSize, int trans);
 
     RDFTContext* m_forwardContext;
     RDFTContext* m_inverseContext;
 
     float* getUpToDateComplexData();
     AudioFloatArray m_complexData;
     AudioFloatArray m_realData;
@@ skipping 14 matching lines @@
     static OMXFFTSpec_R_F32* contextForSize(unsigned log2FFTSize);
 
     OMXFFTSpec_R_F32* m_forwardContext;
     OMXFFTSpec_R_F32* m_inverseContext;
 
     AudioFloatArray m_complexData;
     AudioFloatArray m_realData;
     AudioFloatArray m_imagData;
 #endif
 
-#endif // !USE_ACCELERATE_FFT
+#endif // !OS(MACOSX)
 };
 
 } // namespace WebCore
 
 #endif // FFTFrame_h