piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-22 22:00:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

more nowx fixes

Browse Source 
disabled njoy test build


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1545 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee
2008-12-14 23:52:01 +00:00
parent 7790afb1f3
commit 7f8cc4ec62
16 changed files with 107 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AXWii.cpp
View File

@ -17,8 +17,11 @@
#include "StringUtil.h"
#if defined(HAVE_WX) && HAVE_WX
#include "../Debugger/Debugger.h"
#include "../Logging/Console.h" // for aprintf
extern CDebugger * m_frame;
#endif
#ifdef _WIN32
#include "../PCHW/DSoundStream.h"
@ -40,7 +43,7 @@
// Declarations
// -----------
extern bool gSequenced;
extern CDebugger * m_frame;
// -----------
@ -112,6 +115,7 @@ void CUCode_AXWii::MixAdd_(short* _pBuffer, int _iSize, ParamBlockType &PBs)
// -------------------------------------------
// write logging data to debugger
#if defined(HAVE_WX) && HAVE_WX
if (m_frame)
{
lCUCode_AX->Logging(_pBuffer, _iSize, 0, true);
@ -151,7 +155,7 @@ void CUCode_AXWii::MixAdd_(short* _pBuffer, int _iSize, ParamBlockType &PBs)
}
}
// -----------------
#endif
// ---------------------------------------------------------------------------------------
/* Make the updates we are told to do. See comments to the GC version in UCode_AX.cpp */
@ -214,11 +218,13 @@ void CUCode_AXWii::MixAdd_(short* _pBuffer, int _iSize, ParamBlockType &PBs)
*_pBuffer++ = right;
}
#if defined(HAVE_WX) && HAVE_WX
// write logging data to debugger again after the update
if (m_frame)
{
lCUCode_AX->Logging(_pBuffer, _iSize, 1, true);
}
#endif
}
@ -235,7 +241,13 @@ void CUCode_AXWii::Update()
// Shortcut
void CUCode_AXWii::SaveLog(const char* _fmt, ...)
{
va_list ap; va_start(ap, _fmt); if(m_frame) lCUCode_AX->SaveLog_(true, _fmt, ap); va_end(ap);
#if defined(HAVE_WX) && HAVE_WX
va_list ap;
va_start(ap, _fmt);
if(m_frame)
lCUCode_AX->SaveLog_(true, _fmt, ap);
va_end(ap);
#endif
}
@ -261,9 +273,9 @@ bool CUCode_AXWii::AXTask(u32& _uMail)
// u32 Addr__9;
bool bExecuteList = true;
#if defined(HAVE_WX) && HAVE_WX
if(m_frame) lCUCode_AX->SaveMail(true, uAddress); // Save mail for debugging
#endif
if (false)
{
// PanicAlert("%i", sizeof(AXParamBlockWii)); // 252 ??