dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp-beta

Browse Source 
# Conflicts:
#	src/lang/chuvash.txt
#	src/lang/czech.txt
#	src/lang/english_AU.txt
#	src/lang/english_US.txt
#	src/lang/german.txt
#	src/lang/japanese.txt
#	src/lang/korean.txt
#	src/lang/latvian.txt
#	src/lang/russian.txt
#	src/tree_gui.cpp
#	src/vehicle.cpp
This commit is contained in:
Jonathan G Rennison
2021-11-02 21:11:11 +00:00
parent 324e90e5ac ff6c934916
commit 3ef1a0943b
84 changed files with 28242 additions and 8014 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/sound/xaudio2_s.cpp
View File

@@ -117,6 +117,20 @@ static IXAudio2MasteringVoice* _mastering_voice = nullptr;
static ComPtr<IXAudio2> _xaudio2;
static StreamingVoiceContext* _voice_context = nullptr;
/** Create XAudio2 context with SEH exception checking. */
static HRESULT CreateXAudio(API_XAudio2Create xAudio2Create)
{
HRESULT hr;
__try {
UINT32 flags = 0;
hr = xAudio2Create(_xaudio2.GetAddressOf(), flags, XAUDIO2_DEFAULT_PROCESSOR);
} __except (EXCEPTION_EXECUTE_HANDLER) {
hr = GetExceptionCode();
}
return hr;
}
/**
* Initialises the XAudio2 driver.
*
@@ -156,8 +170,7 @@ const char *SoundDriver_XAudio2::Start(const StringList &parm)
}
// Create the XAudio engine
UINT32 flags = 0;
hr = xAudio2Create(_xaudio2.GetAddressOf(), flags, XAUDIO2_DEFAULT_PROCESSOR);
hr = CreateXAudio(xAudio2Create);
if (FAILED(hr))
{