diff options
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_sound.h | 8 | ||||
-rw-r--r-- | source/blender/blenkernel/CMakeLists.txt | 14 | ||||
-rw-r--r-- | source/blender/blenkernel/SConscript | 5 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/nla.c | 6 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 6 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/sound.c | 16 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/writeffmpeg.c | 8 |
7 files changed, 22 insertions, 41 deletions
diff --git a/source/blender/blenkernel/BKE_sound.h b/source/blender/blenkernel/BKE_sound.h index cb71b939dc5..fc543b887e4 100644 --- a/source/blender/blenkernel/BKE_sound.h +++ b/source/blender/blenkernel/BKE_sound.h @@ -35,10 +35,8 @@ #define SOUND_WAVE_SAMPLES_PER_SECOND 250 -#ifdef WITH_AUDASPACE -# ifdef WITH_EXTERNAL_AUDASPACE -# include <audaspace/AUD_Device.h> -# endif +#ifdef WITH_SYSTEM_AUDASPACE +# include AUD_DEVICE_H #endif struct bSound; @@ -83,7 +81,7 @@ void BKE_sound_load(struct Main *main, struct bSound *sound); void BKE_sound_free(struct bSound *sound); -#if defined(__AUD_C_API_H__) || defined(WITH_EXTERNAL_AUDASPACE) +#if defined(__AUD_C_API_H__) || defined(WITH_SYSTEM_AUDASPACE) AUD_Device *BKE_sound_mixdown(struct Scene *scene, AUD_DeviceSpecs specs, int start, float volume); #endif diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index dd5fcafd964..f0d6cfb7e1c 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -311,17 +311,11 @@ if(WIN32) endif() if(WITH_AUDASPACE) - list(APPEND INC - ../../../intern/audaspace/intern - ) - add_definitions(-DWITH_AUDASPACE) + add_definitions(${AUDASPACE_DEFINITIONS}) - if(WITH_EXTERNAL_AUDASPACE) - add_definitions(-DWITH_EXTERNAL_AUDASPACE) - list(APPEND INC_SYS - ${CAUDASPACE_INCLUDE_DIRS} - ) - endif() + list(APPEND INC_SYS + ${AUDASPACE_C_INCLUDE_DIRS} + ) endif() if(WITH_BULLET) diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript index 5e6d402115b..20ac329f2cf 100644 --- a/source/blender/blenkernel/SConscript +++ b/source/blender/blenkernel/SConscript @@ -48,7 +48,6 @@ incs = [ env['BF_GLEW_INC'], '#/intern/ghost', '#/intern/glew-mx', - '#/intern/audaspace/intern', '#/intern/elbeem/extern', '#/intern/iksolver/extern', '#/intern/smoke/extern', @@ -121,6 +120,10 @@ if env['WITH_BF_CINEON']: if env['WITH_BF_HDR']: defs.append('WITH_HDR') +if env['WITH_BF_AUDASPACE']: + defs += env['BF_AUDASPACE_DEF'] + incs += ' ' + env['BF_AUDASPACE_C_INC'] + if env['WITH_BF_JACK']: defs.append('WITH_JACK') diff --git a/source/blender/blenkernel/intern/nla.c b/source/blender/blenkernel/intern/nla.c index 25629e7db94..037b44e0d8c 100644 --- a/source/blender/blenkernel/intern/nla.c +++ b/source/blender/blenkernel/intern/nla.c @@ -59,11 +59,7 @@ #include "BKE_library.h" #ifdef WITH_AUDASPACE -# ifdef WITH_EXTERNAL_AUDASPACE -# include <audaspace/AUD_Special.h> -# else -# include "AUD_C-API.h" -# endif +# include AUD_SPECIAL_H #endif #include "RNA_access.h" diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index b087d809e82..bd652b02da2 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -88,11 +88,7 @@ #include "BKE_sound.h" #ifdef WITH_AUDASPACE -# ifdef WITH_EXTERNAL_AUDASPACE -# include <audaspace/AUD_Special.h> -# else -# include "AUD_C-API.h" -# endif +# include AUD_SPECIAL_H #endif static ImBuf *seq_render_strip_stack(const SeqRenderData *context, ListBase *seqbasep, float cfra, int chanshown); diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c index db92e0ed3c9..b81839f80fb 100644 --- a/source/blender/blenkernel/intern/sound.c +++ b/source/blender/blenkernel/intern/sound.c @@ -48,14 +48,12 @@ #include "DNA_speaker_types.h" #ifdef WITH_AUDASPACE -# ifdef WITH_EXTERNAL_AUDASPACE -# include <audaspace/AUD_Sound.h> -# include <audaspace/AUD_Sequence.h> -# include <audaspace/AUD_Handle.h> -# include <audaspace/AUD_Special.h> -# include "AUD_Set.h" -# else -# include "AUD_C-API.h" +# include AUD_SOUND_H +# include AUD_SEQUENCE_H +# include AUD_HANDLE_H +# include AUD_SPECIAL_H +# ifdef WITH_SYSTEM_AUDASPACE +# include "../../../intern/audaspace/intern/AUD_Set.h" # endif #endif @@ -845,7 +843,7 @@ float BKE_sound_get_length(bSound *sound) bool BKE_sound_is_jack_supported(void) { -#ifdef WITH_EXTERNAL_AUDASPACE +#ifdef WITH_SYSTEM_AUDASPACE return 1; #else return (bool)AUD_isJackSupported(); diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c index eb07a2d370b..8969d6694ff 100644 --- a/source/blender/blenkernel/intern/writeffmpeg.c +++ b/source/blender/blenkernel/intern/writeffmpeg.c @@ -45,12 +45,8 @@ #include "BLI_blenlib.h" #ifdef WITH_AUDASPACE -# ifdef WITH_EXTERNAL_AUDASPACE -# include <audaspace/AUD_Device.h> -# include <audaspace/AUD_Special.h> -# else -# include "AUD_C-API.h" -# endif +# include AUD_DEVICE_H +# include AUD_SPECIAL_H #endif #include "BLI_utildefines.h" |