audio: fix case of get_speaker_setup/set_speaker_setup methods

rdb · rdb · commit a866f9fbcbf8 · 2017-07-09T15:47:09.000+02:00
diff --git a/panda/src/audio/audioManager.cxx b/panda/src/audio/audioManager.cxx
@@ -170,7 +170,7 @@ get_null_sound() {
  *
  */
 int AudioManager::
-getSpeakerSetup() {
+get_speaker_setup() {
   // intentionally blank
   return 0;
 }
@@ -179,7 +179,7 @@ getSpeakerSetup() {
  *
  */
 void AudioManager::
-setSpeakerSetup(SpeakerModeCategory cat) {
+set_speaker_setup(SpeakerModeCategory cat) {
   // intentionally blank
 }
 
diff --git a/panda/src/audio/audioManager.h b/panda/src/audio/audioManager.h
@@ -62,8 +62,8 @@ class EXPCL_PANDA_AUDIO AudioManager : public TypedReferenceCount {
     SM_stream,
   };
 
-  virtual int getSpeakerSetup();
-  virtual void setSpeakerSetup(SpeakerModeCategory cat);
+  virtual int get_speaker_setup();
+  virtual void set_speaker_setup(SpeakerModeCategory cat);
   virtual bool configure_filters(FilterProperties *config);
 
   // Create an AudioManager for each category of sounds you have.  E.g.
diff --git a/panda/src/audiotraits/fmodAudioManager.cxx b/panda/src/audiotraits/fmodAudioManager.cxx
@@ -447,7 +447,7 @@ get_sound(MovieAudio *source, bool positional, int) {
  * This is to query if you are using a MultiChannel Setup.
  */
 int FmodAudioManager::
-getSpeakerSetup() {
+get_speaker_setup() {
   ReMutexHolder holder(_lock);
   FMOD_RESULT result;
   FMOD_SPEAKERMODE speakerMode;
@@ -502,7 +502,7 @@ getSpeakerSetup() {
  * init or re-init the AudioManagers after Panda is running.
  */
 void FmodAudioManager::
-setSpeakerSetup(AudioManager::SpeakerModeCategory cat) {
+set_speaker_setup(AudioManager::SpeakerModeCategory cat) {
   ReMutexHolder holder(_lock);
   FMOD_RESULT result;
   FMOD_SPEAKERMODE speakerModeType = (FMOD_SPEAKERMODE)cat;
diff --git a/panda/src/audiotraits/fmodAudioManager.h b/panda/src/audiotraits/fmodAudioManager.h
@@ -91,8 +91,8 @@ class EXPCL_FMOD_AUDIO FmodAudioManager : public AudioManager {
   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 int getSpeakerSetup();
-  virtual void setSpeakerSetup(SpeakerModeCategory cat);
+  virtual int get_speaker_setup();
+  virtual void set_speaker_setup(SpeakerModeCategory cat);
 
   virtual void set_volume(PN_stdfloat);
   virtual PN_stdfloat get_volume() const;

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ get_null_sound() {`
`170`	`170`	`*`
`171`	`171`	`*/`
`172`	`172`	`int AudioManager::`
`173`		`-getSpeakerSetup() {`
	`173`	`+get_speaker_setup() {`
`174`	`174`	`// intentionally blank`
`175`	`175`	`return 0;`
`176`	`176`	`}`
`@@ -179,7 +179,7 @@ getSpeakerSetup() {`
`179`	`179`	`*`
`180`	`180`	`*/`
`181`	`181`	`void AudioManager::`
`182`		`-setSpeakerSetup(SpeakerModeCategory cat) {`
	`182`	`+set_speaker_setup(SpeakerModeCategory cat) {`
`183`	`183`	`// intentionally blank`
`184`	`184`	`}`
`185`	`185`