[Bf-committers] [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]

Afaik only boost has "exists", but aren´t we include this header anyway? So there´s no overhead then.

Jens

Am 14.12.2011 um 08:12 schrieb Campbell Barton:

> AFAIK currently only cycles depends on BOOST, can't this use some
> other way to check a file exists?
> 
> On Wed, Dec 14, 2011 at 5:15 PM, jens verwiebe <info at jensverwiebe.de> wrote:
>> 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;
>>                }
>> 
>> _______________________________________________
>> Bf-blender-cvs mailing list
>> Bf-blender-cvs at blender.org
>> http://lists.blender.org/mailman/listinfo/bf-blender-cvs
> 
> 
> 
> -- 
> - Campbell
> _______________________________________________
> Bf-committers mailing list
> Bf-committers at blender.org
> http://lists.blender.org/mailman/listinfo/bf-committers

_____________________________________

Jens Verwiebe
Allerskehre 44  -  22309 Hamburg

Tel.: +49 40 68 78 50
mobil: +49 172 400 49 07
mailto: info at jensverwiebe.de
web:  http://www.jensverwiebe.de
_____________________________________