diff options
| author | Damien Zammit <damien@zamaudio.com> | 2017-01-24 22:02:44 +1100 |
|---|---|---|
| committer | Damien Zammit <damien@zamaudio.com> | 2017-02-11 18:45:23 +1100 |
| commit | baf3e41582b34137eb28ef1b02c34a8d060fbf62 (patch) | |
| tree | 8fb80ec7f61b34566e74a4b33f77dc179e76a8f7 | |
| parent | 03aab7106523afe225a13034566659e0453b99d2 (diff) | |
Fix bug with MacOS old build - ZamTube
Signed-off-by: Damien Zammit <damien@zamaudio.com>
| -rw-r--r-- | plugins/ZamTube/ZamTubePlugin.cpp | 2 | ||||
| -rw-r--r-- | plugins/ZamTube/triode.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/plugins/ZamTube/ZamTubePlugin.cpp b/plugins/ZamTube/ZamTubePlugin.cpp index da5bf1d..fce4f18 100644 --- a/plugins/ZamTube/ZamTubePlugin.cpp +++ b/plugins/ZamTube/ZamTubePlugin.cpp @@ -237,7 +237,7 @@ void ZamTubePlugin::activate() ckt.warmup_tubes(); fSamplingFreq = Fs; - fConst0 = float(std::fminf(192000.0, std::fmaxf(1.0, fSamplingFreq))); + fConst0 = float(MIN(192000.0, MAX(1.0, fSamplingFreq))); fConst1 = (2 * fConst0); fConst2 = faustpower<2>(fConst1); fConst3 = (3 * fConst1); diff --git a/plugins/ZamTube/triode.h b/plugins/ZamTube/triode.h index fd2da51..e7a70fb 100644 --- a/plugins/ZamTube/triode.h +++ b/plugins/ZamTube/triode.h @@ -31,6 +31,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #define SWAP_NN(x,y) {T tmp=y; y=-x; x=-tmp;} #define TOLERANCE 1e-6 +#define MAX(x, y) (( (x) > (y) ) ? x : y ) +#define MIN(x, y) (( (x) < (y) ) ? x : y ) + typedef double T; static inline float |