ShuriZma
/
Cxbx-Reloaded
mirror of https://github.com/Cxbx-Reloaded/Cxbx-Reloaded.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add WAVEFORMATEXTENSIBLE struct to logging file

This commit is contained in:
RadWolfie 2020-01-27 22:14:04 -06:00
parent 96211645e7
commit 51ffcb5015
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/core/hle/DSOUND/DirectSound/DirectSoundLogging.cpp
View File

@ -76,6 +76,7 @@ ENUM2STR_START(DS_RESULT)
ENUM2STR_END_and_LOGRENDER(DS_RESULT)
ENUM2STR_START(WAVEFORMAT_TAG)
ENUM2STR_CASE(0)
ENUM2STR_CASE(WAVE_FORMAT_PCM)
ENUM2STR_CASE(WAVE_FORMAT_ADPCM)
ENUM2STR_CASE(WAVE_FORMAT_XBOX_ADPCM)
@ -100,7 +101,6 @@ ENUM2STR_END_and_LOGRENDER(WAVEFORMAT_CHANNEL)
LOGRENDER(WAVEFORMATEX)
{
// TODO: Implement case for different type of structure data.
return os
LOGRENDER_MEMBER_TYPE(WAVEFORMAT_TAG, wFormatTag)
LOGRENDER_MEMBER_TYPE(WAVEFORMAT_CHANNEL, nChannels)
@ -112,6 +112,34 @@ LOGRENDER(WAVEFORMATEX)
;
}
LOGRENDER_HEADER(GUID);
LOGRENDER(GUID)
{
return os
LOGRENDER_MEMBER(Data1)
LOGRENDER_MEMBER(Data2)
LOGRENDER_MEMBER(Data3)
LOGRENDER_MEMBER(Data4)
;
}
LOGRENDER(WAVEFORMATEXTENSIBLE)
{
if (value.Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE) {
return os
LOGRENDER_MEMBER_TYPE(WAVEFORMATEX, Format)
LOGRENDER_MEMBER(Samples.wValidBitsPerSample)
LOGRENDER_MEMBER(dwChannelMask)
LOGRENDER_MEMBER_TYPE(GUID, SubFormat)
;
}
else {
return os
LOGRENDER_MEMBER_TYPE(WAVEFORMATEX, Format)
;
}
}
LOGRENDER(DSBUFFERDESC)
{
return os

2
src/core/hle/DSOUND/DirectSound/DirectSoundLogging.hpp
View File

@ -26,6 +26,7 @@
#define DIRECTSOUNDLOGGING_H
#include <dsound.h>
#include <mmreg.h>
#include "Logging.h"
enum DS_BCAPS;
@ -38,6 +39,7 @@ ENUM2STR_HEADER(WAVEFORMAT_CHANNEL)
ENUM2STR_HEADER(WAVEFORMAT_TAG)
LOGRENDER_HEADER(WAVEFORMATEX)
LOGRENDER_HEADER(WAVEFORMATEXTENSIBLE)
LOGRENDER_HEADER(DSBUFFERDESC)
LOGRENDER_HEADER(D3DVECTOR)