birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix issues with audio localization bank switching (#2945)

Browse Source 
* Fix issues with locating and loading loc banks

The code that initially checked the g_languageAudio cvar wasn't properly
detecting when the cvar wasn't set.  Fixed an issue discovering
localized banks wasn't properly recursing into subdirectories.
Simplified handling of audio language switching for Wwise.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Address feedback on PR

Change .size() == 0 to .empty()

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
This commit is contained in:
amzn-phist
2021-08-09 11:51:06 -05:00
committed by GitHub
parent 0999a7f6e4
commit f03df3e546
3 changed files with 12 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Legacy/CrySystem/SystemInit.cpp
+7 -9
View File
@@ -896,16 +896,14 @@ void CSystem::InitLocalization()
if (auto console = AZ::Interface<AZ::IConsole>::Get(); console != nullptr) if (auto console = AZ::Interface<AZ::IConsole>::Get(); console != nullptr)
{ {
AZ::CVarFixedString languageAudio; AZ::CVarFixedString languageAudio;
if (auto result = console->GetCvarValue("g_languageAudio", languageAudio); result == AZ::GetValueResult::Success) console->GetCvarValue("g_languageAudio", languageAudio);
if (languageAudio.empty())
{ {
if (languageAudio.size() == 0) console->PerformCommand(AZStd::string::format("g_languageAudio %s", language.c_str()).c_str());
{ }
console->PerformCommand(AZStd::string::format("g_languageAudio %s", language.c_str()).c_str()); else
} {
else language.assign(languageAudio.data(), languageAudio.size());
{
language.assign(languageAudio.data(), languageAudio.size());
}
} }
} }
OpenLanguageAudioPak(language); OpenLanguageAudioPak(language);
Gems/AudioEngineWwise/Code/Source/Editor/AudioWwiseLoader.cpp
+4 -2
View File
@@ -54,7 +54,9 @@ namespace AudioControls
//-------------------------------------------------------------------------------------------// //-------------------------------------------------------------------------------------------//
void CAudioWwiseLoader::LoadSoundBanks(const AZStd::string_view rootFolder, const AZStd::string_view subPath, bool isLocalized) void CAudioWwiseLoader::LoadSoundBanks(const AZStd::string_view rootFolder, const AZStd::string_view subPath, bool isLocalized)
{ {
auto foundFiles = Audio::FindFilesInPath(rootFolder, "*"); AZ::IO::FixedMaxPath searchPath(rootFolder);
searchPath /= subPath;
auto foundFiles = Audio::FindFilesInPath(searchPath.Native(), "*");
bool isLocalizedLoaded = isLocalized; bool isLocalizedLoaded = isLocalized;
for (const auto& filePath : foundFiles) for (const auto& filePath : foundFiles)
@@ -71,7 +73,7 @@ namespace AudioControls
// same content (in the future we want to have a // same content (in the future we want to have a
// consistency report to highlight if this is not the case) // consistency report to highlight if this is not the case)
m_localizationFolder.assign(fileName.Native().data(), fileName.Native().size()); m_localizationFolder.assign(fileName.Native().data(), fileName.Native().size());
LoadSoundBanks(rootFolder, m_localizationFolder, true); LoadSoundBanks(searchPath.Native(), m_localizationFolder, true);
isLocalizedLoaded = true; isLocalizedLoaded = true;
} }
} }
Gems/AudioEngineWwise/Code/Source/Engine/AudioSystemImpl_wwise.cpp
+1 -10
View File
@@ -2173,16 +2173,7 @@ namespace Audio
{ {
if (language) if (language)
{ {
AZStd::string languageSubfolder; AZStd::string languageSubfolder(language);
if (azstricmp(language, "english") == 0)
{
languageSubfolder = "english(us)";
}
else
{
languageSubfolder = language;
}
languageSubfolder += "/"; languageSubfolder += "/";