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

fix errors

Browse Source
This commit is contained in:
rdb 2013-08-25 07:32:52 +00:00
parent a585faa807
commit d6a6499a7a
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

4
panda/src/audio/config_audio.h
View File

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