#jira UE-78301 fix for bad cast on ReverbEffect. Bring in fix from Maxwell Hayes for UObject name collision.

#rb mawell.hayes

#ROBOMERGE-SOURCE: CL 7711798 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v385-7708028)

[CL 7711799 by ethan geller in Main branch]
This commit is contained in:
ethan geller
2019-08-02 22:33:19 -04:00
parent ca76db289e
commit e5dea02e2f
4 changed files with 7 additions and 3 deletions

View File

@@ -685,7 +685,7 @@ namespace Audio
}
else
{
ReverbPreset = NewObject<USubmixEffectReverbFastPreset>(MasterReverbSoundSubmix, TEXT("Master Reverb Effect Preset"));
ReverbPreset = NewObject<USubmixEffectReverbFastPreset>(MasterReverbSoundSubmix, TEXT("Master Reverb Effect Fast Preset"));
}
ReverbPreset->AddToRoot();

View File

@@ -97,7 +97,9 @@ namespace Audio
FAudioMixerEffectsManager::FAudioMixerEffectsManager(FAudioDevice* InDevice)
: FAudioEffectsManager(InDevice)
{}
{
bUseLegacyReverb = GetDefault<UAudioSettings>()->bEnableLegacyReverb;
}
FAudioMixerEffectsManager::~FAudioMixerEffectsManager()
{}
@@ -115,7 +117,7 @@ namespace Audio
if (SoundEffectSubmix)
{
// Choose correct reverb based upon ini settings.
if (GetDefault<UAudioSettings>()->bEnableLegacyReverb)
if (bUseLegacyReverb)
{
FSubmixEffectReverb* SoundEffectReverb = static_cast<FSubmixEffectReverb*>(SoundEffectSubmix);
SoundEffectReverb->SetEffectParameters(ReverbEffectParameters);

View File

@@ -252,6 +252,7 @@ FAudioEffectsManager::FAudioEffectsManager( FAudioDevice* InDevice )
, bEQActive(false)
, bReverbChanged(true) // Setting to true to catch the first default reverb setting
, bEQChanged(false)
, bUseLegacyReverb(false)
{
InitAudioEffects();
}

View File

@@ -220,6 +220,7 @@ protected:
bool bEQActive;
bool bReverbChanged;
bool bEQChanged;
bool bUseLegacyReverb;
};
// end