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

Added Xbox DS(S|B)CAPS flags verbose

This commit is contained in:
RadWolfie 2019-02-14 21:49:41 -06:00
parent 1607c5a386
commit 885b1ba10f
3 changed files with 46 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/core/hle/DSOUND/XbDSoundLogging.cpp
View File

@ -69,6 +69,18 @@ ENUM2STR_START(DSFILTER_MODE)
ENUM2STR_END_and_LOGRENDER(DSFILTER_MODE)
// DSound Buffer flag/enum
FLAGS2STR_START(DSBCAPS_FLAG)
FLAG2STR(XTL_DSBCAPS_CTRL3D)
FLAG2STR(XTL_DSBCAPS_CTRLFREQUENCY)
FLAG2STR(XTL_DSBCAPS_CTRLVOLUME)
FLAG2STR(XTL_DSBCAPS_CTRLPOSITIONNOTIFY)
FLAG2STR(XTL_DSBCAPS_MIXIN)
FLAG2STR(XTL_DSBCAPS_MUTE3DATMAXDISTANCE)
FLAG2STR(XTL_DSBCAPS_LOCDEFER)
FLAG2STR(XTL_DSBCAPS_FXIN)
FLAG2STR(XTL_DSBCAPS_FXIN2)
FLAGS2STR_END_and_LOGRENDER(DSBCAPS_FLAG)
FLAGS2STR_START(DSBPAUSE_FLAG)
FLAG2STR(X_DSBPAUSE_RESUME)
FLAG2STR(X_DSBPAUSE_PAUSE)
@ -95,6 +107,16 @@ FLAGS2STR_START(DSBSTOPEX_FLAG)
FLAGS2STR_END_and_LOGRENDER(DSBSTOPEX_FLAG)
// DSound Stream flag/enum
FLAGS2STR_START(DSSCAPS_FLAG)
FLAG2STR(XTL_DSSCAPS_CTRL3D)
FLAG2STR(XTL_DSSCAPS_CTRLFREQUENCY)
FLAG2STR(XTL_DSSCAPS_CTRLVOLUME)
FLAG2STR(XTL_DSSCAPS_MUTE3DATMAXDISTANCE)
FLAG2STR(XTL_DSSCAPS_LOCDEFER)
FLAG2STR(XTL_DSSCAPS_NOMERGE)
FLAG2STR(XTL_DSSCAPS_ACCURATENOTIFY)
FLAGS2STR_END_and_LOGRENDER(DSSCAPS_FLAG)
FLAGS2STR_START(DSSFLUSHEX_FLAG)
FLAG2STR(X_DSSFLUSHEX_IMMEDIATE)
FLAG2STR(X_DSSFLUSHEX_ASYNC)
@ -302,7 +324,7 @@ LOGRENDER(X_DSBUFFERDESC)
{
return os
LOGRENDER_MEMBER(dwSize)
LOGRENDER_MEMBER(dwFlags) // TODO: Need custom flags setup
LOGRENDER_MEMBER_TYPE(DSBCAPS_FLAG, dwFlags)
LOGRENDER_MEMBER(dwBufferBytes)
LOGRENDER_MEMBER_TYPE(LPWAVEFORMATEX, lpwfxFormat)
LOGRENDER_MEMBER(lpMixBins)
@ -314,7 +336,7 @@ LOGRENDER(X_DSBUFFERDESC)
LOGRENDER(X_DSSTREAMDESC)
{
return os
LOGRENDER_MEMBER(dwFlags) // TODO: Need custom flags setup
LOGRENDER_MEMBER_TYPE(DSSCAPS_FLAG, dwFlags)
LOGRENDER_MEMBER(dwMaxAttachedPackets)
LOGRENDER_MEMBER_TYPE(LPWAVEFORMATEX, lpwfxFormat)
LOGRENDER_MEMBER_TYPE(void*, lpfnCallback)

4
src/core/hle/DSOUND/XbDSoundLogging.hpp
View File

@ -44,11 +44,13 @@ enum DSSPEAKER_FLAG;
// DSound generic flag/enum
enum DSFILTER_MODE;
// DSound Buffer flag/enum
enum DSBCAPS_FLAG;
enum DSBPAUSE_FLAG;
enum DSBPLAY_FLAG;
enum DSBSTATUS_FLAG;
enum DSBSTOPEX_FLAG;
// DSound Stream flag/enum
enum DSSCAPS_FLAG;
enum DSSFLUSHEX_FLAG;
enum DSSPAUSE_FLAG;
enum DSSSTATUS_FLAG;
@ -61,11 +63,13 @@ FLAGS2STR_HEADER(DSSPEAKER_FLAG)
// DSound generic flag/enum
ENUM2STR_HEADER(DSFILTER_MODE)
// DSound Buffer flag/enum
FLAGS2STR_HEADER(DSBCAPS_FLAG)
FLAGS2STR_HEADER(DSBPAUSE_FLAG)
FLAGS2STR_HEADER(DSBPLAY_FLAG)
FLAGS2STR_HEADER(DSBSTATUS_FLAG)
FLAGS2STR_HEADER(DSBSTOPEX_FLAG)
// DSound Stream flag/enum
FLAGS2STR_HEADER(DSSCAPS_FLAG)
FLAGS2STR_HEADER(DSSFLUSHEX_FLAG)
FLAGS2STR_HEADER(DSSPAUSE_FLAG)
FLAGS2STR_HEADER(DSSSTATUS_FLAG)

18
src/core/hle/DSOUND/XbDSoundTypes.h
View File

@ -82,6 +82,16 @@
#define X_DSBSTOPEX_RELEASEWAVEFORM 0x00000002
#define X_DSBSTOPEX_ALL (X_DSBSTOPEX_ENVELOPE | X_DSBSTOPEX_RELEASEWAVEFORM)
#define XTL_DSBCAPS_CTRL3D 0x00000010
#define XTL_DSBCAPS_CTRLFREQUENCY 0x00000020
#define XTL_DSBCAPS_CTRLVOLUME 0x00000080
#define XTL_DSBCAPS_CTRLPOSITIONNOTIFY 0x00000100
#define XTL_DSBCAPS_MIXIN 0x00002000
#define XTL_DSBCAPS_MUTE3DATMAXDISTANCE 0x00020000
#define XTL_DSBCAPS_LOCDEFER 0x00040000
#define XTL_DSBCAPS_FXIN 0x00080000
#define XTL_DSBCAPS_FXIN2 0x00100000
// ******************************************************************
// * X_DSBUFFERDESC
// ******************************************************************
@ -112,6 +122,14 @@ struct X_DSENVOLOPEDESC
LONG lFilterCutOff;
};
#define XTL_DSSCAPS_CTRL3D 0x00000010
#define XTL_DSSCAPS_CTRLFREQUENCY 0x00000020
#define XTL_DSSCAPS_CTRLVOLUME 0x00000080
#define XTL_DSSCAPS_MUTE3DATMAXDISTANCE 0x00020000
#define XTL_DSSCAPS_LOCDEFER 0x00040000
#define XTL_DSSCAPS_NOMERGE 0x20000000
#define XTL_DSSCAPS_ACCURATENOTIFY 0x40000000
typedef VOID(CALLBACK *LPFNXMOCALLBACK)(LPVOID pStreamContext, LPVOID pPacketContext, DWORD dwStatus);
// ******************************************************************