From 7d9a8c2308f2783062271eb99c18e8738b470d4d Mon Sep 17 00:00:00 2001 From: Jens Verwiebe Date: Wed, 14 Dec 2011 06:15:52 +0000 Subject: OSX: Add a framework-check for Jack to avoid crashes --- intern/audaspace/SConscript | 2 ++ intern/audaspace/intern/AUD_C-API.cpp | 12 ++++++++++++ 2 files changed, 14 insertions(+) (limited to 'intern/audaspace') diff --git a/intern/audaspace/SConscript b/intern/audaspace/SConscript index b8d5a56a625..27556060fca 100644 --- a/intern/audaspace/SConscript +++ b/intern/audaspace/SConscript @@ -25,6 +25,8 @@ if env['WITH_BF_JACK']: sources += env.Glob('jack/*.cpp') incs += ' jack ' + env['BF_JACK_INC'] defs.append('WITH_JACK') + if env['OURPLATFORM'] == 'darwin': + incs += ' ' + env['BF_BOOST_INC'] if env['WITH_BF_SNDFILE']: sources += env.Glob('sndfile/*.cpp') diff --git a/intern/audaspace/intern/AUD_C-API.cpp b/intern/audaspace/intern/AUD_C-API.cpp index 7455e24cdc0..2eab57765c7 100644 --- a/intern/audaspace/intern/AUD_C-API.cpp +++ b/intern/audaspace/intern/AUD_C-API.cpp @@ -78,6 +78,9 @@ #ifdef WITH_JACK #include "AUD_JackDevice.h" +#ifdef __APPLE__ +#include +#endif #endif @@ -137,8 +140,17 @@ int AUD_init(AUD_DeviceType device, AUD_DeviceSpecs specs, int buffersize) #endif #ifdef WITH_JACK case AUD_JACK_DEVICE: +#ifdef __APPLE__ + if (!boost::filesystem::exists("/Library/Frameworks/Jackmp.framework")){ + printf("Warning: Jack Framework not available\n"); + break; + } else { +#endif dev = new AUD_JackDevice("Blender", specs, buffersize); break; +#ifdef __APPLE__ + } +#endif #endif default: return false; -- cgit v1.2.3