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/windowmanager/intern/wm_playanim.c | |
| 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/windowmanager/intern/wm_playanim.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_playanim.c | 9 |
1 files changed, 6 insertions, 3 deletions
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 |