diff options
author | Jörg Müller <nexyon@gmail.com> | 2015-06-16 11:03:35 +0300 |
---|---|---|
committer | Jörg Müller <nexyon@gmail.com> | 2015-07-28 15:01:53 +0300 |
commit | a0cbebf404d6c46e59b090e7217ce39d7e760809 (patch) | |
tree | fad66bb8f714c160c3a3f016e1fba1711824e34d /source/blender | |
parent | 58956f3b91e581ef7040371dda3e3595902c18d9 (diff) |
Audaspace: fixing problems for the merge to master suggested by Campbell and Sergey.
- rename WITH_EXTERNAL_AUDASPACE to WITH_SYSTEM_AUDASPACE.
- rename C/PYAUDASPACE to AUDASPACE_C/PY
- simplifying cmake defines and includes.
- fixing include paths and enabling WITH_SYSTEM_AUDASPACE for windows.
- fixing scons building.
- other minor build system fixes.
Diffstat (limited to 'source/blender')
24 files changed, 73 insertions, 106 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" diff --git a/source/blender/editors/sound/CMakeLists.txt b/source/blender/editors/sound/CMakeLists.txt index c3ef0f8851f..535cd579030 100644 --- a/source/blender/editors/sound/CMakeLists.txt +++ b/source/blender/editors/sound/CMakeLists.txt @@ -39,14 +39,11 @@ set(SRC ) if(WITH_AUDASPACE) - add_definitions(-DWITH_AUDASPACE) - - if(WITH_EXTERNAL_AUDASPACE) - add_definitions(-DWITH_EXTERNAL_AUDASPACE) - list(APPEND INC_SYS ${CAUDASPACE_INCLUDE_DIRS}) - else() - list(APPEND INC ../../../../intern/audaspace/intern) - endif() + add_definitions(${AUDASPACE_DEFINITIONS}) + + list(APPEND INC_SYS + ${AUDASPACE_C_INCLUDE_DIRS} + ) endif() if(WITH_CODEC_FFMPEG) diff --git a/source/blender/editors/sound/SConscript b/source/blender/editors/sound/SConscript index 33feedf51cc..fad52c64df1 100644 --- a/source/blender/editors/sound/SConscript +++ b/source/blender/editors/sound/SConscript @@ -31,7 +31,6 @@ sources = env.Glob('*.c') incs = [ '#/intern/guardedalloc', - '#/intern/audaspace/intern', '../include', '../../blenkernel', '../../blenlib', @@ -44,6 +43,10 @@ incs = ' '.join(incs) defs = [] +if env['WITH_BF_AUDASPACE']: + defs += env['BF_AUDASPACE_DEF'] + incs += ' ' + env['BF_AUDASPACE_C_INC'] + if env['WITH_BF_FFMPEG']: defs.append('WITH_FFMPEG') diff --git a/source/blender/editors/sound/sound_ops.c b/source/blender/editors/sound/sound_ops.c index 1fd48dd7e00..c081539df41 100644 --- a/source/blender/editors/sound/sound_ops.c +++ b/source/blender/editors/sound/sound_ops.c @@ -67,11 +67,7 @@ #include "WM_types.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 "ED_sound.h" diff --git a/source/blender/editors/space_graph/CMakeLists.txt b/source/blender/editors/space_graph/CMakeLists.txt index b911f9effbe..b692f0b1c12 100644 --- a/source/blender/editors/space_graph/CMakeLists.txt +++ b/source/blender/editors/space_graph/CMakeLists.txt @@ -48,14 +48,11 @@ set(SRC ) if(WITH_AUDASPACE) - add_definitions(-DWITH_AUDASPACE) + add_definitions(${AUDASPACE_DEFINITIONS}) - if(WITH_EXTERNAL_AUDASPACE) - add_definitions(-DWITH_EXTERNAL_AUDASPACE) - list(APPEND INC_SYS ${CAUDASPACE_INCLUDE_DIRS}) - else() - list(APPEND INC ../../../../intern/audaspace/intern) - endif() + list(APPEND INC_SYS + ${AUDASPACE_C_INCLUDE_DIRS} + ) endif() if(WITH_INTERNATIONAL) diff --git a/source/blender/editors/space_graph/SConscript b/source/blender/editors/space_graph/SConscript index 35e09749743..ac23e8ee4e7 100644 --- a/source/blender/editors/space_graph/SConscript +++ b/source/blender/editors/space_graph/SConscript @@ -33,7 +33,6 @@ incs = [ '#/intern/guardedalloc', env['BF_GLEW_INC'], '#/intern/glew-mx', - '#/intern/audaspace/intern', '../include', '../../blenfont', '../../blenkernel', @@ -47,6 +46,10 @@ incs = [ defs = env['BF_GL_DEFINITIONS'] +if env['WITH_BF_AUDASPACE']: + defs += env['BF_AUDASPACE_DEF'] + incs.append(env['BF_AUDASPACE_C_INC']) + if env['WITH_BF_INTERNATIONAL']: defs.append('WITH_INTERNATIONAL') diff --git a/source/blender/editors/space_graph/graph_edit.c b/source/blender/editors/space_graph/graph_edit.c index 1f2b02dcf31..cc18df92cb1 100644 --- a/source/blender/editors/space_graph/graph_edit.c +++ b/source/blender/editors/space_graph/graph_edit.c @@ -36,11 +36,7 @@ #include <float.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 "MEM_guardedalloc.h" diff --git a/source/blender/editors/space_sequencer/CMakeLists.txt b/source/blender/editors/space_sequencer/CMakeLists.txt index ea12ee3b751..03d81019997 100644 --- a/source/blender/editors/space_sequencer/CMakeLists.txt +++ b/source/blender/editors/space_sequencer/CMakeLists.txt @@ -53,14 +53,11 @@ set(SRC ) if(WITH_AUDASPACE) - add_definitions(-DWITH_AUDASPACE) + add_definitions(${AUDASPACE_DEFINITIONS}) - if(WITH_EXTERNAL_AUDASPACE) - add_definitions(-DWITH_EXTERNAL_AUDASPACE) - list(APPEND INC_SYS ${CAUDASPACE_INCLUDE_DIRS}) - else() - list(APPEND INC ../../../../intern/audaspace/intern) - endif() + list(APPEND INC_SYS + ${AUDASPACE_C_INCLUDE_DIRS} + ) endif() if(WITH_INTERNATIONAL) diff --git a/source/blender/editors/space_sequencer/SConscript b/source/blender/editors/space_sequencer/SConscript index 954f8abff69..8ec1cddce10 100644 --- a/source/blender/editors/space_sequencer/SConscript +++ b/source/blender/editors/space_sequencer/SConscript @@ -33,7 +33,6 @@ incs = [ '#/intern/guardedalloc', env['BF_GLEW_INC'], '#/intern/glew-mx', - '#/intern/audaspace/intern', '../include', '../../blenfont', '../../blenkernel', @@ -47,6 +46,10 @@ incs = [ defs = env['BF_GL_DEFINITIONS'] +if env['WITH_BF_AUDASPACE']: + defs += env['BF_AUDASPACE_DEF'] + incs.append(env['BF_AUDASPACE_C_INC']) + if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'): incs.append(env['BF_PTHREADS_INC']) diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c index 7ffed70d7b8..2039358b772 100644 --- a/source/blender/editors/space_sequencer/sequencer_add.c +++ b/source/blender/editors/space_sequencer/sequencer_add.c @@ -66,11 +66,7 @@ #include "BKE_sound.h" #ifdef WITH_AUDASPACE -# ifdef WITH_EXTERNAL_AUDASPACE -# include <audaspace/AUD_Sequence.h> -# else -# include "AUD_C-API.h" -# endif +# include AUD_SEQUENCE_H #endif /* own include */ diff --git a/source/blender/makesrna/SConscript b/source/blender/makesrna/SConscript index 52c01f6d476..4b05a0db358 100644 --- a/source/blender/makesrna/SConscript +++ b/source/blender/makesrna/SConscript @@ -40,7 +40,6 @@ incs = [ '#/intern/memutil', env['BF_GLEW_INC'], '#/intern/glew-mx', - '#/intern/audaspace/intern', '#/intern/cycles/blender', '#/intern/smoke/extern', '../blenfont', diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt index 36e0a49c01d..3ebce1a7af0 100644 --- a/source/blender/makesrna/intern/CMakeLists.txt +++ b/source/blender/makesrna/intern/CMakeLists.txt @@ -224,14 +224,11 @@ if(WITH_IMAGE_FRAMESERVER) endif() if(WITH_AUDASPACE) - add_definitions(-DWITH_AUDASPACE) + add_definitions(${AUDASPACE_DEFINITIONS}) - if(WITH_EXTERNAL_AUDASPACE) - add_definitions(-DWITH_EXTERNAL_AUDASPACE) - list(APPEND INC_SYS ${CAUDASPACE_INCLUDE_DIRS}) - else() - list(APPEND INC ../../../../intern/audaspace/intern) - endif() + list(APPEND INC_SYS + ${AUDASPACE_C_INCLUDE_DIRS} + ) endif() if(WITH_CODEC_QUICKTIME) @@ -332,7 +329,6 @@ blender_include_dirs( ../../windowmanager ../../editors/include ../../render/extern/include - ../../../../intern/audaspace/intern ../../../../intern/cycles/blender ../../../../intern/guardedalloc ../../../../intern/glew-mx diff --git a/source/blender/makesrna/intern/SConscript b/source/blender/makesrna/intern/SConscript index 0e36a4c9712..0a9f9eec08c 100644 --- a/source/blender/makesrna/intern/SConscript +++ b/source/blender/makesrna/intern/SConscript @@ -59,7 +59,6 @@ incs = [ '#/intern/guardedalloc', env['BF_GLEW_INC'], '#/intern/glew-mx', - '#/intern/audaspace/intern', '#/intern/cycles/blender', '#/intern/smoke/extern', '../../blenfont', @@ -110,6 +109,10 @@ if env['WITH_BF_HDR']: if env['WITH_BF_FRAMESERVER']: defs.append('WITH_FRAMESERVER') +if env['WITH_BF_AUDASPACE']: + defs += env['BF_AUDASPACE_DEF'] + incs += ' ' + env['BF_AUDASPACE_C_INC'] + if env['WITH_BF_FFMPEG']: defs.append('WITH_FFMPEG') incs += ' ' + env['BF_FFMPEG_INC'] + ' #/intern/ffmpeg' diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 9c4fcd927c8..db00f149758 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -58,13 +58,7 @@ #ifdef WITH_QUICKTIME # include "quicktime_export.h" -# ifdef WITH_AUDASPACE -# ifdef WITH_EXTERNAL_AUDASPACE -# include <audaspace/AUD_Types.h> -# else -# include "AUD_Space.h" -# endif -# endif +# include AUD_TYPES_H #endif #ifdef WITH_FFMPEG diff --git a/source/blender/python/SConscript b/source/blender/python/SConscript index 5f032f25cf3..7c5156605fc 100644 --- a/source/blender/python/SConscript +++ b/source/blender/python/SConscript @@ -35,7 +35,6 @@ incs = [ '#/intern/memutil', env['BF_GLEW_INC'], '#/intern/glew-mx', - '#/intern/audaspace/intern', '#/intern/cycles/blender', '../blenfont', '../blenkernel', diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt index 4014d370eb8..5328e62367b 100644 --- a/source/blender/windowmanager/CMakeLists.txt +++ b/source/blender/windowmanager/CMakeLists.txt @@ -80,10 +80,11 @@ set(SRC ) if(WITH_AUDASPACE) - list(APPEND INC - ../../../intern/audaspace/intern + add_definitions(${AUDASPACE_DEFINITIONS}) + + list(APPEND INC_SYS + ${AUDASPACE_C_INCLUDE_DIRS} ) - add_definitions(-DWITH_AUDASPACE) endif() add_definitions(${GL_DEFINITIONS}) diff --git a/source/blender/windowmanager/SConscript b/source/blender/windowmanager/SConscript index 47eee41cf16..e05bc130c20 100644 --- a/source/blender/windowmanager/SConscript +++ b/source/blender/windowmanager/SConscript @@ -32,7 +32,6 @@ sources = env.Glob('intern/*.c') incs = [ '.', - '#/intern/audaspace/intern', '#/intern/ghost', '#/intern/guardedalloc', '#/intern/memutil', @@ -74,6 +73,10 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'win64-mingw'): if env['WITH_BF_IME']: defs.append('WITH_INPUT_IME') +if env['WITH_BF_AUDASPACE']: + defs += env['BF_AUDASPACE_DEF'] + incs += ' ' + env['BF_AUDASPACE_C_INC'] + if env['WITH_BF_INTERNATIONAL']: defs.append('WITH_INTERNATIONAL') diff --git a/source/blender/windowmanager/intern/wm_playanim.c b/source/blender/windowmanager/intern/wm_playanim.c index 3173e0180fa..e63b4661870 100644 --- a/source/blender/windowmanager/intern/wm_playanim.c +++ b/source/blender/windowmanager/intern/wm_playanim.c @@ -72,7 +72,10 @@ #include "WM_api.h" /* only for WM_main_playanim */ #ifdef WITH_AUDASPACE -#include "AUD_C-API.h" +# include AUD_DEVICE_H +# include AUD_HANDLE_H +# include AUD_SOUND_H +# include AUD_SPECIAL_H AUD_Sound *source = NULL; AUD_Handle *playback_handle = NULL; @@ -1107,8 +1110,8 @@ static char *wm_main_playanim_intern(int argc, const char **argv) AUD_initOnce(); - if (!(audio_device = AUD_init("OpenAL", specs, AUD_DEFAULT_BUFFER_SIZE, "Blender"))) - audio_device = AUD_init("Null", specs, AUD_DEFAULT_BUFFER_SIZE, "Blender"); + if (!(audio_device = AUD_init("OpenAL", specs, 1024, "Blender"))) + audio_device = AUD_init("Null", specs, 0, "Blender"); #endif |