remove fmod speaker modes that aren't supported across versions

panda/src/audio/audioManager.h

@@ -39,7 +39,6 @@ PUBLISHED:
     SPEAKERMODE_surround, 
     SPEAKERMODE_5point1, 
     SPEAKERMODE_7point1, 
-    SPEAKERMODE_prologic, 
     SPEAKERMODE_max,
     SPEAKERMODE_COUNT
   };

panda/src/audio/config_audio.cxx

@@ -90,7 +90,7 @@ ConfigVariableBool fmod_use_surround_sound
 ConfigVariableEnum<FmodSpeakerMode> fmod_speaker_mode
 ("fmod-speaker-mode", FSM_unspecified,
  PRC_DESC("Sets the speaker configuration that the FMOD sound system will use. "
-          "Options: raw, mono, stereo, quad, surround, 5.1, 7.1 and prologic. "));
+          "Options: raw, mono, stereo, quad, surround, 5.1 and 7.1. "));
 
 
 // Config variables for Miles:
@@ -150,8 +150,6 @@ operator << (ostream &out, FmodSpeakerMode sm) {
     return out << "5.1";
   case FSM_7point1:
     return out << "7.1";
-  case FSM_prologic:
-    return out << "prologic";
   case FSM_unspecified:
     return out;
   }
@@ -182,8 +180,6 @@ operator >> (istream &in, FmodSpeakerMode &sm) {
   } else if (cmp_nocase(word, "7point1") == 0 ||
              cmp_nocase(word, "7.1") == 0) {
     sm = FSM_7point1;
-  } else if (cmp_nocase(word, "prologic") == 0) {
-    sm = FSM_prologic;
 
   } else {
     audio_cat->error() << "Invalid FmodSpeakerMode value: " << word << "\n";

panda/src/audio/config_audio.h

@@ -48,7 +48,6 @@ enum FmodSpeakerMode {
   FSM_surround,
   FSM_5point1,
   FSM_7point1,
-  FSM_prologic,
 
   // For backward compatibility
   FSM_unspecified

panda/src/audiotraits/fmodAudioManager.cxx

@@ -509,17 +509,8 @@ getSpeakerSetup() {
     case  FMOD_SPEAKERMODE_7POINT1:
       returnMode = 6;
       break;
-    case  FMOD_SPEAKERMODE_SRS5_1_MATRIX:
-      returnMode = 7;
-      break;
-    case  FMOD_SPEAKERMODE_DOLBY5_1_MATRIX:
-      returnMode = 8;
-      break;
-    case  FMOD_SPEAKERMODE_MYEARS:
-      returnMode = 9;
-      break;
     case  FMOD_SPEAKERMODE_MAX:
-      returnMode = 10;
+      returnMode = 7;
       break;
     default:
       returnMode = -1;

panda/src/audiotraits/openalAudioManager.cxx

@@ -118,15 +118,15 @@ OpenALAudioManager() {
   _forward_up[5] = 0;
 
   // Initialization
-  if (_active_managers==0 || !_openal_active) {
+  if (_active_managers == 0 || !_openal_active) {
     _device = alcOpenDevice(NULL); // select the "preferred device"
     if (!_device) {
       // this is a unique kind of error
       audio_error("OpenALAudioManager: alcOpenDevice(NULL): ALC couldn't open device");
     } else {
       alcGetError(_device); // clear errors
-      _context=alcCreateContext(_device,NULL);
-      alc_audio_errcheck("alcCreateContext(_device,NULL)",_device);
+      _context = alcCreateContext(_device, NULL);
+      alc_audio_errcheck("alcCreateContext(_device, NULL)",_device);
       if (_context!=NULL) {
         _openal_active = true;
       }