Renamed NumberOfAudioChannels to MaxAudioChannels

Author: garethyr

Managers/AudioMan.cpp

@@ -70,7 +70,7 @@ namespace RTE {
 		//TODO 44.1 kHz came from data, fmod defaults to 48 kHz, see if we can just use this instead??
 		m_AudioSystem->setSoftwareFormat(44100, FMOD_SPEAKERMODE_DEFAULT, 0);
 
-		soundSystemSetupResult = soundSystemSetupResult == FMOD_OK ? m_AudioSystem->init(c_NumberOfAudioChannels, FMOD_INIT_NORMAL, 0) : soundSystemSetupResult;
+		soundSystemSetupResult = soundSystemSetupResult == FMOD_OK ? m_AudioSystem->init(c_MaxAudioChannels, FMOD_INIT_NORMAL, 0) : soundSystemSetupResult;
 		soundSystemSetupResult = soundSystemSetupResult == FMOD_OK ? m_AudioSystem->getMasterChannelGroup(&m_MasterChannelGroup) : soundSystemSetupResult;
 		soundSystemSetupResult = soundSystemSetupResult == FMOD_OK ? m_AudioSystem->createChannelGroup("Music", &m_MusicChannelGroup) : soundSystemSetupResult;
 		soundSystemSetupResult = soundSystemSetupResult == FMOD_OK ? m_AudioSystem->createChannelGroup("Sounds", &m_SoundChannelGroup) : soundSystemSetupResult;

Managers/AudioMan.h

@@ -56,8 +56,8 @@ namespace RTE {
 
 		struct NetworkSoundData {
 			unsigned char State;
-			unsigned short int Channels[c_MaxPlayingSoundsPerContainer]{c_NumberOfAudioChannels + 1};
-			size_t SoundFileHashes[c_NumberOfAudioChannels]{0};
+			unsigned short int Channels[c_MaxPlayingSoundsPerContainer]{c_MaxAudioChannels + 1};
+			size_t SoundFileHashes[c_MaxAudioChannels]{0};
 			short int Distance;
 			short int Loops;
 			float Pitch;

Managers/NetworkClient.cpp

@@ -689,7 +689,7 @@ namespace RTE
 				std::unordered_set<SoundContainer *> alreadyHandledSoundContainers;
 
 				for (unsigned short serverSoundChannelIndex : sndDataPtr->Channels) {
-					if (serverSoundChannelIndex < c_NumberOfAudioChannels && m_ServerSounds.find(serverSoundChannelIndex) != m_ServerSounds.end()) {
+					if (serverSoundChannelIndex < c_MaxAudioChannels && m_ServerSounds.find(serverSoundChannelIndex) != m_ServerSounds.end()) {
 						SoundContainer *soundContainerToHandle = m_ServerSounds[serverSoundChannelIndex];
 						if (alreadyHandledSoundContainers.find(soundContainerToHandle) == alreadyHandledSoundContainers.end()) {
 							switch (sndDataPtr->State) {

System/Constants.h

@@ -34,7 +34,7 @@ namespace RTE {
 #pragma endregion
 
 #pragma region Audio Constants
-	static constexpr unsigned short int c_NumberOfAudioChannels = 512;
+	static constexpr unsigned short int c_MaxAudioChannels = 512;
 	static constexpr unsigned short int c_MaxPlayingSoundsPerContainer = 64;
 #pragma endregion