diff options
| author | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2009-11-01 05:53:44 +0000 |
|---|---|---|
| committer | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2009-11-01 05:53:44 +0000 |
| commit | 161fa8af66c57aa6c29f6efa415322b36798ef8f (patch) | |
| tree | 4ff350370c8fcaac99c808822c57a1a1d30eef0b /plugins | |
| parent | 8549d0c54350ee4b08e979c4712f313aba58ff3f (diff) | |
| download | pcsxr-161fa8af66c57aa6c29f6efa415322b36798ef8f.tar.gz | |
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@34480 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/dfsound/spu.c | 18 | ||||
| -rw-r--r-- | plugins/dfsound/stdafx.h | 5 |
2 files changed, 21 insertions, 2 deletions
diff --git a/plugins/dfsound/spu.c b/plugins/dfsound/spu.c index c1061da1..fe44b323 100644 --- a/plugins/dfsound/spu.c +++ b/plugins/dfsound/spu.c @@ -16,7 +16,6 @@ ***************************************************************************/ #include "stdafx.h" -#include "config.h" #define _IN_SPU @@ -37,6 +36,8 @@ #if defined(USEALSA) static char * libraryName = N_("ALSA Sound"); +#elif defined (USEMACOSX) +static char * libraryName = N_("Mac OS X Sound"); #elif defined (USEOSS) static char * libraryName = N_("OSS Sound"); #else @@ -435,7 +436,12 @@ INLINE int iGetInterpolationVal(int ch) static void *MAINThread(void *arg) { - int s_1,s_2,fa,ns,voldiv=iVolume; + int s_1,s_2,fa,ns; +#ifndef _MACOSX + int voldiv=iVolume; +#else + const int voldiv=1; +#endif unsigned char * start;unsigned int nSample; int ch,predict_nr,shift_factor,flags,d,s; int bIRQReturn=0; @@ -967,14 +973,22 @@ long CALLBACK SPUtest(void) // SPUCONFIGURE: call config dialog long CALLBACK SPUconfigure(void) { +#ifdef _MACOSX + DoConfiguration(); +#else StartCfgTool("CFG"); +#endif return 0; } // SPUABOUT: show about window void CALLBACK SPUabout(void) { +#ifdef _MACOSX + DoAbout(); +#else StartCfgTool("ABOUT"); +#endif } // SETUP CALLBACKS diff --git a/plugins/dfsound/stdafx.h b/plugins/dfsound/stdafx.h index a17fb186..8be88489 100644 --- a/plugins/dfsound/stdafx.h +++ b/plugins/dfsound/stdafx.h @@ -15,6 +15,9 @@ * * ***************************************************************************/ +#ifndef _MACOSX +#include "config.h" +#endif #include <stdio.h> #include <stdlib.h> #include <sys/ioctl.h> @@ -36,6 +39,8 @@ #define LOWORD(l) ((unsigned short)(l)) #define HIWORD(l) ((unsigned short)(((unsigned long)(l) >> 16) & 0xFFFF)) +#ifndef INLINE #define INLINE inline +#endif #include "psemuxa.h" |