Merge the pad plugin into Dolphin. Since there's only one plugin left under active development, and it's awesome, we no longer have a need for a pad plugin mechanism.

In the future if we merge wiimote too, this will bring the advantage that the two will be able to cooperate, to no longer fight over control of input devices which can sometimes cause problems.

Thanks shuffle2 for the patience.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5670 8ced0084-cf51-0410-be5f-012b33b47a6e

SConstruct

@@ -71,7 +71,6 @@ dirs = [
     'Source/Plugins/Plugin_VideoSoftware/Src',
     'Source/Plugins/Plugin_DSP_HLE/Src',
     'Source/Plugins/Plugin_DSP_LLE/Src',
-    'Source/Plugins/Plugin_GCPadNew/Src',
     'Source/Plugins/Plugin_Wiimote/Src',
     'Source/Plugins/Plugin_WiimoteNew/Src/',
     'Source/Core/DolphinWX/Src',

Source/Core/Common/Common.vcproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="Common"
 	ProjectGUID="{C573CAF7-EE6A-458E-8049-16C0BF34C2E9}"
 	RootNamespace="Common"
@@ -471,14 +471,6 @@
 				RelativePath=".\Src\PluginDSP.h"
 				>
 			</File>
-			<File
-				RelativePath=".\Src\PluginPAD.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\Src\PluginPAD.h"
-				>
-			</File>
 			<File
 				RelativePath=".\Src\PluginVideo.cpp"
 				>

Source/Core/Common/Src/CommonPaths.h

@@ -132,7 +132,6 @@
 // Plugin files
 #define DEFAULT_GFX_PLUGIN	PLUGIN_PREFIX "Plugin_VideoOGL" PLUGIN_SUFFIX
 #define DEFAULT_DSP_PLUGIN	PLUGIN_PREFIX "Plugin_DSP_HLE" PLUGIN_SUFFIX
-#define DEFAULT_PAD_PLUGIN	PLUGIN_PREFIX "Plugin_GCPadNew" PLUGIN_SUFFIX
 #define DEFAULT_WIIMOTE_PLUGIN	PLUGIN_PREFIX "Plugin_Wiimote" PLUGIN_SUFFIX
 
 // Sys files

Source/Core/Common/Src/PluginPAD.cpp

@@ -1,40 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// 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 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#include "PluginPAD.h"
-
-namespace Common
-{
-
-PluginPAD::PluginPAD(const char *_Filename) : CPlugin(_Filename), validPAD(false)
-{  
-	PAD_GetStatus = reinterpret_cast<TPAD_GetStatus>
-		(LoadSymbol("PAD_GetStatus"));
-	PAD_Input = reinterpret_cast<TPAD_Input>
-		(LoadSymbol("PAD_Input"));
-	PAD_Rumble = reinterpret_cast<TPAD_Rumble>
-		(LoadSymbol("PAD_Rumble"));
-
-	if ((PAD_GetStatus != 0) &&
-		(PAD_Input != 0) &&
-		(PAD_Rumble != 0))
-		validPAD = true;
-}
-
-PluginPAD::~PluginPAD() {}
-
-} // Namespace

Source/Core/Common/Src/PluginPAD.h

@@ -1,47 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// 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 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#ifndef _PLUGINPAD_H_
-#define _PLUGINPAD_H_
-
-#include "pluginspecs_pad.h"
-#include "Plugin.h"
-
-namespace Common {
-
-typedef void (__cdecl* TPAD_GetStatus)(u8, SPADStatus*);
-typedef void (__cdecl* TPAD_Input)(u16, u8);
-typedef void (__cdecl* TPAD_Rumble)(u8, unsigned int, unsigned int);
-
-class PluginPAD : public CPlugin {
-public:
-	PluginPAD(const char *_Filename);
-	virtual ~PluginPAD();
-	virtual bool IsValid() {return validPAD;};
-
-	TPAD_GetStatus PAD_GetStatus;
-	TPAD_Input PAD_Input;
-	TPAD_Rumble PAD_Rumble;
-
-private:
-	bool validPAD;
-
-};
-
-}  // namespace
-
-#endif // _PLUGINPAD_H_

Source/Core/Common/Src/SConscript

@@ -26,7 +26,6 @@ files = [
 	"PluginDSP.cpp",
 	"PluginWiimote.cpp",
 	"PluginVideo.cpp",
-	"PluginPAD.cpp",
 	"SDCardUtil.cpp",
 	"StringUtil.cpp",
 	"SymbolDB.cpp",

Source/Core/Core/Core.vcproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="Core"
 	ProjectGUID="{F0B874CB-4476-4199-9315-8343D05AE684}"
 	RootNamespace="Core"
@@ -773,6 +773,26 @@
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="GCPad"
+				>
+				<File
+					RelativePath=".\Src\HW\GCPad.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Src\HW\GCPad.h"
+					>
+				</File>
+				<File
+					RelativePath=".\Src\HW\GCPadEmu.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Src\HW\GCPadEmu.h"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="PowerPC"

Source/Core/Core/Src/ConfigManager.cpp

@@ -168,7 +168,6 @@ void SConfig::SaveSettings()
 	// Plugins
 	ini.Set("Core", "GFXPlugin",	m_LocalCoreStartupParameter.m_strVideoPlugin);
 	ini.Set("Core", "DSPPlugin",	m_LocalCoreStartupParameter.m_strDSPPlugin);
-	ini.Set("Core", "PadPlugin",	m_LocalCoreStartupParameter.m_strPadPlugin);
 	ini.Set("Core", "WiiMotePlugin",m_LocalCoreStartupParameter.m_strWiimotePlugin);
 
 	ini.Save(File::GetUserPath(F_DOLPHINCONFIG_IDX));
@@ -185,7 +184,6 @@ void SConfig::LoadSettings()
 	// Hard coded defaults
 	m_DefaultGFXPlugin = DEFAULT_GFX_PLUGIN;
 	m_DefaultDSPPlugin = DEFAULT_DSP_PLUGIN;
-	m_DefaultPADPlugin = DEFAULT_PAD_PLUGIN;
 	m_DefaultWiiMotePlugin = DEFAULT_WIIMOTE_PLUGIN;
 
 	// General
@@ -296,10 +294,7 @@ void SConfig::LoadSettings()
 		// Plugins
 		ini.Get("Core", "GFXPlugin",  &m_LocalCoreStartupParameter.m_strVideoPlugin,	m_DefaultGFXPlugin.c_str());
 		ini.Get("Core", "DSPPlugin",  &m_LocalCoreStartupParameter.m_strDSPPlugin,		m_DefaultDSPPlugin.c_str());
-		ini.Get("Core", "PadPlugin", &m_LocalCoreStartupParameter.m_strPadPlugin, m_DefaultPADPlugin.c_str());
 		ini.Get("Core", "WiiMotePlugin", &m_LocalCoreStartupParameter.m_strWiimotePlugin, m_DefaultWiiMotePlugin.c_str());
-
-
 	}
 
 	m_SYSCONF = new SysConf();

Source/Core/Core/Src/ConfigManager.h

@@ -49,7 +49,6 @@ struct SConfig
 	// hard coded default plugins ...
 	std::string m_DefaultGFXPlugin;
 	std::string m_DefaultDSPPlugin;
-	std::string m_DefaultPADPlugin;
 	std::string m_DefaultWiiMotePlugin;
 
 	// name of the last used filename

Source/Core/Core/Src/Core.cpp

@@ -39,6 +39,7 @@
 #include "HW/ProcessorInterface.h"
 #include "HW/GPFifo.h"
 #include "HW/CPU.h"
+#include "HW/GCPad.h"
 #include "HW/HW.h"
 #include "HW/DSP.h"
 #include "HW/GPFifo.h"
@@ -382,17 +383,7 @@ THREAD_RETURN EmuThread(void *pArg)
 
 	Plugins.GetDSP()->Initialize((void *)&dspInit);
 	
-	// Load and init GCPadPlugin
-	SPADInitialize PADInitialize;
-	PADInitialize.hWnd		= g_pWindowHandle;
-#if defined(HAVE_X11) && HAVE_X11
-	PADInitialize.pXWindow	= g_pXWindow;
-#endif
-	PADInitialize.pLog		= Callback_PADLog;
-	PADInitialize.pRendererHasFocus	= Callback_RendererHasFocus;
-	// This is may be needed to avoid a SDL problem
-	//Plugins.FreeWiimote();
-	Plugins.GetPad()->Initialize(&PADInitialize);
+	GCPad_Init(g_pWindowHandle);
 
 	// Load and Init WiimotePlugin - only if we are booting in wii mode	
 	if (_CoreParameter.bWii)
@@ -521,7 +512,9 @@ THREAD_RETURN EmuThread(void *pArg)
 	if (_CoreParameter.bCPUThread)
 		Plugins.ShutdownVideoPlugin();
 
+	GCPad_Deinit();
 	Plugins.ShutdownPlugins();
+
 	NOTICE_LOG(CONSOLE, "%s", StopMessage(false, "Plugins shutdown").c_str());
 
 	NOTICE_LOG(CONSOLE, "%s", StopMessage(true, "Main thread stopped").c_str());

Source/Core/Core/Src/CoreParameter.h

@@ -118,7 +118,6 @@ struct SCoreStartupParameter
 
 	// files
 	std::string m_strVideoPlugin;
-	std::string m_strPadPlugin;
 	std::string m_strDSPPlugin;
 	std::string m_strWiimotePlugin;
 

Source/Core/Core/Src/HW/GCPad.cpp

@@ -0,0 +1,159 @@
+// Copyright (C) 2010 Dolphin Project.
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, version 2.0.
+
+// 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 2.0 for more details.
+
+// A copy of the GPL 2.0 should have been included with the program.
+// If not, see http://www.gnu.org/licenses/
+
+// Official SVN repository and contact information can be found at
+// http://code.google.com/p/dolphin-emu/
+
+#include "Common.h"
+#include "pluginspecs_pad.h"
+
+#include "ControllerInterface/ControllerInterface.h"
+#include "GCPadEmu.h"
+
+#include "../../InputCommon/Src/InputConfig.h"
+
+InputPlugin g_plugin("GCPadNew", "Pad", "GCPad");
+
+InputPlugin *PAD_GetPlugin() {
+	return &g_plugin;
+}
+
+void GCPad_Deinit()
+{
+	// i realize i am checking IsInit() twice, just too lazy to change it
+	if ( g_plugin.controller_interface.IsInit() )
+	{
+		std::vector<ControllerEmu*>::const_iterator
+			i = g_plugin.controllers.begin(),
+			e = g_plugin.controllers.end();
+		for ( ; i!=e; ++i )
+			delete *i;
+		g_plugin.controllers.clear();
+
+		g_plugin.controller_interface.DeInit();
+	}
+}
+
+// if plugin isn't initialized, init and load config
+void GCPad_Init( void* const hwnd )
+{
+	// i realize i am checking IsInit() twice, just too lazy to change it
+	if ( false == g_plugin.controller_interface.IsInit() )
+	{
+		// add 4 gcpads
+		for ( unsigned int i = 0; i<4; ++i )
+			g_plugin.controllers.push_back( new GCPad( i ) );
+		
+		// needed for Xlib
+		g_plugin.controller_interface.SetHwnd(hwnd);
+		g_plugin.controller_interface.Init();
+
+		// load the saved controller config
+		if (false == g_plugin.LoadConfig())
+		{
+			// load default config for pad 1
+			g_plugin.controllers[0]->LoadDefaults();
+
+			// kinda silly, set default device(all controls) to first one found in ControllerInterface
+			// should be the keyboard device
+			if (g_plugin.controller_interface.Devices().size())
+			{
+				g_plugin.controllers[0]->default_device.FromDevice(g_plugin.controller_interface.Devices()[0]);
+				g_plugin.controllers[0]->UpdateDefaultDevice();
+			}
+		}
+
+		// update control refs
+		std::vector<ControllerEmu*>::const_iterator
+			i = g_plugin.controllers.begin(),
+			e = g_plugin.controllers.end();
+		for ( ; i!=e; ++i )
+			(*i)->UpdateReferences( g_plugin.controller_interface );
+
+	}
+}
+
+// I N T E R F A C E 
+
+// __________________________________________________________________________________________________
+// Function:
+// Purpose:  
+// input:   
+// output:   
+//
+void PAD_GetStatus(u8 _numPAD, SPADStatus* _pPADStatus)
+{
+	memset( _pPADStatus, 0, sizeof(*_pPADStatus) );
+	_pPADStatus->err = PAD_ERR_NONE;
+	// wtf is this?	
+	_pPADStatus->button |= PAD_USE_ORIGIN;
+
+	// try lock
+	if ( false == g_plugin.controls_crit.TryEnter() )
+	{
+		// if gui has lock (messing with controls), skip this input cycle
+		// center axes and return
+		memset( &_pPADStatus->stickX, 0x80, 4 );
+		return;
+	}
+
+	// if we are on the next input cycle, update output and input
+	// if we can get a lock
+	static int _last_numPAD = 4;
+	if ( _numPAD <= _last_numPAD && g_plugin.interface_crit.TryEnter() )
+	{
+		g_plugin.controller_interface.UpdateOutput();
+		g_plugin.controller_interface.UpdateInput();
+		g_plugin.interface_crit.Leave();
+	}
+	_last_numPAD = _numPAD;
+	
+	// get input
+	((GCPad*)g_plugin.controllers[ _numPAD ])->GetInput( _pPADStatus );
+
+	// leave
+	g_plugin.controls_crit.Leave();
+
+}
+
+// __________________________________________________________________________________________________
+// Function: Send keyboard input to the plugin
+// Purpose:  
+// input:   The key and if it's pressed or released
+// output:  None
+//
+void PAD_Input(u16 _Key, u8 _UpDown)
+{
+	// nofin
+}
+
+// __________________________________________________________________________________________________
+// Function: PAD_Rumble
+// Purpose:  Pad rumble!
+// input:	 PAD number, Command type (Stop=0, Rumble=1, Stop Hard=2) and strength of Rumble
+// output:   none
+//
+void PAD_Rumble(u8 _numPAD, unsigned int _uType, unsigned int _uStrength)
+{
+	// enter
+	if ( g_plugin.controls_crit.TryEnter() )
+	{
+		// TODO: this has potential to not stop rumble if user is messing with GUI at the perfect time
+		// set rumble
+		((GCPad*)g_plugin.controllers[ _numPAD ])->SetOutput( 1 == _uType && _uStrength > 2 );
+
+		// leave
+		g_plugin.controls_crit.Leave();
+	}
+}

Source/Core/Core/Src/HW/GCPadEmu.cpp

@@ -16,6 +16,7 @@
 // http://code.google.com/p/dolphin-emu/
 
 #include "GCPadEmu.h"
+#include "../Host.h"
 
 const u16 button_bitmasks[] =
 {
@@ -93,7 +94,7 @@ std::string GCPad::GetName() const
 void GCPad::GetInput( SPADStatus* const pad )
 {
 	// if window has focus or background input enabled
-	if (g_PADInitialize->pRendererHasFocus() || m_options[0].settings[0]->value )
+	if (Host_RendererHasFocus() || m_options[0].settings[0]->value )
 	{
 		// buttons
 		m_buttons->GetState( &pad->button, button_bitmasks );
@@ -120,7 +121,7 @@ void GCPad::GetInput( SPADStatus* const pad )
 void GCPad::SetOutput( const bool on )
 {
 	// only rumble if window has focus or background input is enabled
-	m_rumble->controls[0]->control_ref->State( on && (g_PADInitialize->pRendererHasFocus() || m_options[0].settings[0]->value) );
+	m_rumble->controls[0]->control_ref->State( on && (Host_RendererHasFocus() || m_options[0].settings[0]->value) );
 }
 
 void GCPad::LoadDefaults()

Source/Core/Core/Src/HW/GCPadEmu.h

@@ -18,9 +18,9 @@
 #ifndef _CONEMU_GCPAD_H_
 #define _CONEMU_GCPAD_H_
 
-#include <ControllerEmu.h>
+#include <string>
 
-extern SPADInitialize *g_PADInitialize;
+#include "ControllerEmu.h"
 
 class GCPad : public ControllerEmu
 {
@@ -48,5 +48,4 @@ private:
 
 };
 
-
 #endif

Source/Core/Core/Src/HW/SI_DeviceAMBaseboard.cpp

@@ -15,10 +15,14 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
+#include "pluginspecs_pad.h"
+
 #include "SI.h"
 #include "SI_Device.h"
 #include "SI_DeviceAMBaseboard.h"
 
+#include "GCPad.h"
+
 #include "../PluginManager.h" // for pad state
 
 // where to put baseboard debug
@@ -144,8 +148,7 @@ int CSIDevice_AMBaseboard::RunBuffer(u8* _pBuffer, int _iLength)
 							DEBUG_LOG(AMBASEBOARDDEBUG, "GC-AM: CMD 10, %02x (READ STATUS&SWITCHES)", ptr(1));
 							SPADStatus PadStatus;
 							memset(&PadStatus, 0 ,sizeof(PadStatus));
-							CPluginManager::GetInstance().GetPad()
-								->PAD_GetStatus(ISIDevice::m_iDeviceNumber, &PadStatus);
+							PAD_GetStatus(ISIDevice::m_iDeviceNumber, &PadStatus);
 							res[resp++] = 0x10;
 							res[resp++] = 0x2;
 							int d10_0 = 0xdf;
@@ -310,8 +313,7 @@ int CSIDevice_AMBaseboard::RunBuffer(u8* _pBuffer, int _iLength)
 										for (i=0; i<nr_players; ++i)
 										{
 											SPADStatus PadStatus;
-											CPluginManager::GetInstance().GetPad()
-												->PAD_GetStatus(i, &PadStatus);
+											PAD_GetStatus(i, &PadStatus);
 											unsigned char player_data[2] = {0,0};
 											if (PadStatus.button & PAD_BUTTON_START)
 												player_data[0] |= 0x80;
@@ -348,8 +350,7 @@ int CSIDevice_AMBaseboard::RunBuffer(u8* _pBuffer, int _iLength)
 										int slots = *jvs_io++;
 										msg.addData(1);
 										SPADStatus PadStatus;
-										CPluginManager::GetInstance().GetPad()
-											->PAD_GetStatus(0, &PadStatus);
+										PAD_GetStatus(0, &PadStatus);
 										while (slots--)
 										{
 											msg.addData(0);

Source/Core/Core/Src/HW/SI_DeviceGCController.cpp

@@ -25,6 +25,8 @@
 #include "EXI_Device.h"
 #include "EXI_DeviceMic.h"
 
+#include "GCPad.h"
+
 #include "../OnFrame.h"
 
 #include "Timer.h"
@@ -128,8 +130,8 @@ bool CSIDevice_GCController::GetData(u32& _Hi, u32& _Low)
 {
 	SPADStatus PadStatus;
 	memset(&PadStatus, 0, sizeof(PadStatus));
-	Common::PluginPAD* pad = CPluginManager::GetInstance().GetPad();
-	pad->PAD_GetStatus(ISIDevice::m_iDeviceNumber, &PadStatus);
+
+	PAD_GetStatus(ISIDevice::m_iDeviceNumber, &PadStatus);
 
 	u32 netValues[2] = {0};
 	int NetPlay = 2;
@@ -258,7 +260,6 @@ bool CSIDevice_GCController::GetData(u32& _Hi, u32& _Low)
 // SendCommand
 void CSIDevice_GCController::SendCommand(u32 _Cmd, u8 _Poll)
 {
-	Common::PluginPAD* pad = CPluginManager::GetInstance().GetPad();
 	UCommand command(_Cmd);
 
 	switch (command.Command)
@@ -280,8 +281,7 @@ void CSIDevice_GCController::SendCommand(u32 _Cmd, u8 _Poll)
 #endif
 
 			if (numPAD < 4)
-				if (pad->PAD_Rumble)
-					pad->PAD_Rumble(numPAD, uType, uStrength);
+				PAD_Rumble(numPAD, uType, uStrength);
 
 			if (!_Poll)
 			{

Source/Core/Core/Src/HW/SI_DeviceGCController.h

@@ -20,6 +20,7 @@
 
 #include "../PluginManager.h"
 #include "SI_Device.h"
+#include "pluginspecs_pad.h"
 
 
 // standard gamecube controller
@@ -102,7 +103,7 @@ public:
 	virtual int RunBuffer(u8* _pBuffer, int _iLength);
 
 	// Send and Receive pad input from network
-	static int NetPlay_GetInput(u8 numPAD, SPADStatus, u32 *PADStatus);
+	static int NetPlay_GetInput(u8 numPAD, SPADStatus status, u32 *PADStatus);
 	static u8 NetPlay_GetPadNum(u8 numPAD);
 
 	// Return true on new data

Source/Core/Core/Src/OnFrame.cpp

@@ -250,7 +250,6 @@ void EndRecordingInput()
 	// header.author;
 	// header.videoPlugin; 
 	// header.audioPlugin;
-	// header.padPlugin;
 	
 	fwrite(&header, sizeof(DTMHeader), 1, g_recordfd);
 	

Source/Core/Core/Src/OnFrame.h

@@ -80,7 +80,6 @@ typedef struct {
     u8  videoPlugin[16];    // UTF-8 representation of the video plugin
     u8  audioPlugin[16];    // UTF-8 representation of the audio plugin
     u8  padPlugin[16];      // UTF-8 representation of the input plugin
-    
 
     bool padding[102];      // Padding to align the header to 1024 bits
 

Source/Core/Core/Src/PluginManager.cpp

@@ -70,7 +70,6 @@ CPluginManager::CPluginManager()
 	// Set initial values to NULL.
 	m_video = NULL;
 	m_dsp = NULL;
-	m_pad = NULL;
 	m_wiimote = NULL;
 }
 
@@ -82,12 +81,6 @@ CPluginManager::~CPluginManager()
 	delete m_PluginGlobals;
 	delete m_dsp;
 
-	if (m_pad)
-	{
-		delete m_pad;
-		m_pad = NULL;
-	}
-
 	if (m_wiimote)
 	{
 		m_wiimote->Shutdown();
@@ -124,18 +117,6 @@ bool CPluginManager::InitPlugins()
 		return false;
 	}
 
-	// Init pad
-	// Check that the plugin has a name
-	if (!m_params->m_strPadPlugin.empty())
-		GetPad();
-
-	// Check that GetPad succeeded
-	if (!m_pad)
-	{
-		PanicAlert("Can't init PAD Plugin");
-		return false;
-	}
-
 	// Init wiimote
 	if (m_params->bWii)
 	{
@@ -156,12 +137,6 @@ bool CPluginManager::InitPlugins()
 // for an explanation about the current LoadLibrary() and FreeLibrary() behavior.
 void CPluginManager::ShutdownPlugins()
 {
-	if (m_pad)
-	{
-		m_pad->Shutdown();
-		FreePad();
-	}
-
 	if (m_wiimote)
 	{
 		m_wiimote->Shutdown();
@@ -246,7 +221,7 @@ void CPluginManager::GetPluginInfo(CPluginInfo *&info, std::string Filename)
 void *CPluginManager::LoadPlugin(const char *_rFilename)
 {
 	if (!File::Exists((File::GetPluginsDirectory() + _rFilename).c_str())) {
-		PanicAlert("Error loading %s: can't find file", _rFilename);
+		PanicAlert("Error loading plugin %s: can't find file. Please re-select your plugins.", _rFilename);
 		return NULL;
 	}
 	/* Avoid calling LoadLibrary() again and instead point to the plugin info that we found when
@@ -271,10 +246,6 @@ void *CPluginManager::LoadPlugin(const char *_rFilename)
 		plugin = new Common::PluginDSP(_rFilename);
 		break;
 	
-	case PLUGIN_TYPE_PAD:
-		plugin = new Common::PluginPAD(_rFilename);
-		break;
-	
 	case PLUGIN_TYPE_WIIMOTE:
 		plugin = new Common::PluginWiimote(_rFilename);
 		break;
@@ -347,27 +318,11 @@ void CPluginManager::ScanForPlugins()
 
 
 /* Create or return the already created plugin pointers. This will be called
-   often for the Pad and Wiimote from the SI_.cpp files. And often for the DSP
-   from the DSP files.
+   often for Wiimote. And often for the DSP from the DSP files.
    
    We don't need to check if [Plugin]->IsValid() here because it will not be set by LoadPlugin()
    if it's not valid.
    */
-// ------------
-Common::PluginPAD *CPluginManager::GetPad()
-{
-	if (m_pad != NULL)
-	{
-		if (m_pad->GetFilename() == m_params->m_strPadPlugin)
-			return m_pad;
-		else
-			FreePad();
-	}
-	
-	// Else load a new plugin
-	m_pad = (Common::PluginPAD*)LoadPlugin(m_params->m_strPadPlugin.c_str());
-	return m_pad;
-}
 
 Common::PluginWiimote *CPluginManager::GetWiimote()
 {
@@ -435,12 +390,6 @@ void CPluginManager::FreeDSP()
 	m_dsp = NULL;
 }
 
-void CPluginManager::FreePad()
-{
-	delete m_pad;
-	m_pad = NULL;
-}
-
 void CPluginManager::FreeWiimote()
 {
 	delete m_wiimote;
@@ -451,11 +400,6 @@ void CPluginManager::EmuStateChange(PLUGIN_EMUSTATE newState)
 {
 	GetVideo()->EmuStateChange(newState);
 	GetDSP()->EmuStateChange(newState);
-	//TODO: OpenConfig below only uses GetXxx(0) aswell
-	//      Would we need to call all plugins?
-	//      If yes, how would one check if the plugin was not
-	//      just created by GetXxx(idx) because there was none?
-	GetPad()->EmuStateChange(newState);
 	GetWiimote()->EmuStateChange(newState);
 }
 
@@ -481,9 +425,6 @@ void CPluginManager::OpenConfig(void* _Parent, const char *_rFilename, PLUGIN_TY
 	case PLUGIN_TYPE_DSP:
 		GetDSP()->Config((HWND)_Parent);
 		break;
-	case PLUGIN_TYPE_PAD:
-		GetPad()->Config((HWND)_Parent);
-		break;
 	case PLUGIN_TYPE_WIIMOTE:
 		GetWiimote()->Config((HWND)_Parent);
 		break;