stop using Gestalt() on OS X (deprecated and no longer operating correctly)
authorPaul Davis <paul@linuxaudiosystems.com>
Mon, 18 Jul 2016 19:56:03 +0000 (15:56 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Mon, 18 Jul 2016 19:56:28 +0000 (15:56 -0400)
The incorrect behaviour was documented and did not cause issues in Ardour, but we should
still stop using this ancient call.

libs/ardour/globals.cc

index cdfd4e036dadc42d7c6eb12e158c64945879ce55..974247aef57cb08d26daebf280485cee9bc1da8e 100644 (file)
 #include "audiographer/routines.h"
 
 #if defined (__APPLE__)
-       #include <Carbon/Carbon.h> // For Gestalt
+#include <CoreFoundation/CoreFoundation.h>
 #endif
 
 #include "pbd/i18n.h"
@@ -206,12 +206,8 @@ setup_hardware_optimization (bool try_optimization)
                }
 
 #elif defined (__APPLE__) && defined (BUILD_VECLIB_OPTIMIZATIONS)
-               SInt32 sysVersion = 0;
 
-               if (noErr != Gestalt(gestaltSystemVersion, &sysVersion))
-                       sysVersion = 0;
-
-               if (sysVersion >= 0x00001040) { // Tiger at least
+               if (floor (kCFCoreFoundationVersionNumber) > kCFCoreFoundationVersionNumber10_4) { /* at least Tiger */
                        compute_peak           = veclib_compute_peak;
                        find_peaks             = veclib_find_peaks;
                        apply_gain_to_buffer   = veclib_apply_gain_to_buffer;