TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 09:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

libfmod_audio -> libp3fmod_audio, libopenal_audio -> libp3openal_audio

Browse Source
This commit is contained in:
David Rose 2009-10-11 22:22:59 +00:00
parent c469dda2c7
commit 787bfc5f94
4 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
panda/src/audio/audioManager.cxx
View File

@ -60,7 +60,7 @@ PT(AudioManager) AudioManager::create_AudioManager() {
audio_debug(" dl_name=\""<<dl_name<<"\""); audio_debug(" dl_name=\""<<dl_name<<"\"");
void *handle = load_dso(get_plugin_path().get_value(), dl_name); void *handle = load_dso(get_plugin_path().get_value(), dl_name);
if (handle == (void *)NULL) { if (handle == (void *)NULL) {
audio_error(" LoadLibrary() failed, will use NullAudioManager"); audio_error(" load_dso(" << dl_name << ") failed, will use NullAudioManager");
audio_error(" "<<load_dso_error()); audio_error(" "<<load_dso_error());
nassertr(_create_AudioManager == create_NullAudioManager, NULL); nassertr(_create_AudioManager == create_NullAudioManager, NULL);
} else { } else {

14
panda/src/audio/config_audio.cxx
View File

@ -32,19 +32,7 @@ ConfigVariableInt audio_cache_limit
PRC_DESC("The number of sounds in the cache.")); PRC_DESC("The number of sounds in the cache."));
ConfigVariableString audio_library_name ConfigVariableString audio_library_name
("audio-library-name", ("audio-library-name", "null");
#if defined(HAVE_RAD_MSS)
"miles_audio"
#elif defined(HAVE_FMODEX)
"fmodex_audio"
#elif defined(HAVE_FMOD)
"fmod_audio"
#elif defined(HAVE_OPENAL)
"openal_audio"
#else
""
#endif
);
ConfigVariableDouble audio_volume ConfigVariableDouble audio_volume
("audio-volume", 1.0f); ("audio-volume", 1.0f);

8
panda/src/audiotraits/Sources.pp
View File

@ -30,14 +30,14 @@
#end lib_target #end lib_target
#begin lib_target #begin lib_target
#define TARGET fmod_audio #define TARGET p3fmod_audio
#define BUILD_TARGET $[HAVE_FMODEX] #define BUILD_TARGET $[HAVE_FMODEX]
#define USE_PACKAGES fmodex #define USE_PACKAGES fmodex
#define BUILDING_DLL BUILDING_FMOD_AUDIO #define BUILDING_DLL BUILDING_FMOD_AUDIO
#define LOCAL_LIBS audio event #define LOCAL_LIBS audio event
#define WIN_SYS_LIBS $[WIN_SYS_LIBS] user32.lib advapi32.lib winmm.lib #define WIN_SYS_LIBS $[WIN_SYS_LIBS] user32.lib advapi32.lib winmm.lib
#define COMBINED_SOURCES $[TARGET]_composite1.cxx #define COMBINED_SOURCES fmod_audio_composite1.cxx
#define SOURCES \ #define SOURCES \
config_fmodAudio.h \ config_fmodAudio.h \
@ -50,14 +50,14 @@
#end lib_target #end lib_target
#begin lib_target #begin lib_target
#define TARGET openal_audio #define TARGET p3openal_audio
#define BUILD_TARGET $[HAVE_OPENAL] #define BUILD_TARGET $[HAVE_OPENAL]
#define USE_PACKAGES openal #define USE_PACKAGES openal
#define BUILDING_DLL BUILDING_OPENAL_AUDIO #define BUILDING_DLL BUILDING_OPENAL_AUDIO
#define LOCAL_LIBS audio event #define LOCAL_LIBS audio event
#define WIN_SYS_LIBS $[WIN_SYS_LIBS] user32.lib advapi32.lib winmm.lib #define WIN_SYS_LIBS $[WIN_SYS_LIBS] user32.lib advapi32.lib winmm.lib
#define COMBINED_SOURCES $[TARGET]_composite1.cxx #define COMBINED_SOURCES openal_audio_composite1.cxx
#define SOURCES \ #define SOURCES \
config_openalAudio.h \ config_openalAudio.h \

10
panda/src/configfiles/panda.prc.pp
View File

@ -34,6 +34,16 @@ aux-display pandadx8
aux-display tinydisplay aux-display tinydisplay
#endif #endif
# Define an appropriate default audio library.
#if $[HAVE_RAD_MSS]
audio-library-name miles_audio
#elif $[HAVE_FMODEX]
audio-library-name p3fmod_audio
#elif $[HAVE_OPENAL]
audio-library-name p3openal_audio
#endif
# The egg loader is handy to have available by default. This allows # The egg loader is handy to have available by default. This allows
# clients to load egg files. (The bam loader is built-in so bam files # clients to load egg files. (The bam loader is built-in so bam files
# are always loadable). # are always loadable).