mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-10 12:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

PadSimple: Removed double definition of __Log()

Browse Source 
Core: Readded FreeVideo and FreeDSP for _WIN32. As I have explained thoroughly these are needed in Windows.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2192 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
John Peterson 2009-02-09 23:20:28 +00:00
parent 72424eeadc
commit 3d70ea1bcb
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/Core/Src/Core.cpp
View File

@ -321,6 +321,9 @@ THREAD_RETURN EmuThread(void *pArg)
VideoInitialize.bWii = _CoreParameter.bWii; VideoInitialize.bWii = _CoreParameter.bWii;
VideoInitialize.bUseDualCore = _CoreParameter.bUseDualCore; VideoInitialize.bUseDualCore = _CoreParameter.bUseDualCore;
// Needed for Stop and Start // Needed for Stop and Start
#ifdef _WIN32
Plugins.FreeVideo();
#endif
Plugins.GetVideo()->Initialize(&VideoInitialize); // Call the dll Plugins.GetVideo()->Initialize(&VideoInitialize); // Call the dll
// Under linux, this is an X11 Display, not an HWND! // Under linux, this is an X11 Display, not an HWND!
@ -342,6 +345,9 @@ THREAD_RETURN EmuThread(void *pArg)
dspInit.pEmulatorState = (int *)&PowerPC::state; dspInit.pEmulatorState = (int *)&PowerPC::state;
dspInit.bWii = _CoreParameter.bWii; dspInit.bWii = _CoreParameter.bWii;
// Needed for Stop and Start // Needed for Stop and Start
#ifdef _WIN32
Plugins.FreeDSP();
#endif
Plugins.GetDSP()->Initialize((void *)&dspInit); Plugins.GetDSP()->Initialize((void *)&dspInit);
// Load and Init PadPlugin // Load and Init PadPlugin

2
Source/Plugins/Plugin_PadSimple/Src/GUI/ConfigDlg.cpp
View File

@ -198,7 +198,7 @@ void ConfigDialog::CreateGUIControls()
m_CheckRecording[i]->SetValue(pad[i].bRecording); m_CheckRecording[i]->SetValue(pad[i].bRecording);
m_CheckPlayback[i]->SetValue(pad[i].bPlayback); m_CheckPlayback[i]->SetValue(pad[i].bPlayback);
// Only enable these options for pad 3 // Only enable these options for pad 0
m_CheckRecording[i]->Enable(false); m_CheckRecording[0]->Enable(true); m_CheckRecording[i]->Enable(false); m_CheckRecording[0]->Enable(true);
m_CheckPlayback[i]->Enable(false); m_CheckPlayback[0]->Enable(true); m_CheckPlayback[i]->Enable(false); m_CheckPlayback[0]->Enable(true);
m_BtnSaveRecording[i]->Enable(false); m_BtnSaveRecording[0]->Enable(true); m_BtnSaveRecording[i]->Enable(false); m_BtnSaveRecording[0]->Enable(true);

4
Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp
View File

@ -85,6 +85,7 @@ bool g_EmulatorRunning = false;
//////////////////////////////// ////////////////////////////////
// TODO: fix this dirty hack to stop missing symbols
void __Log(int log, const char *format, ...) {} void __Log(int log, const char *format, ...) {}
void __Logv(int log, int v, const char *format, ...) {} void __Logv(int log, int v, const char *format, ...) {}
@ -120,9 +121,6 @@ const SPADStatus& PlayRecord()
} }
return(recordBuffer[count++]); return(recordBuffer[count++]);
} }
// TODO: fix this dirty hack to stop missing symbols
void __Log(int log, const char *format, ...) {}
void __Logv(int log, int v, const char *format, ...) {}
void LoadRecord() void LoadRecord()
{ {