farewell to the past...

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@47663 e17a0e51-4ae3-4d35-97c3-1a29b211df97

1 files changed, 9 insertions, 29 deletions

diff --git a/libpcsxcore/plugins.h b/libpcsxcore/plugins.h
index d3c64f91..82c76f75 100644
--- a/libpcsxcore/plugins.h
+++ b/libpcsxcore/plugins.h
@@ -19,10 +19,10 @@
 

 #ifndef __PLUGINS_H__

 #define __PLUGINS_H__

-
-#ifdef __cplusplus
-extern "C" {
-#endif
+

+#ifdef __cplusplus

+extern "C" {

+#endif

 

 #include "psxcommon.h"

 

@@ -46,7 +46,7 @@ typedef long (CALLBACK* PADopen)(HWND);
 typedef long (CALLBACK* NETopen)(HWND);

 

 #endif

-
+

 #include "spu.h"

 

 #include "psemu_plugin_defs.h"

@@ -147,7 +147,7 @@ struct SubQ {
 	char res1[72];

 };

 typedef unsigned char* (CALLBACK* CDRgetBufferSub)(void);

-
+

 // CD-ROM function pointers

 extern CDRinit               CDR_init;

 extern CDRshutdown           CDR_shutdown;

@@ -172,16 +172,6 @@ typedef long (CALLBACK* SPUinit)(void);
 typedef long (CALLBACK* SPUshutdown)(void);	

 typedef long (CALLBACK* SPUclose)(void);			

 typedef void (CALLBACK* SPUplaySample)(unsigned char);		

-typedef void (CALLBACK* SPUstartChannels1)(unsigned short);	

-typedef void (CALLBACK* SPUstartChannels2)(unsigned short);

-typedef void (CALLBACK* SPUstopChannels1)(unsigned short);	

-typedef void (CALLBACK* SPUstopChannels2)(unsigned short);	

-typedef void (CALLBACK* SPUputOne)(uint32_t,unsigned short);			

-typedef unsigned short (CALLBACK* SPUgetOne)(uint32_t);

-typedef void (CALLBACK* SPUsetAddr)(unsigned char, unsigned short);

-typedef void (CALLBACK* SPUsetPitch)(unsigned char, unsigned short);

-typedef void (CALLBACK* SPUsetVolumeL)(unsigned char, short);

-typedef void (CALLBACK* SPUsetVolumeR)(unsigned char, short);

 typedef void (CALLBACK* SPUwriteRegister)(unsigned long, unsigned short);

 typedef unsigned short (CALLBACK* SPUreadRegister)(unsigned long);

 typedef void (CALLBACK* SPUwriteDMA)(unsigned short);

@@ -215,16 +205,6 @@ extern SPUtest             SPU_test;
 extern SPUopen             SPU_open;

 extern SPUclose            SPU_close;

 extern SPUplaySample       SPU_playSample;

-extern SPUstartChannels1   SPU_startChannels1;

-extern SPUstartChannels2   SPU_startChannels2;

-extern SPUstopChannels1    SPU_stopChannels1;

-extern SPUstopChannels2    SPU_stopChannels2;

-extern SPUputOne           SPU_putOne;

-extern SPUgetOne           SPU_getOne;

-extern SPUsetAddr          SPU_setAddr;

-extern SPUsetPitch         SPU_setPitch;

-extern SPUsetVolumeL       SPU_setVolumeL;

-extern SPUsetVolumeR       SPU_setVolumeR;

 extern SPUwriteRegister    SPU_writeRegister;

 extern SPUreadRegister     SPU_readRegister;

 extern SPUwriteDMA         SPU_writeDMA;

@@ -333,8 +313,8 @@ extern NETkeypressed         NET_keypressed;
 void CALLBACK clearDynarec(void);

 

 extern char cdrfilename[MAXPATHLEN]; // FIXME: cleanup

-
-#ifdef __cplusplus
-}
+

+#ifdef __cplusplus

+}

 #endif

 #endif