diff options
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/dfsound/cfg.c | 4 | ||||
-rw-r--r-- | plugins/dfsound/cfg.h | 2 | ||||
-rw-r--r-- | plugins/dfsound/spu.c | 4 | ||||
-rw-r--r-- | plugins/dfxvideo/cfg.c | 4 | ||||
-rw-r--r-- | plugins/dfxvideo/cfg.h | 2 | ||||
-rw-r--r-- | plugins/dfxvideo/draw.c | 2 | ||||
-rw-r--r-- | plugins/dfxvideo/gpu.c | 4 |
7 files changed, 13 insertions, 9 deletions
diff --git a/plugins/dfsound/cfg.c b/plugins/dfsound/cfg.c index 2acb9c3..cc8eeea 100644 --- a/plugins/dfsound/cfg.c +++ b/plugins/dfsound/cfg.c @@ -84,7 +84,7 @@ void StartCfgTool(char * pCmdLine) // READ LINUX CONFIG FILE
/////////////////////////////////////////////////////////
-void ReadConfigFile(void)
+static void ReadConfigFile(void)
{
FILE *in;char t[256];int len;
char * pB, * p;
@@ -153,7 +153,7 @@ void ReadConfigFile(void) // READ CONFIG called by spu funcs
/////////////////////////////////////////////////////////
-void ReadConfig(void)
+void ReadConfigSPU(void)
{
iVolume=2;
iXAPitch=0;
diff --git a/plugins/dfsound/cfg.h b/plugins/dfsound/cfg.h index f64d6d6..14f3a8d 100644 --- a/plugins/dfsound/cfg.h +++ b/plugins/dfsound/cfg.h @@ -15,5 +15,5 @@ * *
***************************************************************************/
-void ReadConfig(void);
+void ReadConfigSPU(void);
void StartCfgTool(char * pCmdLine);
diff --git a/plugins/dfsound/spu.c b/plugins/dfsound/spu.c index c086c06..7805828 100644 --- a/plugins/dfsound/spu.c +++ b/plugins/dfsound/spu.c @@ -926,7 +926,7 @@ long CALLBACK SPUinit(void) iSPUIRQWait = 1; lastch = -1; - ReadConfig(); // read user stuff + ReadConfigSPU(); // read user stuff SetupStreams(); // prepare streaming return 0; @@ -1008,6 +1008,7 @@ void CALLBACK SPUregisterCDDAVolume(void (CALLBACK *CDDAVcallback)(unsigned shor } // COMMON PLUGIN INFO FUNCS +/* char * CALLBACK PSEgetLibName(void) { return _(libraryName); @@ -1027,3 +1028,4 @@ char * SPUgetLibInfos(void) { return _(libraryInfo); } +*/ diff --git a/plugins/dfxvideo/cfg.c b/plugins/dfxvideo/cfg.c index 9baf8bc..dbc3bc5 100644 --- a/plugins/dfxvideo/cfg.c +++ b/plugins/dfxvideo/cfg.c @@ -80,7 +80,7 @@ char * pConfigFile = NULL; size+=sprintf(pB+size, "%s = %.1f\n", name, (double)var); \ } -void ReadConfigFile() +static void ReadConfigFile() { struct stat buf; FILE *in;char t[256];int len, size; @@ -213,7 +213,7 @@ void AboutDlgProc(void) ExecCfg(args); } -void ReadConfig(void) +void ReadConfigGPU(void) { // defaults iResX=640;iResY=480; diff --git a/plugins/dfxvideo/cfg.h b/plugins/dfxvideo/cfg.h index fa259f3..d51dd5b 100644 --- a/plugins/dfxvideo/cfg.h +++ b/plugins/dfxvideo/cfg.h @@ -18,7 +18,7 @@ #ifndef _GPU_CFG_H_ #define _GPU_CFG_H_ -void ReadConfig(void); +void ReadConfigGPU(void); void WriteConfig(void); void ReadWinSizeConfig(void); diff --git a/plugins/dfxvideo/draw.c b/plugins/dfxvideo/draw.c index fe7f87a..34a8635 100644 --- a/plugins/dfxvideo/draw.c +++ b/plugins/dfxvideo/draw.c @@ -39,7 +39,7 @@ int iWinSize; int iMaintainAspect = 0; int iUseNoStretchBlt = 0; int iFastFwd = 0; -int iDebugMode = 0; +//int iDebugMode = 0; int iFVDisplay = 0; PSXPoint_t ptCursorPoint[8]; unsigned short usCursorActive = 0; diff --git a/plugins/dfxvideo/gpu.c b/plugins/dfxvideo/gpu.c index 7dd359f..20e5eef 100644 --- a/plugins/dfxvideo/gpu.c +++ b/plugins/dfxvideo/gpu.c @@ -135,6 +135,7 @@ void CALLBACK GPUdisplayFlags(unsigned long dwFlags) // some info func // stuff to make this a true PDK module //////////////////////////////////////////////////////////////////////// +/* char * CALLBACK PSEgetLibName(void) { return _(libraryName); @@ -154,6 +155,7 @@ char * GPUgetLibInfos(void) { return _(libraryInfo); } +*/ //////////////////////////////////////////////////////////////////////// // Snapshot func @@ -400,7 +402,7 @@ long GPUopen(unsigned long * disp,char * CapText,char * CfgFile) pCaptionText=CapText; - ReadConfig(); // read registry + ReadConfigGPU(); // read registry InitFPS(); |