diff options
| author | John Peterson <jpeterson57@gmail.com> | 2009-02-09 23:20:28 +0000 |
|---|---|---|
| committer | John Peterson <jpeterson57@gmail.com> | 2009-02-09 23:20:28 +0000 |
| commit | 3d70ea1bcba7fce4cfe635f833baf2056ec13e14 (patch) | |
| tree | d4195dbc3b84403edfc97e511d1944a058ae8314 /Source | |
| parent | 72424eeadc3b25159b0c1d12b1328884c42b0fde (diff) | |
PadSimple: Removed double definition of __Log()
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
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/Core/Src/Core.cpp | 6 | ||||
| -rw-r--r-- | Source/Plugins/Plugin_PadSimple/Src/GUI/ConfigDlg.cpp | 2 | ||||
| -rw-r--r-- | Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp index f49d7eb3d7..b16f3d98b1 100644 --- a/Source/Core/Core/Src/Core.cpp +++ b/Source/Core/Core/Src/Core.cpp @@ -321,6 +321,9 @@ THREAD_RETURN EmuThread(void *pArg) VideoInitialize.bWii = _CoreParameter.bWii; VideoInitialize.bUseDualCore = _CoreParameter.bUseDualCore; // Needed for Stop and Start + #ifdef _WIN32 + Plugins.FreeVideo(); + #endif Plugins.GetVideo()->Initialize(&VideoInitialize); // Call the dll // 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.bWii = _CoreParameter.bWii; // Needed for Stop and Start + #ifdef _WIN32 + Plugins.FreeDSP(); + #endif Plugins.GetDSP()->Initialize((void *)&dspInit); // Load and Init PadPlugin diff --git a/Source/Plugins/Plugin_PadSimple/Src/GUI/ConfigDlg.cpp b/Source/Plugins/Plugin_PadSimple/Src/GUI/ConfigDlg.cpp index 82d2f66915..b2b6211462 100644 --- a/Source/Plugins/Plugin_PadSimple/Src/GUI/ConfigDlg.cpp +++ b/Source/Plugins/Plugin_PadSimple/Src/GUI/ConfigDlg.cpp @@ -198,7 +198,7 @@ void ConfigDialog::CreateGUIControls() m_CheckRecording[i]->SetValue(pad[i].bRecording); 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_CheckPlayback[i]->Enable(false); m_CheckPlayback[0]->Enable(true); m_BtnSaveRecording[i]->Enable(false); m_BtnSaveRecording[0]->Enable(true); diff --git a/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp b/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp index 2c36f80942..74c07b6841 100644 --- a/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp +++ b/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp @@ -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 __Logv(int log, int v, const char *format, ...) {} @@ -120,9 +121,6 @@ const SPADStatus& PlayRecord() } 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() { |