TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 16:58:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

audio: fix case of get_speaker_setup/set_speaker_setup methods

Browse Source
This commit is contained in:
rdb 2017-07-09 15:46:37 +02:00
parent e45af355cc
commit a866f9fbcb
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -170,7 +170,7 @@ get_null_sound() {
* *
*/ */
int AudioManager:: int AudioManager::
getSpeakerSetup() { get_speaker_setup() {
// intentionally blank // intentionally blank
return 0; return 0;
} }
@ -179,7 +179,7 @@ getSpeakerSetup() {
* *
*/ */
void AudioManager:: void AudioManager::
setSpeakerSetup(SpeakerModeCategory cat) { set_speaker_setup(SpeakerModeCategory cat) {
// intentionally blank // intentionally blank
} }

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

@ -62,8 +62,8 @@ PUBLISHED:
SM_stream, SM_stream,
}; };
virtual int getSpeakerSetup(); virtual int get_speaker_setup();
virtual void setSpeakerSetup(SpeakerModeCategory cat); virtual void set_speaker_setup(SpeakerModeCategory cat);
virtual bool configure_filters(FilterProperties *config); virtual bool configure_filters(FilterProperties *config);
// Create an AudioManager for each category of sounds you have. E.g. // Create an AudioManager for each category of sounds you have. E.g.

4
panda/src/audiotraits/fmodAudioManager.cxx
View File

@ -447,7 +447,7 @@ get_sound(MovieAudio *source, bool positional, int) {
* This is to query if you are using a MultiChannel Setup. * This is to query if you are using a MultiChannel Setup.
*/ */
int FmodAudioManager:: int FmodAudioManager::
getSpeakerSetup() { get_speaker_setup() {
ReMutexHolder holder(_lock); ReMutexHolder holder(_lock);
FMOD_RESULT result; FMOD_RESULT result;
FMOD_SPEAKERMODE speakerMode; FMOD_SPEAKERMODE speakerMode;
@ -502,7 +502,7 @@ getSpeakerSetup() {
* init or re-init the AudioManagers after Panda is running. * init or re-init the AudioManagers after Panda is running.
*/ */
void FmodAudioManager:: void FmodAudioManager::
setSpeakerSetup(AudioManager::SpeakerModeCategory cat) { set_speaker_setup(AudioManager::SpeakerModeCategory cat) {
ReMutexHolder holder(_lock); ReMutexHolder holder(_lock);
FMOD_RESULT result; FMOD_RESULT result;
FMOD_SPEAKERMODE speakerModeType = (FMOD_SPEAKERMODE)cat; FMOD_SPEAKERMODE speakerModeType = (FMOD_SPEAKERMODE)cat;

4
panda/src/audiotraits/fmodAudioManager.h
View File

@ -91,8 +91,8 @@ public:
virtual PT(AudioSound) get_sound(const string&, bool positional = false, int mode=SM_heuristic); virtual PT(AudioSound) get_sound(const string&, bool positional = false, int mode=SM_heuristic);
virtual PT(AudioSound) get_sound(MovieAudio *, bool positional = false, int mode=SM_heuristic); virtual PT(AudioSound) get_sound(MovieAudio *, bool positional = false, int mode=SM_heuristic);
virtual int getSpeakerSetup(); virtual int get_speaker_setup();
virtual void setSpeakerSetup(SpeakerModeCategory cat); virtual void set_speaker_setup(SpeakerModeCategory cat);
virtual void set_volume(PN_stdfloat); virtual void set_volume(PN_stdfloat);
virtual PN_stdfloat get_volume() const; virtual PN_stdfloat get_volume() const;