forked from bartvdbraak/blender
Audaspace: use standalone library.
- Added the cmake configuration option WITH_EXTERNAL_AUDASPACE. - Fixes to build without standalone library as well.
This commit is contained in:
parent
96dd213e7e
commit
733073550f
@ -247,6 +247,7 @@ option(WITH_HEADLESS "Build without graphical support (renderfarm, server m
|
||||
mark_as_advanced(WITH_HEADLESS)
|
||||
|
||||
option(WITH_AUDASPACE "Build with blenders audio library (only disable if you know what you're doing!)" ON)
|
||||
option(WITH_EXTERNAL_AUDASPACE "Build with external audaspace library installed on the system (only enable if you know what you're doing!)" OFF)
|
||||
mark_as_advanced(WITH_AUDASPACE)
|
||||
|
||||
option(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" ON)
|
||||
@ -883,6 +884,13 @@ if(UNIX AND NOT APPLE)
|
||||
endif()
|
||||
|
||||
# Audio IO
|
||||
if(WITH_EXTERNAL_AUDASPACE)
|
||||
find_package_wrapper(Audaspace)
|
||||
if(NOT AUDASPACE_FOUND OR NOT CAUDASPACE_FOUND)
|
||||
message(FATAL_ERROR "Audaspace external library not found!")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(WITH_OPENAL)
|
||||
find_package_wrapper(OpenAL)
|
||||
if(NOT OPENAL_FOUND)
|
||||
|
76
build_files/cmake/Modules/FindAudaspace.cmake
Normal file
76
build_files/cmake/Modules/FindAudaspace.cmake
Normal file
@ -0,0 +1,76 @@
|
||||
# - Try to find audaspace
|
||||
# Once done, this will define
|
||||
#
|
||||
# AUDASPACE_FOUND - system has audaspace
|
||||
# AUDASPACE_INCLUDE_DIRS - the audaspace include directories
|
||||
# AUDASPACE_LIBRARIES - link these to use audaspace
|
||||
# CAUDASPACE_FOUND - system has audaspace's C binding
|
||||
# CAUDASPACE_INCLUDE_DIRS - the audaspace's C binding include directories
|
||||
# CAUDASPACE_LIBRARIES - link these to use audaspace's C binding
|
||||
# PYAUDASPACE_FOUND - system has audaspace's python binding
|
||||
# PYAUDASPACE_INCLUDE_DIRS - the audaspace's python binding include directories
|
||||
# PYAUDASPACE_LIBRARIES - link these to use audaspace's python binding
|
||||
|
||||
# Use pkg-config to get hints about paths
|
||||
find_package(PkgConfig)
|
||||
if(PKG_CONFIG_FOUND)
|
||||
pkg_check_modules(AUDASPACE_PKGCONF audaspace)
|
||||
endif(PKG_CONFIG_FOUND)
|
||||
|
||||
# Include dir
|
||||
find_path(AUDASPACE_INCLUDE_DIR
|
||||
NAMES audaspace/ISound.h
|
||||
PATHS ${AUDASPACE_PKGCONF_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
# Library
|
||||
find_library(AUDASPACE_LIBRARY
|
||||
NAMES audaspace
|
||||
PATHS ${AUDASPACE_PKGCONF_LIBRARY_DIRS}
|
||||
)
|
||||
|
||||
# Include dir
|
||||
find_path(CAUDASPACE_INCLUDE_DIR
|
||||
NAMES audaspace/AUD_Sound.h
|
||||
PATHS ${AUDASPACE_PKGCONF_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
# Library
|
||||
find_library(CAUDASPACE_LIBRARY
|
||||
NAMES caudaspace
|
||||
PATHS ${AUDASPACE_PKGCONF_LIBRARY_DIRS}
|
||||
)
|
||||
|
||||
# Include dir
|
||||
find_path(PYAUDASPACE_INCLUDE_DIR
|
||||
NAMES audaspace/python/PyAPI.h
|
||||
PATHS ${AUDASPACE_PKGCONF_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
# Library
|
||||
find_library(PYAUDASPACE_LIBRARY
|
||||
NAMES pyaudaspace
|
||||
PATHS ${AUDASPACE_PKGCONF_LIBRARY_DIRS}
|
||||
)
|
||||
|
||||
find_package(PackageHandleStandardArgs)
|
||||
find_package_handle_standard_args(Audaspace DEFAULT_MSG AUDASPACE_LIBRARY AUDASPACE_INCLUDE_DIR)
|
||||
find_package_handle_standard_args(CAudaspace DEFAULT_MSG CAUDASPACE_LIBRARY CAUDASPACE_INCLUDE_DIR)
|
||||
find_package_handle_standard_args(PyAudaspace DEFAULT_MSG PYAUDASPACE_LIBRARY PYAUDASPACE_INCLUDE_DIR)
|
||||
|
||||
if(AUDASPACE_FOUND)
|
||||
set(AUDASPACE_LIBRARIES ${AUDASPACE_LIBRARY})
|
||||
set(AUDASPACE_INCLUDE_DIRS ${AUDASPACE_INCLUDE_DIR})
|
||||
endif(AUDASPACE_FOUND)
|
||||
|
||||
if(CAUDASPACE_FOUND)
|
||||
set(CAUDASPACE_LIBRARIES ${CAUDASPACE_LIBRARY})
|
||||
set(CAUDASPACE_INCLUDE_DIRS ${CAUDASPACE_INCLUDE_DIR})
|
||||
endif(CAUDASPACE_FOUND)
|
||||
|
||||
if(PYAUDASPACE_FOUND)
|
||||
set(PYAUDASPACE_LIBRARIES ${PYAUDASPACE_LIBRARY})
|
||||
set(PYAUDASPACE_INCLUDE_DIRS ${PYAUDASPACE_INCLUDE_DIR})
|
||||
endif(PYAUDASPACE_FOUND)
|
||||
|
||||
mark_as_advanced(AUDASPACE_LIBRARY AUDASPACE_LIBRARIES AUDASPACE_INCLUDE_DIR AUDASPACE_INCLUDE_DIRS CAUDASPACE_LIBRARY CAUDASPACE_LIBRARIES CAUDASPACE_INCLUDE_DIR CAUDASPACE_INCLUDE_DIRS PYAUDASPACE_LIBRARY PYAUDASPACE_LIBRARIES PYAUDASPACE_INCLUDE_DIR PYAUDASPACE_INCLUDE_DIRS)
|
@ -343,6 +343,9 @@ function(setup_liblinks
|
||||
if(WITH_BULLET AND WITH_SYSTEM_BULLET)
|
||||
target_link_libraries(${target} ${BULLET_LIBRARIES})
|
||||
endif()
|
||||
if(WITH_EXTERNAL_AUDASPACE)
|
||||
target_link_libraries(${target} ${CAUDASPACE_LIBRARIES} ${PYAUDASPACE_LIBRARIES})
|
||||
endif()
|
||||
if(WITH_OPENAL)
|
||||
target_link_libraries(${target} ${OPENAL_LIBRARY})
|
||||
endif()
|
||||
|
@ -21,6 +21,35 @@
|
||||
|
||||
remove_extra_strict_flags()
|
||||
|
||||
if(WITH_EXTERNAL_AUDASPACE)
|
||||
|
||||
set(INC
|
||||
.
|
||||
)
|
||||
|
||||
set(INC_SYS
|
||||
${CAUDASPACE_INCLUDE_DIRS}
|
||||
${PYAUDASPACE_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
set(SRC
|
||||
intern/AUD_Set.cpp
|
||||
intern/AUD_Set.h
|
||||
)
|
||||
|
||||
if(WITH_PYTHON)
|
||||
list(APPEND INC_SYS
|
||||
${PYTHON_INCLUDE_DIRS}
|
||||
)
|
||||
list(APPEND SRC
|
||||
intern/AUD_PyInit.cpp
|
||||
intern/AUD_PyInit.h
|
||||
)
|
||||
add_definitions(-DWITH_PYTHON)
|
||||
endif()
|
||||
|
||||
else()
|
||||
|
||||
set(INC
|
||||
.
|
||||
FX
|
||||
@ -316,5 +345,6 @@ if(WITH_PYTHON)
|
||||
)
|
||||
add_definitions(-DWITH_PYTHON)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
blender_add_lib(bf_intern_audaspace "${SRC}" "${INC}" "${INC_SYS}")
|
||||
|
78
intern/audaspace/intern/AUD_PyInit.cpp
Normal file
78
intern/audaspace/intern/AUD_PyInit.cpp
Normal file
@ -0,0 +1,78 @@
|
||||
/*
|
||||
* ***** BEGIN GPL LICENSE BLOCK *****
|
||||
*
|
||||
* Copyright 2009-2011 Jörg Hermann Müller
|
||||
*
|
||||
* This file is part of AudaSpace.
|
||||
*
|
||||
* Audaspace is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* AudaSpace is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with Audaspace; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*
|
||||
* ***** END GPL LICENSE BLOCK *****
|
||||
*/
|
||||
|
||||
/** \file audaspace/intern/AUD_PyInit.cpp
|
||||
* \ingroup audaspaceintern
|
||||
*/
|
||||
|
||||
#include "AUD_PyInit.h"
|
||||
|
||||
#include <audaspace/AUD_Sound.h>
|
||||
#include <audaspace/python/PySound.h>
|
||||
#include <audaspace/python/PyAPI.h>
|
||||
|
||||
extern "C" {
|
||||
extern void *sound_get_factory(void *sound);
|
||||
}
|
||||
|
||||
static PyObject *AUD_getSoundFromPointer(PyObject *self, PyObject *args)
|
||||
{
|
||||
long int lptr;
|
||||
|
||||
if (PyArg_Parse(args, "l:_sound_from_pointer", &lptr)) {
|
||||
if (lptr) {
|
||||
AUD_Sound* sound = sound_get_factory((void *) lptr);
|
||||
|
||||
if (sound) {
|
||||
Sound *obj = (Sound *)Sound_empty();
|
||||
if (obj) {
|
||||
obj->sound = AUD_copy(sound);
|
||||
return (PyObject *) obj;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
|
||||
static PyMethodDef meth_sound_from_pointer[] = {
|
||||
{"_sound_from_pointer", (PyCFunction)AUD_getSoundFromPointer, METH_O,
|
||||
"_sound_from_pointer(pointer)\n\n"
|
||||
"Returns the corresponding :class:`Factory` object.\n\n"
|
||||
":arg pointer: The pointer to the bSound object as long.\n"
|
||||
":type pointer: long\n"
|
||||
":return: The corresponding :class:`Factory` object.\n"
|
||||
":rtype: :class:`Factory`"}
|
||||
};
|
||||
|
||||
PyObject *AUD_initPython(void)
|
||||
{
|
||||
PyObject *module = PyInit_aud();
|
||||
PyModule_AddObject(module, "_sound_from_pointer", (PyObject *)PyCFunction_New(meth_sound_from_pointer, NULL));
|
||||
PyDict_SetItemString(PyImport_GetModuleDict(), "aud", module);
|
||||
|
||||
return module;
|
||||
}
|
||||
|
69
intern/audaspace/intern/AUD_Set.cpp
Normal file
69
intern/audaspace/intern/AUD_Set.cpp
Normal file
@ -0,0 +1,69 @@
|
||||
/*
|
||||
* ***** BEGIN GPL LICENSE BLOCK *****
|
||||
*
|
||||
* Copyright 2009-2011 Jörg Hermann Müller
|
||||
*
|
||||
* This file is part of AudaSpace.
|
||||
*
|
||||
* Audaspace is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* AudaSpace is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with Audaspace; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*
|
||||
* ***** END GPL LICENSE BLOCK *****
|
||||
*/
|
||||
|
||||
/** \file audaspace/intern/AUD_Set.cpp
|
||||
* \ingroup audaspaceintern
|
||||
*/
|
||||
|
||||
#include <set>
|
||||
|
||||
#include "AUD_Set.h"
|
||||
|
||||
void *AUD_createSet()
|
||||
{
|
||||
return new std::set<void *>();
|
||||
}
|
||||
|
||||
void AUD_destroySet(void *set)
|
||||
{
|
||||
delete reinterpret_cast<std::set<void *>*>(set);
|
||||
}
|
||||
|
||||
char AUD_removeSet(void *set, void *entry)
|
||||
{
|
||||
if (set)
|
||||
return reinterpret_cast<std::set<void *>*>(set)->erase(entry);
|
||||
return 0;
|
||||
}
|
||||
|
||||
void AUD_addSet(void *set, void *entry)
|
||||
{
|
||||
if (entry)
|
||||
reinterpret_cast<std::set<void *>*>(set)->insert(entry);
|
||||
}
|
||||
|
||||
void *AUD_getSet(void *set)
|
||||
{
|
||||
if (set) {
|
||||
std::set<void *>* rset = reinterpret_cast<std::set<void *>*>(set);
|
||||
if (!rset->empty()) {
|
||||
std::set<void *>::iterator it = rset->begin();
|
||||
void *result = *it;
|
||||
rset->erase(it);
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
return (void*) 0;
|
||||
}
|
74
intern/audaspace/intern/AUD_Set.h
Normal file
74
intern/audaspace/intern/AUD_Set.h
Normal file
@ -0,0 +1,74 @@
|
||||
/*
|
||||
* ***** BEGIN GPL LICENSE BLOCK *****
|
||||
*
|
||||
* Copyright 2009-2011 Jörg Hermann Müller
|
||||
*
|
||||
* This file is part of AudaSpace.
|
||||
*
|
||||
* Audaspace is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* AudaSpace is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with Audaspace; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*
|
||||
* ***** END GPL LICENSE BLOCK *****
|
||||
*/
|
||||
|
||||
/** \file AUD_Set.h
|
||||
* \ingroup audaspace
|
||||
*/
|
||||
|
||||
#ifndef __AUD_SET_H__
|
||||
#define __AUD_SET_H__
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Creates a new set.
|
||||
* \return The new set.
|
||||
*/
|
||||
extern void *AUD_createSet(void);
|
||||
|
||||
/**
|
||||
* Deletes a set.
|
||||
* \param set The set to delete.
|
||||
*/
|
||||
extern void AUD_destroySet(void *set);
|
||||
|
||||
/**
|
||||
* Removes an entry from a set.
|
||||
* \param set The set work on.
|
||||
* \param entry The entry to remove.
|
||||
* \return Whether the entry was in the set or not.
|
||||
*/
|
||||
extern char AUD_removeSet(void *set, void *entry);
|
||||
|
||||
/**
|
||||
* Adds a new entry to a set.
|
||||
* \param set The set work on.
|
||||
* \param entry The entry to add.
|
||||
*/
|
||||
extern void AUD_addSet(void *set, void *entry);
|
||||
|
||||
/**
|
||||
* Removes one entry from a set and returns it.
|
||||
* \param set The set work on.
|
||||
* \return The entry or NULL if the set is empty.
|
||||
*/
|
||||
extern void *AUD_getSet(void *set);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif //__AUD_SET_H__
|
@ -35,6 +35,12 @@
|
||||
|
||||
#define SOUND_WAVE_SAMPLES_PER_SECOND 250
|
||||
|
||||
#ifdef WITH_AUDASPACE
|
||||
# ifdef WITH_EXTERNAL_AUDASPACE
|
||||
# include <audaspace/AUD_Device.h>
|
||||
# endif
|
||||
#endif
|
||||
|
||||
struct bSound;
|
||||
struct Main;
|
||||
struct Sequence;
|
||||
@ -75,7 +81,7 @@ void BKE_sound_load(struct Main *main, struct bSound *sound);
|
||||
|
||||
void BKE_sound_free(struct bSound *sound);
|
||||
|
||||
#ifdef __AUD_C_API_H__
|
||||
#if defined(__AUD_C_API_H__) || defined(WITH_EXTERNAL_AUDASPACE)
|
||||
AUD_Device *BKE_sound_mixdown(struct Scene *scene, AUD_DeviceSpecs specs, int start, float volume);
|
||||
#endif
|
||||
|
||||
|
@ -315,6 +315,13 @@ if(WITH_AUDASPACE)
|
||||
../../../intern/audaspace/intern
|
||||
)
|
||||
add_definitions(-DWITH_AUDASPACE)
|
||||
|
||||
if(WITH_EXTERNAL_AUDASPACE)
|
||||
add_definitions(-DWITH_EXTERNAL_AUDASPACE)
|
||||
list(APPEND INC_SYS
|
||||
${CAUDASPACE_INCLUDE_DIRS}
|
||||
)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(WITH_BULLET)
|
||||
|
@ -309,8 +309,6 @@ static void setup_app_data(bContext *C, BlendFileData *bfd, const char *filepath
|
||||
|
||||
CTX_data_main_set(C, G.main);
|
||||
|
||||
BKE_sound_init_main(G.main);
|
||||
|
||||
if (bfd->user) {
|
||||
|
||||
/* only here free userdef themes... */
|
||||
|
@ -59,7 +59,11 @@
|
||||
#include "BKE_library.h"
|
||||
|
||||
#ifdef WITH_AUDASPACE
|
||||
# include "AUD_C-API.h"
|
||||
# ifdef WITH_EXTERNAL_AUDASPACE
|
||||
# include <audaspace/AUD_Special.h>
|
||||
# else
|
||||
# include "AUD_C-API.h"
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#include "RNA_access.h"
|
||||
|
@ -88,7 +88,11 @@
|
||||
#include "BKE_sound.h"
|
||||
|
||||
#ifdef WITH_AUDASPACE
|
||||
# include "AUD_C-API.h"
|
||||
# ifdef WITH_EXTERNAL_AUDASPACE
|
||||
# include <audaspace/AUD_Special.h>
|
||||
# else
|
||||
# include "AUD_C-API.h"
|
||||
# endif
|
||||
#endif
|
||||
|
||||
static ImBuf *seq_render_strip_stack(const SeqRenderData *context, ListBase *seqbasep, float cfra, int chanshown);
|
||||
|
@ -48,7 +48,15 @@
|
||||
#include "DNA_speaker_types.h"
|
||||
|
||||
#ifdef WITH_AUDASPACE
|
||||
# include "AUD_C-API.h"
|
||||
# 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"
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#include "BKE_global.h"
|
||||
@ -150,13 +158,13 @@ static void sound_sync_callback(void *data, int mode, float time)
|
||||
int BKE_sound_define_from_str(const char *str)
|
||||
{
|
||||
if (BLI_strcaseeq(str, "NULL"))
|
||||
return AUD_NULL_DEVICE;
|
||||
return 0;
|
||||
if (BLI_strcaseeq(str, "SDL"))
|
||||
return AUD_SDL_DEVICE;
|
||||
return 1;
|
||||
if (BLI_strcaseeq(str, "OPENAL"))
|
||||
return AUD_OPENAL_DEVICE;
|
||||
return 2;
|
||||
if (BLI_strcaseeq(str, "JACK"))
|
||||
return AUD_JACK_DEVICE;
|
||||
return 3;
|
||||
|
||||
return -1;
|
||||
}
|
||||
@ -189,13 +197,13 @@ void BKE_sound_init(struct Main *bmain)
|
||||
|
||||
switch(device)
|
||||
{
|
||||
case AUD_SDL_DEVICE:
|
||||
case 1:
|
||||
device_name = "SDL";
|
||||
break;
|
||||
case AUD_OPENAL_DEVICE:
|
||||
case 2:
|
||||
device_name = "OpenAL";
|
||||
break;
|
||||
case AUD_JACK_DEVICE:
|
||||
case 3:
|
||||
device_name = "Jack";
|
||||
break;
|
||||
default:
|
||||
@ -204,7 +212,7 @@ void BKE_sound_init(struct Main *bmain)
|
||||
}
|
||||
|
||||
if (buffersize < 128)
|
||||
buffersize = AUD_DEFAULT_BUFFER_SIZE;
|
||||
buffersize = 1024;
|
||||
|
||||
if (specs.rate < AUD_RATE_8000)
|
||||
specs.rate = AUD_RATE_44100;
|
||||
@ -821,7 +829,11 @@ float BKE_sound_get_length(bSound *sound)
|
||||
|
||||
bool BKE_sound_is_jack_supported(void)
|
||||
{
|
||||
#ifdef WITH_EXTERNAL_AUDASPACE
|
||||
return 1;
|
||||
#else
|
||||
return (bool)AUD_isJackSupported();
|
||||
#endif
|
||||
}
|
||||
|
||||
#else /* WITH_AUDASPACE */
|
||||
|
@ -45,7 +45,12 @@
|
||||
#include "BLI_blenlib.h"
|
||||
|
||||
#ifdef WITH_AUDASPACE
|
||||
# include "AUD_C-API.h"
|
||||
# ifdef WITH_EXTERNAL_AUDASPACE
|
||||
# include <audaspace/AUD_Device.h>
|
||||
# include <audaspace/AUD_Special.h>
|
||||
# else
|
||||
# include "AUD_C-API.h"
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#include "BLI_utildefines.h"
|
||||
|
@ -39,10 +39,14 @@ set(SRC
|
||||
)
|
||||
|
||||
if(WITH_AUDASPACE)
|
||||
list(APPEND INC
|
||||
../../../../intern/audaspace/intern
|
||||
)
|
||||
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()
|
||||
endif()
|
||||
|
||||
if(WITH_CODEC_FFMPEG)
|
||||
|
@ -67,7 +67,11 @@
|
||||
#include "WM_types.h"
|
||||
|
||||
#ifdef WITH_AUDASPACE
|
||||
# include "AUD_C-API.h"
|
||||
# ifdef WITH_EXTERNAL_AUDASPACE
|
||||
# include <audaspace/AUD_Special.h>
|
||||
# else
|
||||
# include "AUD_C-API.h"
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#include "ED_sound.h"
|
||||
|
@ -48,10 +48,14 @@ set(SRC
|
||||
)
|
||||
|
||||
if(WITH_AUDASPACE)
|
||||
list(APPEND INC
|
||||
../../../../intern/audaspace/intern
|
||||
)
|
||||
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()
|
||||
endif()
|
||||
|
||||
if(WITH_INTERNATIONAL)
|
||||
|
@ -36,7 +36,11 @@
|
||||
#include <float.h>
|
||||
|
||||
#ifdef WITH_AUDASPACE
|
||||
# include "AUD_C-API.h"
|
||||
# ifdef WITH_EXTERNAL_AUDASPACE
|
||||
# include <audaspace/AUD_Special.h>
|
||||
# else
|
||||
# include "AUD_C-API.h"
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#include "MEM_guardedalloc.h"
|
||||
|
@ -53,10 +53,14 @@ set(SRC
|
||||
)
|
||||
|
||||
if(WITH_AUDASPACE)
|
||||
list(APPEND INC
|
||||
../../../../intern/audaspace/intern
|
||||
)
|
||||
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()
|
||||
endif()
|
||||
|
||||
if(WITH_INTERNATIONAL)
|
||||
|
@ -66,7 +66,11 @@
|
||||
#include "BKE_sound.h"
|
||||
|
||||
#ifdef WITH_AUDASPACE
|
||||
# include "AUD_C-API.h"
|
||||
# ifdef WITH_EXTERNAL_AUDASPACE
|
||||
# include <audaspace/AUD_Sequence.h>
|
||||
# else
|
||||
# include "AUD_C-API.h"
|
||||
# endif
|
||||
#endif
|
||||
|
||||
/* own include */
|
||||
|
@ -225,6 +225,13 @@ endif()
|
||||
|
||||
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()
|
||||
endif()
|
||||
|
||||
if(WITH_CODEC_QUICKTIME)
|
||||
|
@ -59,7 +59,11 @@
|
||||
#ifdef WITH_QUICKTIME
|
||||
# include "quicktime_export.h"
|
||||
# ifdef WITH_AUDASPACE
|
||||
# include "AUD_Space.h"
|
||||
# ifdef WITH_EXTERNAL_AUDASPACE
|
||||
# include <audaspace/AUD_Types.h>
|
||||
# else
|
||||
# include "AUD_Space.h"
|
||||
# endif
|
||||
# endif
|
||||
#endif
|
||||
|
||||
|
@ -101,7 +101,11 @@ typedef void * wmUIHandlerRemoveFunc;
|
||||
}
|
||||
|
||||
#ifdef WITH_AUDASPACE
|
||||
# include "AUD_C-API.h"
|
||||
# ifdef WITH_EXTERNAL_AUDASPACE
|
||||
# include <audaspace/AUD_Device.h>
|
||||
# else
|
||||
# include "AUD_C-API.h"
|
||||
# endif
|
||||
#endif
|
||||
|
||||
static BlendFileData *load_game_data(char *filename)
|
||||
|
@ -56,10 +56,14 @@ set(SRC
|
||||
add_definitions(${GL_DEFINITIONS})
|
||||
|
||||
if(WITH_AUDASPACE)
|
||||
list(APPEND INC
|
||||
../../../intern/audaspace/intern
|
||||
)
|
||||
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()
|
||||
endif()
|
||||
|
||||
if(WITH_CODEC_FFMPEG)
|
||||
|
@ -113,10 +113,14 @@ if(WITH_BULLET)
|
||||
endif()
|
||||
|
||||
if(WITH_AUDASPACE)
|
||||
list(APPEND INC
|
||||
../../../intern/audaspace/intern
|
||||
)
|
||||
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()
|
||||
endif()
|
||||
|
||||
blender_add_lib(ge_converter "${SRC}" "${INC}" "${INC_SYS}")
|
||||
|
@ -42,7 +42,11 @@
|
||||
#include "KX_ConvertActuators.h"
|
||||
|
||||
#ifdef WITH_AUDASPACE
|
||||
# include "AUD_C-API.h"
|
||||
# ifdef WITH_EXTERNAL_AUDASPACE
|
||||
# include <audaspace/AUD_Sound.h>
|
||||
# else
|
||||
# include "AUD_C-API.h"
|
||||
# endif
|
||||
#endif
|
||||
|
||||
// Actuators
|
||||
|
@ -85,10 +85,14 @@ if(WITH_INTERNATIONAL)
|
||||
endif()
|
||||
|
||||
if(WITH_AUDASPACE)
|
||||
list(APPEND INC
|
||||
../../../../intern/audaspace/intern
|
||||
)
|
||||
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()
|
||||
endif()
|
||||
|
||||
if(WITH_SDL AND WITH_SDL_DYNLOAD)
|
||||
|
@ -100,7 +100,11 @@ extern "C"
|
||||
#include "GHOST_Rect.h"
|
||||
|
||||
#ifdef WITH_AUDASPACE
|
||||
# include "AUD_C-API.h"
|
||||
# ifdef WITH_EXTERNAL_AUDASPACE
|
||||
# include <audaspace/AUD_Device.h>
|
||||
# else
|
||||
# include "AUD_C-API.h"
|
||||
# endif
|
||||
#endif
|
||||
|
||||
static void frameTimerProc(GHOST_ITimerTask* task, GHOST_TUns64 time);
|
||||
|
@ -248,11 +248,17 @@ if(WITH_CODEC_FFMPEG)
|
||||
endif()
|
||||
|
||||
if(WITH_AUDASPACE)
|
||||
list(APPEND INC
|
||||
../../../intern/audaspace/intern
|
||||
../../../intern/audaspace/FX
|
||||
)
|
||||
list(APPEND INC ../../../intern/audaspace/intern)
|
||||
|
||||
add_definitions(-DWITH_AUDASPACE)
|
||||
|
||||
if(WITH_EXTERNAL_AUDASPACE)
|
||||
add_definitions(-DWITH_EXTERNAL_AUDASPACE)
|
||||
list(APPEND INC_SYS
|
||||
${CAUDASPACE_INCLUDE_DIRS}
|
||||
${PYAUDASPACE_INCLUDE_DIRS}
|
||||
)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(WITH_BULLET)
|
||||
|
@ -62,10 +62,6 @@
|
||||
#include "KX_PyConstraintBinding.h"
|
||||
#include "PHY_IPhysicsEnvironment.h"
|
||||
|
||||
#ifdef WITH_AUDASPACE
|
||||
# include "AUD_C-API.h"
|
||||
#endif
|
||||
|
||||
#include "NG_NetworkScene.h"
|
||||
#include "NG_NetworkDeviceInterface.h"
|
||||
|
||||
|
@ -37,7 +37,14 @@
|
||||
#include "KX_SoundActuator.h"
|
||||
|
||||
#ifdef WITH_AUDASPACE
|
||||
# include "AUD_C-API.h"
|
||||
# ifdef WITH_EXTERNAL_AUDASPACE
|
||||
typedef float sample_t;
|
||||
# include <audaspace/AUD_Sound.h>
|
||||
# include <audaspace/AUD_Special.h>
|
||||
# include <audaspace/AUD_Device.h>
|
||||
# include <audaspace/AUD_Handle.h>
|
||||
# include <audaspace/python/PyAPI.h>
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#include "KX_GameObject.h"
|
||||
@ -554,7 +561,7 @@ int KX_SoundActuator::pyattr_set_sound(void *self, const struct KX_PYATTRIBUTE_D
|
||||
if (!PyArg_Parse(value, "O", &sound))
|
||||
return PY_SET_ATTR_FAIL;
|
||||
|
||||
AUD_Sound *snd = AUD_getSoundFromPython((void *)sound);
|
||||
AUD_Sound *snd = AUD_getSoundFromPython(sound);
|
||||
|
||||
if (snd)
|
||||
{
|
||||
|
@ -35,7 +35,12 @@
|
||||
#include "SCA_IActuator.h"
|
||||
|
||||
#ifdef WITH_AUDASPACE
|
||||
# include "AUD_C-API.h"
|
||||
# ifdef WITH_EXTERNAL_AUDASPACE
|
||||
# include <audaspace/AUD_Sound.h>
|
||||
# include <audaspace/AUD_Handle.h>
|
||||
# else
|
||||
# include "AUD_C-API.h"
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#include "BKE_sound.h"
|
||||
|
Loading…
Reference in New Issue
Block a user