diff options
| author | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-08-12 02:56:43 +0000 |
|---|---|---|
| committer | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-08-12 02:56:43 +0000 |
| commit | 8297a92012e3f42ed74d47fc3d11a3003c14b4ae (patch) | |
| tree | fc781551eb9e024428de1c4b2a194c1e1c444be2 /plugins/dfsound/xa.c | |
| parent | d4840a37d9adf0b9124fad722a5ae5faae4bb639 (diff) | |
| download | pcsxr-8297a92012e3f42ed74d47fc3d11a3003c14b4ae.tar.gz | |
dfsound: readded windows support.
gtk gui: increased number of savestate slots.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@56022 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'plugins/dfsound/xa.c')
| -rw-r--r-- | plugins/dfsound/xa.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/plugins/dfsound/xa.c b/plugins/dfsound/xa.c index fdae4f9e..0c1ae57a 100644 --- a/plugins/dfsound/xa.c +++ b/plugins/dfsound/xa.c @@ -15,7 +15,8 @@ * * ***************************************************************************/ -#include "stdafx.h" +#include "stdafx.h"
+ #define _IN_XA #include <stdint.h> @@ -101,6 +102,8 @@ INLINE void MixXA(void) //////////////////////////////////////////////////////////////////////// // small linux time helper... only used for watchdog //////////////////////////////////////////////////////////////////////// +
+#ifndef _WINDOWS
unsigned long timeGetTime_spu() { @@ -108,6 +111,8 @@ unsigned long timeGetTime_spu() gettimeofday(&tv, 0); // well, maybe there are better ways return tv.tv_sec * 1000 + tv.tv_usec/1000; // to do that, but at least it works } +
+#endif
//////////////////////////////////////////////////////////////////////// // FEED XA @@ -397,9 +402,14 @@ INLINE void FeedCDDA(unsigned char *pcm, int nBytes) if(CDDAFeed==CDDAEnd) CDDAFeed=CDDAStart; while(CDDAFeed==CDDAPlay-1|| (CDDAFeed==CDDAEnd-1&&CDDAPlay==CDDAStart)) - { + {
+#ifdef _WINDOWS
+ if (!iUseTimer) Sleep(1);
+ else return;
+#else if (!iUseTimer) usleep(1000); - else return; + else return;
+#endif } *CDDAFeed++=(*pcm | (*(pcm+1)<<8) | (*(pcm+2)<<16) | (*(pcm+3)<<24)); nBytes-=4; |