Fix mac builds - amend b01fe8b0e
This commit is contained in:
parent
558d9d4897
commit
45c8944789
@ -27,6 +27,19 @@
|
||||
|
||||
#ifdef MACVST_SUPPORT
|
||||
#include <Carbon/Carbon.h>
|
||||
|
||||
/* fix up stupid apple macros */
|
||||
#undef check
|
||||
#undef require
|
||||
#undef verify
|
||||
|
||||
#ifdef YES
|
||||
#undef YES
|
||||
#endif
|
||||
#ifdef NO
|
||||
#undef NO
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
struct LIBARDOUR_API _VSTKey
|
||||
|
@ -39,8 +39,6 @@
|
||||
|
||||
#include "pbd/i18n.h"
|
||||
|
||||
#include <Carbon/Carbon.h>
|
||||
|
||||
/*Simple error handler stuff for VSTFX*/
|
||||
|
||||
void mac_vst_error (const char *fmt, ...)
|
||||
@ -96,7 +94,6 @@ mac_vst_load (const char *path)
|
||||
|
||||
fhandle = mac_vst_handle_new ();
|
||||
|
||||
fhandle->dll = NULL;
|
||||
fhandle->bundleRef = 0;
|
||||
|
||||
CFURLRef url;
|
||||
@ -152,10 +149,9 @@ mac_vst_unload (VSTHandle* fhandle)
|
||||
|
||||
if (fhandle->bundleRef)
|
||||
{
|
||||
CFBundleRef* bundleRefPtr = (CFBundleRef*) fhandle->dll;
|
||||
CFBundleCloseBundleResourceMap (*bundleRefPtr, (CFBundleRefNum)fhandle->res_file_id);
|
||||
CFRelease (*bundleRefPtr);
|
||||
fhandle->dll = 0;
|
||||
CFBundleCloseBundleResourceMap (fhandle->bundleRef, fhandle->res_file_id);
|
||||
CFRelease (fhandle->bundleRef);
|
||||
fhandle->bundleRef = 0;
|
||||
}
|
||||
|
||||
if (fhandle->name)
|
||||
|
Loading…
Reference in New Issue
Block a user