Update to new combined build

src/dsp/FFT.h

@@ -1,15 +1,24 @@
 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
 
 /*
-    Rubber Band
+    Rubber Band Library
     An audio time-stretching and pitch-shifting library.
-    Copyright 2007-2011 Chris Cannam.
-    
+    Copyright 2007-2012 Particular Programs Ltd.
+
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
     published by the Free Software Foundation; either version 2 of the
     License, or (at your option) any later version.  See the file
     COPYING included with this distribution for more information.
+
+    Alternatively, if you have a valid commercial licence for the
+    Rubber Band Library obtained by agreement with the copyright
+    holders, you may redistribute and/or modify it under the terms
+    described in that licence.
+
+    If you wish to distribute code using the Rubber Band Library
+    under terms other than those of the GNU General Public License,
+    you must obtain a valid commercial licence before doing so.
 */
 
 #ifndef _RUBBERBAND_FFT_H_
@@ -17,6 +26,9 @@
 
 #include "system/sysutils.h"
 
+#include <string>
+#include <set>
+
 namespace RubberBand {
 
 class FFTImpl;
@@ -41,7 +53,7 @@ class FFTImpl;
 class FFT
 {
 public:
-    enum Exception { InvalidSize };
+    enum Exception { InvalidSize, InvalidImplementation, InternalError };
 
     FFT(int size, int debugLevel = 0); // may throw InvalidSize
     ~FFT();
@@ -73,11 +85,36 @@ public:
     void initFloat();
     void initDouble();
 
-    static void tune();
+    enum Precision {
+        SinglePrecision = 0x1,
+        DoublePrecision = 0x2
+    };
+    typedef int Precisions;
+
+    /**
+     * Return the OR of all precisions supported by this
+     * implementation. All of the functions (float and double) are
+     * available regardless of the supported implementations, but they
+     * will be calculated at the proper precision only if it is
+     * available. (So float functions will be calculated using doubles
+     * and then truncated if single-precision is unavailable, and
+     * double functions will use single-precision arithmetic if double
+     * is unavailable.)
+     */
+    Precisions getSupportedPrecisions() const;
+
+    static std::set<std::string> getImplementations();
+    static std::string getDefaultImplementation();
+    static void setDefaultImplementation(std::string);
+
+#ifdef FFT_MEASUREMENT
+    static std::string tune();
+#endif
 
 protected:
     FFTImpl *d;
-    static int m_method;
+    static std::string m_implementation;
+    static void pickDefaultImplementation();
 };
 
 }