From 787bfc5f94776c4e52ca839aa2e0f22447916ea8 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Sun, 11 Oct 2009 22:22:59 +0000
Subject: [PATCH] libfmod_audio -> libp3fmod_audio, libopenal_audio ->
 libp3openal_audio

---
 panda/src/audio/audioManager.cxx   |  2 +-
 panda/src/audio/config_audio.cxx   | 14 +-------------
 panda/src/audiotraits/Sources.pp   |  8 ++++----
 panda/src/configfiles/panda.prc.pp | 10 ++++++++++
 4 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/panda/src/audio/audioManager.cxx b/panda/src/audio/audioManager.cxx
index 89185afc1e..27fbefcffa 100644
--- a/panda/src/audio/audioManager.cxx
+++ b/panda/src/audio/audioManager.cxx
@@ -60,7 +60,7 @@ PT(AudioManager) AudioManager::create_AudioManager() {
       audio_debug("  dl_name=\""<<dl_name<<"\"");
       void *handle = load_dso(get_plugin_path().get_value(), dl_name);
       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());
         nassertr(_create_AudioManager == create_NullAudioManager, NULL);
       } else {
diff --git a/panda/src/audio/config_audio.cxx b/panda/src/audio/config_audio.cxx
index c64ed17b3d..61c34cada7 100644
--- a/panda/src/audio/config_audio.cxx
+++ b/panda/src/audio/config_audio.cxx
@@ -32,19 +32,7 @@ ConfigVariableInt audio_cache_limit
  PRC_DESC("The number of sounds in the cache."));
 
 ConfigVariableString audio_library_name
-("audio-library-name", 
-#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
- );
+("audio-library-name", "null");
 
 ConfigVariableDouble audio_volume 
 ("audio-volume", 1.0f);
diff --git a/panda/src/audiotraits/Sources.pp b/panda/src/audiotraits/Sources.pp
index 07d8f0b4d0..7ead044fe0 100644
--- a/panda/src/audiotraits/Sources.pp
+++ b/panda/src/audiotraits/Sources.pp
@@ -30,14 +30,14 @@
 #end lib_target
 
 #begin lib_target
-  #define TARGET fmod_audio
+  #define TARGET p3fmod_audio
   #define BUILD_TARGET $[HAVE_FMODEX]
   #define USE_PACKAGES fmodex
   #define BUILDING_DLL BUILDING_FMOD_AUDIO
   #define LOCAL_LIBS audio event
   #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 \
       config_fmodAudio.h \
@@ -50,14 +50,14 @@
 #end lib_target
 
 #begin lib_target
-  #define TARGET openal_audio
+  #define TARGET p3openal_audio
   #define BUILD_TARGET $[HAVE_OPENAL]
   #define USE_PACKAGES openal
   #define BUILDING_DLL BUILDING_OPENAL_AUDIO
   #define LOCAL_LIBS audio event
   #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 \
       config_openalAudio.h \
diff --git a/panda/src/configfiles/panda.prc.pp b/panda/src/configfiles/panda.prc.pp
index a2f0b26037..7afc7600c2 100644
--- a/panda/src/configfiles/panda.prc.pp
+++ b/panda/src/configfiles/panda.prc.pp
@@ -34,6 +34,16 @@ aux-display pandadx8
 aux-display tinydisplay
 #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
 # clients to load egg files.  (The bam loader is built-in so bam files
 # are always loadable).