From d6a6499a7ad3c1d49c905753136f75c042a70658 Mon Sep 17 00:00:00 2001 From: rdb Date: Sun, 25 Aug 2013 07:32:52 +0000 Subject: [PATCH] fix errors --- panda/src/audio/config_audio.cxx | 3 ++- panda/src/audio/config_audio.h | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/panda/src/audio/config_audio.cxx b/panda/src/audio/config_audio.cxx index b97ce9e1ef..6f798fe182 100644 --- a/panda/src/audio/config_audio.cxx +++ b/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; } diff --git a/panda/src/audio/config_audio.h b/panda/src/audio/config_audio.h index 68ab186125..4e63b840c1 100644 --- a/panda/src/audio/config_audio.h +++ b/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;