Browse Source

fix errors

rdb 12 years ago
parent
commit
d6a6499a7a
2 changed files with 4 additions and 3 deletions
  1. 2 1
      panda/src/audio/config_audio.cxx
  2. 2 2
      panda/src/audio/config_audio.h

+ 2 - 1
panda/src/audio/config_audio.cxx

@@ -20,6 +20,7 @@
 #include "audioSound.h"
 #include "nullAudioManager.h"
 #include "nullAudioSound.h"
+#include "string_utils.h"
 
 Configure(config_audio);
 NotifyCategoryDef(audio, "");
@@ -185,7 +186,7 @@ operator >> (istream &in, FmodSpeakerMode &sm) {
     sm = FSM_prologic;
 
   } else {
-    gobj_cat->error() << "Invalid FmodSpeakerMode value: " << word << "\n";
+    audio_cat->error() << "Invalid FmodSpeakerMode value: " << word << "\n";
     sm = FSM_unspecified;
   }
 

+ 2 - 2
panda/src/audio/config_audio.h

@@ -54,8 +54,8 @@ enum FmodSpeakerMode {
   FSM_unspecified
 };
 
-EXPCL_FMOD_AUDIO ostream &operator << (ostream &out, FmodSpeakerMode sm);
-EXPCL_FMOD_AUDIO istream &operator >> (istream &in, FmodSpeakerMode &sm);
+EXPCL_PANDA_AUDIO ostream &operator << (ostream &out, FmodSpeakerMode sm);
+EXPCL_PANDA_AUDIO istream &operator >> (istream &in, FmodSpeakerMode &sm);
 
 extern EXPCL_PANDA_AUDIO ConfigVariableInt fmod_number_of_sound_channels;
 extern EXPCL_PANDA_AUDIO ConfigVariableBool fmod_use_surround_sound;