nakee's work on dolphin events. Also get wxw out of logmanager. This commit wants your comments

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

Source/PluginSpecs/PluginSpecs.h

@@ -41,13 +41,15 @@ extern "C" {
 #endif
 
 // plugin types
-#define PLUGIN_TYPE_VIDEO		1
-#define PLUGIN_TYPE_DVD			2
-#define PLUGIN_TYPE_PAD			3
-#define PLUGIN_TYPE_AUDIO		4
-#define PLUGIN_TYPE_COMPILER            5
-#define PLUGIN_TYPE_DSP			6
-#define PLUGIN_TYPE_WIIMOTE		7
+enum PLUGIN_TYPE {
+    PLUGIN_TYPE_VIDEO = 1,
+    PLUGIN_TYPE_DVD,
+    PLUGIN_TYPE_PAD,
+    PLUGIN_TYPE_AUDIO,
+    PLUGIN_TYPE_COMPILER,
+    PLUGIN_TYPE_DSP,
+    PLUGIN_TYPE_WIIMOTE,
+};
 
 #define STATE_MODE_READ    1
 #define STATE_MODE_WRITE   2
@@ -56,7 +58,7 @@ extern "C" {
 typedef struct 
 {
 	u16 Version;		// Set to 0x0100
-	u16 Type;			// Set to PLUGIN_TYPE_DVD
+	PLUGIN_TYPE Type;	// Set to PLUGIN_TYPE_DVD
 	char Name[100];		// Name of the DLL
 } PLUGIN_INFO;
 
@@ -103,6 +105,31 @@ EXPORT void CALL DllDebugger(HWND _hParent, bool Show);
 // output:   none
 //
 EXPORT void CALL SetDllGlobals(PLUGIN_GLOBALS* _pPluginGlobals);
+// __________________________________________________________________________________________________
+
+// Function: Initialize
+// Purpose: Initialize the plugin
+// input:    Init
+// output:   none
+//
+EXPORT void CALL Initialize(void *init);
+// __________________________________________________________________________________________________
+// Function: Shutdown
+// Purpose:  This function is called when the emulator is shutting down
+//           a game allowing the dll to de-initialise.
+// input:    none
+// output:   none
+//
+EXPORT void CALL Shutdown(void);
+
+// __________________________________________________________________________________________________
+// Function: DoState
+// Purpose:  Saves/load state
+// input/output: ptr
+// input: mode
+//
+EXPORT void CALL DoState(unsigned char **ptr, int mode);
+
 #if defined(__cplusplus)
 }
 #endif

Source/PluginSpecs/pluginspecs_dsp.h

@@ -30,22 +30,6 @@ typedef struct
 	TAudioGetStreaming		pGetAudioStreaming;
 } DSPInitialize;
 
-// __________________________________________________________________________________________________
-
-// Function: DSP_Initialize
-// Purpose:
-// input:    DSPInitialize
-// output:   none
-//
-EXPORT void CALL DSP_Initialize(DSPInitialize _dspInitialize);
-// __________________________________________________________________________________________________
-// Function: DSP_Shutdown
-// Purpose:  This function is called when the emulator is shutting down
-//           a game allowing the dll to de-initialise.
-// input:    none
-// output:   none
-//
-EXPORT void CALL DSP_Shutdown(void);
 
 // __________________________________________________________________________________________________
 // Function: DSP_ReadMailboxHigh
@@ -110,13 +94,6 @@ EXPORT void CALL DSP_Update(int cycles);
 // 
 EXPORT void CALL DSP_SendAIBuffer(unsigned int address, int sample_rate);
 
-// __________________________________________________________________________________________________
-// Function: DSP_DoState
-// Purpose:  Saves/load state
-// input/output: ptr
-// input: mode
-//
-EXPORT void CALL DSP_DoState(unsigned char **ptr, int mode);
 
 #include "ExportEpilog.h"
 #endif

Source/PluginSpecs/pluginspecs_pad.h

@@ -56,24 +56,7 @@ typedef struct
 // I N T E R F A C E ///////////////////////////////////////////////////////////
 
 // __________________________________________________________________________________________________
-// Function: 
-// Purpose:  
-// input:    SPADInitialize
-// output:   none
-//
-EXPORT void CALL PAD_Initialize(SPADInitialize _PADInitialize);
-
-// __________________________________________________________________________________________________
-// Function: PAD_Shutdown
-// Purpose:  This function is called when the emulator is closing
-//           down allowing the DLL to de-initialise.
-// input:    none
-// output:   none
-//
-EXPORT void CALL PAD_Shutdown();
-
-// __________________________________________________________________________________________________
-// Function: 
+// Function:
 // Purpose:  
 // input:   
 // output:   
@@ -91,7 +74,7 @@ EXPORT void CALL PAD_Input(u8 _Key, u8 _UpDown);
 // __________________________________________________________________________________________________
 // Function: PAD_Rumble
 // Purpose:  Pad rumble!
-// input:	 PAD number, Command type (Stop=0, Rumble=1, Stop Hard=2) and strength of Rumble 
+// input:	 PAD number, Command type (Stop=0, Rumble=1, Stop Hard=2) and strength of Rumble
 // output:   none
 //
 EXPORT void CALL PAD_Rumble(u8 _numPAD, unsigned int _uType, unsigned int _uStrength);
@@ -104,13 +87,5 @@ EXPORT void CALL PAD_Rumble(u8 _numPAD, unsigned int _uType, unsigned int _uStre
 //
 EXPORT unsigned int CALL PAD_GetAttachedPads();
 
-// __________________________________________________________________________________________________
-// Function: PAD_DoState
-// Purpose:  Saves/load state
-// input/output: ptr
-// input: mode
-//
-EXPORT void CALL PAD_DoState(void *ptr, int mode);
-
 #include "ExportEpilog.h"
 #endif

Source/PluginSpecs/pluginspecs_video.h

@@ -78,14 +78,6 @@ typedef struct
 // I N T E R F A C E ////////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////////////////////////////
 
-// __________________________________________________________________________________________________
-// Function: Video_Initialize
-// Purpose:
-// input:    SVideoInitialize* - pointer because window data will be passed back
-// output:   none
-//
-EXPORT void CALL Video_Initialize(SVideoInitialize* _pvideoInitialize);
-
 // __________________________________________________________________________________________________
 // Function: Video_Prepare
 // Purpose:  This function is called from the EmuThread before the
@@ -96,15 +88,6 @@ EXPORT void CALL Video_Initialize(SVideoInitialize* _pvideoInitialize);
 //
 EXPORT void CALL Video_Prepare(void);
 
-// __________________________________________________________________________________________________
-// Function: Video_Shutdown
-// Purpose:  This function is called when the emulator is shutting down
-//  		 a game allowing the dll to de-initialise.
-// input:    none
-// output:   none
-//
-EXPORT void CALL Video_Shutdown(void);
-
 // __________________________________________________________________________________________________
 // Function: Video_ExecuteFifoBuffer
 // Purpose:  This function is called if data is inside the fifo-buffer
@@ -147,14 +130,6 @@ EXPORT void CALL Video_EnterLoop(void);
 //
 EXPORT void CALL Video_AddMessage(const char* pstr, unsigned int milliseconds);
 
-// __________________________________________________________________________________________________
-// Function: Video_DoState
-// Purpose:  Saves/Loads the current video data state (depends on mode parameter)
-// input/output: ptr
-// input: mode
-//
-EXPORT void CALL Video_DoState(unsigned char **ptr, int mode);
-
 // __________________________________________________________________________________________________
 // Function: Video_Stop
 // Purpose:  Stop the video plugin before shutdown

Source/PluginSpecs/pluginspecs_wiimote.h

@@ -46,23 +46,6 @@ typedef struct
 // I N T E R F A C E ////////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////////////////////////////
 
-// __________________________________________________________________________________________________
-// Function: 
-// Purpose:  
-// input:    WiimoteInitialize
-// output:   If at least one real Wiimote was found or not
-//
-EXPORT bool CALL Wiimote_Initialize(SWiimoteInitialize _WiimoteInitialize);
-
-// __________________________________________________________________________________________________
-// Function: Wiimote_Shutdown
-// Purpose:  This function is called when the emulator is closing
-//           down allowing the DLL to de-initialise.
-// input:    none
-// output:   none
-//
-EXPORT void CALL Wiimote_Shutdown();
-
 // __________________________________________________________________________________________________
 // Function: Wiimote_Output
 // Purpose:  An L2CAP packet is passed from the Core to the Wiimote,
@@ -97,14 +80,6 @@ EXPORT void CALL Wiimote_Update();
 //
 EXPORT unsigned int CALL Wiimote_GetAttachedControllers();
 
-// __________________________________________________________________________________________________
-// Function: Wiimote_DoState
-// Purpose:  Saves/load state
-// input/output: ptr
-// input: mode
-//
-EXPORT void CALL Wiimote_DoState(void *ptr, int mode);
-
 #include "ExportEpilog.h"
 
 #endif	//_WIIMOTE_H_INCLUDED__