[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42622] trunk/blender/intern/audaspace: OSX: Add a framework-check for Jack to avoid crashes
jens verwiebe
info at jensverwiebe.de
Wed Dec 14 07:15:54 CET 2011
Revision: 42622
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42622
Author: jensverwiebe
Date: 2011-12-14 06:15:52 +0000 (Wed, 14 Dec 2011)
Log Message:
-----------
OSX: Add a framework-check for Jack to avoid crashes
Modified Paths:
--------------
trunk/blender/intern/audaspace/SConscript
trunk/blender/intern/audaspace/intern/AUD_C-API.cpp
Modified: trunk/blender/intern/audaspace/SConscript
===================================================================
--- trunk/blender/intern/audaspace/SConscript 2011-12-14 06:12:20 UTC (rev 42621)
+++ trunk/blender/intern/audaspace/SConscript 2011-12-14 06:15:52 UTC (rev 42622)
@@ -25,6 +25,8 @@
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')
Modified: trunk/blender/intern/audaspace/intern/AUD_C-API.cpp
===================================================================
--- trunk/blender/intern/audaspace/intern/AUD_C-API.cpp 2011-12-14 06:12:20 UTC (rev 42621)
+++ trunk/blender/intern/audaspace/intern/AUD_C-API.cpp 2011-12-14 06:15:52 UTC (rev 42622)
@@ -78,7 +78,10 @@
#ifdef WITH_JACK
#include "AUD_JackDevice.h"
+#ifdef __APPLE__
+#include <boost/filesystem/operations.hpp>
#endif
+#endif
#ifdef WITH_FFMPEG
@@ -137,9 +140,18 @@
#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;
}
More information about the Bf-blender-cvs
mailing list