From 3209bf7be5e25bd80cf95485ca95364c1dd52024 Mon Sep 17 00:00:00 2001 From: RadWolfie Date: Mon, 23 Nov 2020 06:33:10 -0600 Subject: [PATCH] dsound: fix pause flags as enums instead --- .../hle/DSOUND/DirectSound/DirectSoundStream.cpp | 4 ++-- src/core/hle/DSOUND/XbDSoundLogging.cpp | 12 ++++++------ src/core/hle/DSOUND/XbDSoundLogging.hpp | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/core/hle/DSOUND/DirectSound/DirectSoundStream.cpp b/src/core/hle/DSOUND/DirectSound/DirectSoundStream.cpp index 7f1faf076..e29213467 100644 --- a/src/core/hle/DSOUND/DirectSound/DirectSoundStream.cpp +++ b/src/core/hle/DSOUND/DirectSound/DirectSoundStream.cpp @@ -634,7 +634,7 @@ xbox::hresult_xt WINAPI xbox::EMUPATCH(CDirectSoundStream_Pause) LOG_FUNC_BEGIN LOG_FUNC_ARG(pThis) - LOG_FUNC_ARG(dwPause) + LOG_FUNC_ARG_TYPE(DSSPAUSE_FLAG, dwPause) LOG_FUNC_END; if (!pThis) { @@ -661,7 +661,7 @@ xbox::hresult_xt WINAPI xbox::EMUPATCH(CDirectSoundStream_PauseEx) LOG_FUNC_BEGIN LOG_FUNC_ARG(pThis) LOG_FUNC_ARG(rtTimestamp) - LOG_FUNC_ARG(dwPause) + LOG_FUNC_ARG_TYPE(DSSPAUSE_FLAG, dwPause) LOG_FUNC_END; // This function wasn't part of the XDK until 4721. (Same as IDirectSoundBuffer_PauseEx?) diff --git a/src/core/hle/DSOUND/XbDSoundLogging.cpp b/src/core/hle/DSOUND/XbDSoundLogging.cpp index 437049a72..578f62e30 100644 --- a/src/core/hle/DSOUND/XbDSoundLogging.cpp +++ b/src/core/hle/DSOUND/XbDSoundLogging.cpp @@ -118,12 +118,12 @@ FLAGS2STR_START(DSSFLUSHEX_FLAG) FLAG2STR(X_DSSFLUSHEX_ENVELOPE2) FLAGS2STR_END_and_LOGRENDER(DSSFLUSHEX_FLAG) -FLAGS2STR_START(DSSPAUSE_FLAG) - FLAG2STR(X_DSSPAUSE_RESUME) - FLAG2STR(X_DSSPAUSE_PAUSE) - FLAG2STR(X_DSSPAUSE_SYNCHPLAYBACK) - FLAG2STR(X_DSSPAUSE_PAUSENOACTIVATE) -FLAGS2STR_END_and_LOGRENDER(DSSPAUSE_FLAG) +ENUM2STR_START(DSSPAUSE_FLAG) + ENUM2STR_CASE(X_DSSPAUSE_RESUME) + ENUM2STR_CASE(X_DSSPAUSE_PAUSE) + ENUM2STR_CASE(X_DSSPAUSE_SYNCHPLAYBACK) + ENUM2STR_CASE(X_DSSPAUSE_PAUSENOACTIVATE) +ENUM2STR_END_and_LOGRENDER(DSSPAUSE_FLAG) FLAGS2STR_START(DSSSTATUS_FLAG) FLAG2STR(X_DSSSTATUS_READY) diff --git a/src/core/hle/DSOUND/XbDSoundLogging.hpp b/src/core/hle/DSOUND/XbDSoundLogging.hpp index 6b2f7e779..9d99b21ba 100644 --- a/src/core/hle/DSOUND/XbDSoundLogging.hpp +++ b/src/core/hle/DSOUND/XbDSoundLogging.hpp @@ -67,7 +67,7 @@ FLAGS2STR_HEADER(DSBSTOPEX_FLAG) // DSound Stream flag/enum FLAGS2STR_HEADER(DSSCAPS_FLAG) FLAGS2STR_HEADER(DSSFLUSHEX_FLAG) -FLAGS2STR_HEADER(DSSPAUSE_FLAG) +ENUM2STR_HEADER(DSSPAUSE_FLAG) FLAGS2STR_HEADER(DSSSTATUS_FLAG) // DSound class usage