izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merging //UE4/Dev-Main to Dev-Sequencer (//UE4/Dev-Sequencer)

Browse Source 
#rb none

[CL 6643490 by Max Chen in Dev-Sequencer branch]
This commit is contained in:
Max Chen
2019-05-25 03:15:46 -04:00
parent 07e1eeadd5
commit 697a6f07ef
1812 changed files with 96339 additions and 32883 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Engine/Source/Developer/HTML5/HTML5TargetPlatform/Private/HTML5TargetPlatform.cpp
View File

@@ -10,6 +10,7 @@
#include "Misc/ScopeLock.h"
#if WITH_ENGINE
#include "AudioCompressionSettings.h"
#include "Sound/SoundWave.h"
#endif
#if PLATFORM_WINDOWS
@@ -287,7 +288,14 @@ const UTextureLODSettings& FHTML5TargetPlatform::GetTextureLODSettings() const
FName FHTML5TargetPlatform::GetWaveFormat( const USoundWave* Wave ) const
{
static FName NAME_OGG(TEXT("OGG"));
static const FName NAME_OGG(TEXT("OGG"));
static const FName NAME_ADPCM(TEXT("ADPCM"));
if (Wave->IsSeekableStreaming())
{
return NAME_ADPCM;
}
return NAME_OGG;
}
@@ -295,7 +303,10 @@ FName FHTML5TargetPlatform::GetWaveFormat( const USoundWave* Wave ) const
void FHTML5TargetPlatform::GetAllWaveFormats(TArray<FName>& OutFormats) const
{
static FName NAME_OGG(TEXT("OGG"));
static const FName NAME_ADPCM(TEXT("ADPCM"));
static const FName NAME_OGG(TEXT("OGG"));
OutFormats.Add(NAME_ADPCM);
OutFormats.Add(NAME_OGG);
}