ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

forgot include 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1986 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2009-01-23 00:15:57 +00:00
parent cb9baf6d07
commit 8a87001778
4 changed files with 61 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/Core/Src/InputManager.h
View File

@ -1,5 +1,10 @@
#ifndef INPUTMANAGER_H #ifndef INPUTMANAGER_H
#define INPUTMANAGER_H #define INPUTMANAGER_H
#include "Common.h"
#if defined HAVE_SDL && HAVE_SDL
#include <SDL.h>
#endif
class InputManager { class InputManager {

2
Source/Core/Core/Src/PluginManager.cpp
View File

@ -257,9 +257,11 @@ void CPluginManager::OpenConfig(void* _Parent, const char *_rFilename)
{ {
Common::CPlugin *plugin = new Common::CPlugin(_rFilename); Common::CPlugin *plugin = new Common::CPlugin(_rFilename);
m_InputManager->Init();
plugin->SetGlobals(m_PluginGlobals); plugin->SetGlobals(m_PluginGlobals);
plugin->Config((HWND)_Parent); plugin->Config((HWND)_Parent);
delete plugin; delete plugin;
m_InputManager->Shutdown();
} }
// ---------------------------------------- // ----------------------------------------

59
Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp
View File

@ -258,13 +258,10 @@ int Search_Devices()
if (joyinfo) if (joyinfo)
{ {
delete [] joyinfo; delete [] joyinfo;
joyinfo = new CONTROLLER_INFO [numjoy];
}
else
{
joyinfo = new CONTROLLER_INFO [numjoy];
} }
joyinfo = new CONTROLLER_INFO [numjoy];
// Warn the user if no PadMapping are detected // Warn the user if no PadMapping are detected
if (numjoy == 0) if (numjoy == 0)
{ {
@ -312,33 +309,35 @@ int Search_Devices()
Called from: The Dolphin Core, ConfigBox::OnClose() */ Called from: The Dolphin Core, ConfigBox::OnClose() */
void Shutdown() void Shutdown()
{ {
//Console::Print("Shutdown: %i\n", SDL_WasInit(0)); //Console::Print("Shutdown: %i\n", SDL_WasInit(0));
if (PadMapping[0].enabled && SDL_JoystickOpened(PadMapping[0].ID)) if (PadMapping[0].enabled && SDL_JoystickOpened(PadMapping[0].ID))
SDL_JoystickClose(joystate[0].joy); SDL_JoystickClose(joystate[0].joy);
if (PadMapping[1].enabled && SDL_JoystickOpened(PadMapping[1].ID)) if (PadMapping[1].enabled && SDL_JoystickOpened(PadMapping[1].ID))
SDL_JoystickClose(joystate[1].joy); SDL_JoystickClose(joystate[1].joy);
if (PadMapping[2].enabled && SDL_JoystickOpened(PadMapping[2].ID)) if (PadMapping[2].enabled && SDL_JoystickOpened(PadMapping[2].ID))
SDL_JoystickClose(joystate[2].joy); SDL_JoystickClose(joystate[2].joy);
if (PadMapping[3].enabled && SDL_JoystickOpened(PadMapping[3].ID)) if (PadMapping[3].enabled && SDL_JoystickOpened(PadMapping[3].ID))
SDL_JoystickClose(joystate[3].joy); SDL_JoystickClose(joystate[3].joy);
#ifdef _DEBUG #ifdef _DEBUG
DEBUG_QUIT(); DEBUG_QUIT();
#endif #endif
if(joyinfo) {
delete [] joyinfo; delete [] joyinfo;
joyinfo = NULL; joyinfo = NULL;
}
emulator_running = false;
emulator_running = false;
#ifdef _WIN32
#ifdef USE_RUMBLE_DINPUT_HACK #ifdef _WIN32
FreeDirectInput(); #ifdef USE_RUMBLE_DINPUT_HACK
#endif FreeDirectInput();
#elif defined(__linux__) #endif
close(fd); #elif defined(__linux__)
#endif close(fd);
#endif
} }

48
Source/Plugins/Plugin_nJoy_Testing/Src/nJoy.cpp
View File

@ -218,30 +218,32 @@ void Initialize(void *init)
// ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯ // ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
void Shutdown() void Shutdown()
{ {
if(joysticks[0].enabled) if(joysticks[0].enabled)
SDL_JoystickClose(joystate[0].joy); SDL_JoystickClose(joystate[0].joy);
if(joysticks[1].enabled) if(joysticks[1].enabled)
SDL_JoystickClose(joystate[1].joy); SDL_JoystickClose(joystate[1].joy);
if(joysticks[2].enabled) if(joysticks[2].enabled)
SDL_JoystickClose(joystate[2].joy); SDL_JoystickClose(joystate[2].joy);
if(joysticks[3].enabled) if(joysticks[3].enabled)
SDL_JoystickClose(joystate[3].joy); SDL_JoystickClose(joystate[3].joy);
#ifdef _DEBUG #ifdef _DEBUG
DEBUG_QUIT(); DEBUG_QUIT();
#endif #endif
if (joyinfo) {
delete [] joyinfo; delete [] joyinfo;
joyinfo = NULL;
emulator_running = FALSE; }
emulator_running = FALSE;
#ifdef _WIN32
#ifdef USE_RUMBLE_DINPUT_HACK #ifdef _WIN32
FreeDirectInput(); #ifdef USE_RUMBLE_DINPUT_HACK
#endif FreeDirectInput();
#elif defined(__linux__) #endif
close(fd); #elif defined(__linux__)
#endif close(fd);
#endif
} }
void DoState(unsigned char **ptr, int mode) { void DoState(unsigned char **ptr, int mode) {