Include DSound log macros
This commit is contained in:
RadWolfie
parent
55132da6a7
commit
90339f1f58
|
|
@ -220,6 +220,8 @@
|
|||
<ClInclude Include="..\..\src\common\win32\AlignPrefix1.h" />
|
||||
<ClInclude Include="..\..\src\common\xdvdfs-tools\buffered_io.h" />
|
||||
<ClInclude Include="..\..\src\common\xdvdfs-tools\xdvdfs.h" />
|
||||
<ClInclude Include="..\..\src\core\hle\DSOUND\DirectSound\DirectSoundLogging.hpp" />
|
||||
<ClInclude Include="..\..\src\core\hle\DSOUND\XbDSoundLogging.hpp" />
|
||||
<ClInclude Include="..\..\src\core\hle\DSOUND\XbDSoundTypes.h" />
|
||||
<ClInclude Include="..\..\src\core\kernel\exports\EmuKrnlKe.h" />
|
||||
<ClInclude Include="..\..\src\Cxbx.h" />
|
||||
|
|
@ -372,6 +374,8 @@
|
|||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\common\xdvdfs-tools\buffered_io.cpp" />
|
||||
<ClCompile Include="..\..\src\common\xdvdfs-tools\xdvdfs.cpp" />
|
||||
<ClCompile Include="..\..\src\core\hle\DSOUND\DirectSound\DirectSoundLogging.cpp" />
|
||||
<ClCompile Include="..\..\src\core\hle\DSOUND\XbDSoundLogging.cpp" />
|
||||
<ClCompile Include="..\..\src\core\kernel\init\CxbxKrnl.cpp">
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
|
|
|
|||
|
|
@ -635,6 +635,12 @@
|
|||
<ClCompile Include="..\..\src\common\Timer.cpp">
|
||||
<Filter>Emulator</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\core\hle\DSOUND\XbDSoundLogging.cpp">
|
||||
<Filter>core\HLE\DSOUND</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\core\hle\DSOUND\DirectSound\DirectSoundLogging.cpp">
|
||||
<Filter>core\HLE\DSOUND\DirectSound</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="..\..\resource\Splash.jpg">
|
||||
|
|
@ -821,6 +827,12 @@
|
|||
<ClInclude Include="..\..\src\core\hle\DSOUND\XbDSoundTypes.h">
|
||||
<Filter>core\HLE\DSOUND</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\core\hle\DSOUND\XbDSoundLogging.hpp">
|
||||
<Filter>core\HLE\DSOUND</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\core\hle\DSOUND\DirectSound\DirectSoundLogging.hpp">
|
||||
<Filter>core\HLE\DSOUND\DirectSound</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\..\src\devices\video\nv2a_regs.h">
|
||||
|
|
|
|||
|
|
@ -0,0 +1,147 @@
|
|||
// ******************************************************************
|
||||
// *
|
||||
// * .,-::::: .,:: .::::::::. .,:: .:
|
||||
// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;;
|
||||
// * [[[ '[[,,[[' [[[__[[\. '[[,,[['
|
||||
// * $$$ Y$$$P $$""""Y$$ Y$$$P
|
||||
// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo,
|
||||
// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm,
|
||||
// *
|
||||
// * src->core->HLE->DSound->DirectSound->DirectSoundLogging.cpp
|
||||
// *
|
||||
// * This file is part of the Cxbx project.
|
||||
// *
|
||||
// * Cxbx and Cxbe are free software; you can redistribute them
|
||||
// * and/or modify them under the terms of the GNU General Public
|
||||
// * License as published by the Free Software Foundation; either
|
||||
// * version 2 of the license, or (at your option) any later version.
|
||||
// *
|
||||
// * This program is distributed in the hope that it will be useful,
|
||||
// * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// * GNU General Public License for more details.
|
||||
// *
|
||||
// * You should have recieved a copy of the GNU General Public License
|
||||
// * along with this program; see the file COPYING.
|
||||
// * If not, write to the Free Software Foundation, Inc.,
|
||||
// * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
// *
|
||||
// * (c) 2019 RadWolfie
|
||||
// *
|
||||
// * All rights reserved
|
||||
// *
|
||||
// ******************************************************************
|
||||
|
||||
#include "Logging.h"
|
||||
#include "DirectSoundLogging.hpp"
|
||||
|
||||
ENUM2STR_START(DS_RESULT)
|
||||
ENUM2STR_CASE(DS_OK)
|
||||
ENUM2STR_CASE(DS_NO_VIRTUALIZATION)
|
||||
ENUM2STR_CASE(DSERR_ALLOCATED)
|
||||
ENUM2STR_CASE(DSERR_CONTROLUNAVAIL)
|
||||
ENUM2STR_CASE(DSERR_INVALIDPARAM)
|
||||
ENUM2STR_CASE(DSERR_INVALIDCALL)
|
||||
ENUM2STR_CASE(DSERR_GENERIC)
|
||||
ENUM2STR_CASE(DSERR_PRIOLEVELNEEDED)
|
||||
ENUM2STR_CASE(DSERR_OUTOFMEMORY)
|
||||
ENUM2STR_CASE(DSERR_BADFORMAT)
|
||||
ENUM2STR_CASE(DSERR_UNSUPPORTED)
|
||||
ENUM2STR_CASE(DSERR_NODRIVER)
|
||||
ENUM2STR_CASE(DSERR_ALREADYINITIALIZED)
|
||||
ENUM2STR_CASE(DSERR_NOAGGREGATION)
|
||||
ENUM2STR_CASE(DSERR_BUFFERLOST)
|
||||
ENUM2STR_CASE(DSERR_OTHERAPPHASPRIO)
|
||||
ENUM2STR_CASE(DSERR_UNINITIALIZED)
|
||||
ENUM2STR_CASE(DSERR_NOINTERFACE)
|
||||
ENUM2STR_CASE(DSERR_ACCESSDENIED)
|
||||
ENUM2STR_CASE(DSERR_BUFFERTOOSMALL)
|
||||
ENUM2STR_CASE(DSERR_DS8_REQUIRED)
|
||||
ENUM2STR_CASE(DSERR_SENDLOOP)
|
||||
ENUM2STR_CASE(DSERR_BADSENDBUFFERGUID)
|
||||
ENUM2STR_CASE(DSERR_OBJECTNOTFOUND)
|
||||
ENUM2STR_CASE(DSERR_FXUNAVAILABLE)
|
||||
ENUM2STR_END_and_LOGRENDER(DS_RESULT)
|
||||
|
||||
LOGRENDER(WAVEFORMATEX)
|
||||
{
|
||||
return os
|
||||
LOGRENDER_MEMBER(wFormatTag)
|
||||
LOGRENDER_MEMBER(nChannels)
|
||||
LOGRENDER_MEMBER(nSamplesPerSec)
|
||||
LOGRENDER_MEMBER(nAvgBytesPerSec)
|
||||
LOGRENDER_MEMBER(nBlockAlign)
|
||||
LOGRENDER_MEMBER(wBitsPerSample)
|
||||
LOGRENDER_MEMBER(cbSize)
|
||||
;
|
||||
}
|
||||
|
||||
LOGRENDER(DSBUFFERDESC)
|
||||
{
|
||||
return os
|
||||
LOGRENDER_MEMBER(dwSize)
|
||||
LOGRENDER_MEMBER(dwFlags)
|
||||
LOGRENDER_MEMBER(dwBufferBytes)
|
||||
LOGRENDER_MEMBER(dwReserved)
|
||||
LOGRENDER_MEMBER_TYPE(LPWAVEFORMATEX, lpwfxFormat)
|
||||
;
|
||||
}
|
||||
|
||||
std::string DirectSoundErrorString(HRESULT hResult)
|
||||
{
|
||||
switch (hResult) {
|
||||
case DS_OK:
|
||||
return "";
|
||||
case DS_NO_VIRTUALIZATION:
|
||||
return "The call succeeded, but we had to substitute the 3D algorithm";
|
||||
case DSERR_ALLOCATED:
|
||||
return "The call failed because resources(such as a priority level) were already being used by another caller";
|
||||
case DSERR_CONTROLUNAVAIL:
|
||||
return "The control (vol, pan, etc.) requested by the caller is not available";
|
||||
case DSERR_INVALIDPARAM:
|
||||
return "An invalid parameter was passed to the returning function";
|
||||
case DSERR_INVALIDCALL:
|
||||
return "This call is not valid for the current state of this object";
|
||||
case DSERR_GENERIC:
|
||||
return "An undetermined error occurred inside the DirectSound subsystem";
|
||||
case DSERR_PRIOLEVELNEEDED:
|
||||
return "The caller does not have the priority level required for the function to succeed";
|
||||
case DSERR_OUTOFMEMORY:
|
||||
return "Not enough free memory is available to complete the operation";
|
||||
case DSERR_BADFORMAT:
|
||||
return "The specified WAVE format is not supported";
|
||||
case DSERR_UNSUPPORTED:
|
||||
return "The function called is not supported at this time";
|
||||
case DSERR_NODRIVER:
|
||||
return "No sound driver is available for use";
|
||||
case DSERR_ALREADYINITIALIZED:
|
||||
return "This object is already initialized";
|
||||
case DSERR_NOAGGREGATION:
|
||||
return "This object does not support aggregation";
|
||||
case DSERR_BUFFERLOST:
|
||||
return "The buffer memory has been lost, and must be restored";
|
||||
case DSERR_OTHERAPPHASPRIO:
|
||||
return "Another app has a higher priority level, preventing this call from succeeding";
|
||||
case DSERR_UNINITIALIZED:
|
||||
return "This object has not been initialized";
|
||||
case DSERR_NOINTERFACE:
|
||||
return "The requested COM interface is not available";
|
||||
case DSERR_ACCESSDENIED:
|
||||
return "Access is denied";
|
||||
case DSERR_BUFFERTOOSMALL:
|
||||
return "Tried to create a DSBCAPS_CTRLFX buffer shorter than DSBSIZE_FX_MIN milliseconds";
|
||||
case DSERR_DS8_REQUIRED:
|
||||
return "Attempt to use DirectSound 8 functionality on an older DirectSound object";
|
||||
case DSERR_SENDLOOP:
|
||||
return "A circular loop of send effects was detected";
|
||||
case DSERR_BADSENDBUFFERGUID:
|
||||
return "The GUID specified in an audiopath file does not match a valid MIXIN buffer";
|
||||
case DSERR_OBJECTNOTFOUND:
|
||||
return "The object requested was not found (numerically equal to DMUS_E_NOT_FOUND)";
|
||||
case DSERR_FXUNAVAILABLE:
|
||||
return "The effects requested could not be found on the system, or they were found"
|
||||
"but in the wrong order, or in the wrong hardware/software locations.";
|
||||
default:
|
||||
return "Unknown error";
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,48 @@
|
|||
// ******************************************************************
|
||||
// *
|
||||
// * .,-::::: .,:: .::::::::. .,:: .:
|
||||
// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;;
|
||||
// * [[[ '[[,,[[' [[[__[[\. '[[,,[['
|
||||
// * $$$ Y$$$P $$""""Y$$ Y$$$P
|
||||
// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo,
|
||||
// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm,
|
||||
// *
|
||||
// * src->core->HLE->DSound->DirectSound->DirectSoundLogging.hpp
|
||||
// *
|
||||
// * This file is part of the Cxbx project.
|
||||
// *
|
||||
// * Cxbx and Cxbe are free software; you can redistribute them
|
||||
// * and/or modify them under the terms of the GNU General Public
|
||||
// * License as published by the Free Software Foundation; either
|
||||
// * version 2 of the license, or (at your option) any later version.
|
||||
// *
|
||||
// * This program is distributed in the hope that it will be useful,
|
||||
// * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// * GNU General Public License for more details.
|
||||
// *
|
||||
// * You should have recieved a copy of the GNU General Public License
|
||||
// * along with this program; see the file COPYING.
|
||||
// * If not, write to the Free Software Foundation, Inc.,
|
||||
// * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
// *
|
||||
// * (c) 2019 RadWolfie
|
||||
// *
|
||||
// * All rights reserved
|
||||
// *
|
||||
// ******************************************************************
|
||||
#ifndef DIRECTSOUNDLOGGING_H
|
||||
#define DIRECTSOUNDLOGGING_H
|
||||
|
||||
#include <dsound.h>
|
||||
#include "Logging.h"
|
||||
|
||||
enum DS_RESULT;
|
||||
ENUM2STR_HEADER(DS_RESULT)
|
||||
|
||||
LOGRENDER_HEADER(WAVEFORMATEX)
|
||||
LOGRENDER_HEADER(DSBUFFERDESC)
|
||||
|
||||
std::string DirectSoundErrorString(HRESULT hResult);
|
||||
|
||||
#endif
|
||||
|
|
@ -0,0 +1,62 @@
|
|||
// ******************************************************************
|
||||
// *
|
||||
// * .,-::::: .,:: .::::::::. .,:: .:
|
||||
// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;;
|
||||
// * [[[ '[[,,[[' [[[__[[\. '[[,,[['
|
||||
// * $$$ Y$$$P $$""""Y$$ Y$$$P
|
||||
// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo,
|
||||
// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm,
|
||||
// *
|
||||
// * src->core->HLE->DSound->XbDSoundLogging.cpp
|
||||
// *
|
||||
// * This file is part of the Cxbx project.
|
||||
// *
|
||||
// * Cxbx and Cxbe are free software; you can redistribute them
|
||||
// * and/or modify them under the terms of the GNU General Public
|
||||
// * License as published by the Free Software Foundation; either
|
||||
// * version 2 of the license, or (at your option) any later version.
|
||||
// *
|
||||
// * This program is distributed in the hope that it will be useful,
|
||||
// * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// * GNU General Public License for more details.
|
||||
// *
|
||||
// * You should have recieved a copy of the GNU General Public License
|
||||
// * along with this program; see the file COPYING.
|
||||
// * If not, write to the Free Software Foundation, Inc.,
|
||||
// * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
// *
|
||||
// * (c) 2019 RadWolfie
|
||||
// *
|
||||
// * All rights reserved
|
||||
// *
|
||||
// ******************************************************************
|
||||
|
||||
#include "Logging.h"
|
||||
#include "XbDSoundLogging.hpp"
|
||||
|
||||
extern LOGRENDER_HEADER(WAVEFORMATEX)
|
||||
|
||||
LOGRENDER(XTL::X_DSBUFFERDESC)
|
||||
{
|
||||
return os
|
||||
LOGRENDER_MEMBER(dwSize)
|
||||
LOGRENDER_MEMBER(dwFlags)
|
||||
LOGRENDER_MEMBER(dwBufferBytes)
|
||||
LOGRENDER_MEMBER_TYPE(LPWAVEFORMATEX, lpwfxFormat)
|
||||
LOGRENDER_MEMBER(lpMixBins)
|
||||
LOGRENDER_MEMBER(dwInputMixBin)
|
||||
;
|
||||
}
|
||||
|
||||
LOGRENDER(XTL::X_DSSTREAMDESC)
|
||||
{
|
||||
return os
|
||||
LOGRENDER_MEMBER(dwFlags)
|
||||
LOGRENDER_MEMBER(dwMaxAttachedPackets)
|
||||
LOGRENDER_MEMBER_TYPE(LPWAVEFORMATEX, lpwfxFormat)
|
||||
LOGRENDER_MEMBER_TYPE(void*, lpfnCallback)
|
||||
LOGRENDER_MEMBER(lpvContext)
|
||||
LOGRENDER_MEMBER(lpMixBins)
|
||||
;
|
||||
}
|
||||
|
|
@ -0,0 +1,45 @@
|
|||
// ******************************************************************
|
||||
// *
|
||||
// * .,-::::: .,:: .::::::::. .,:: .:
|
||||
// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;;
|
||||
// * [[[ '[[,,[[' [[[__[[\. '[[,,[['
|
||||
// * $$$ Y$$$P $$""""Y$$ Y$$$P
|
||||
// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo,
|
||||
// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm,
|
||||
// *
|
||||
// * src->core->HLE->DSound->XbDSoundLogging.hpp
|
||||
// *
|
||||
// * This file is part of the Cxbx project.
|
||||
// *
|
||||
// * Cxbx and Cxbe are free software; you can redistribute them
|
||||
// * and/or modify them under the terms of the GNU General Public
|
||||
// * License as published by the Free Software Foundation; either
|
||||
// * version 2 of the license, or (at your option) any later version.
|
||||
// *
|
||||
// * This program is distributed in the hope that it will be useful,
|
||||
// * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// * GNU General Public License for more details.
|
||||
// *
|
||||
// * You should have recieved a copy of the GNU General Public License
|
||||
// * along with this program; see the file COPYING.
|
||||
// * If not, write to the Free Software Foundation, Inc.,
|
||||
// * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
// *
|
||||
// * (c) 2019 RadWolfie
|
||||
// *
|
||||
// * All rights reserved
|
||||
// *
|
||||
// ******************************************************************
|
||||
#ifndef XBDSOUNDLOGGING_H
|
||||
#define XBDSOUNDLOGGING_H
|
||||
|
||||
#include "Logging.h"
|
||||
namespace XTL {
|
||||
#include "XbDSoundTypes.h"
|
||||
}
|
||||
|
||||
LOGRENDER_HEADER(XTL::X_DSSTREAMDESC)
|
||||
LOGRENDER_HEADER(XTL::X_DSBUFFERDESC)
|
||||
|
||||
#endif
|
||||
Loading…
Reference in New Issue