notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more timing hacks
[pcsx_rearmed.git]
/
plugins
/
dfsound
/
xa.c
diff --git
a/plugins/dfsound/xa.c
b/plugins/dfsound/xa.c
index
23924d3
..
08afc00
100644
(file)
--- a/
plugins/dfsound/xa.c
+++ b/
plugins/dfsound/xa.c
@@
-130,13
+130,12
@@
static unsigned long timeGetTime_spu()
// FEED XA
////////////////////////////////////////////////////////////////////////
// FEED XA
////////////////////////////////////////////////////////////////////////
-
INLINE void FeedXA(
xa_decode_t *xap)
+
void FeedXA(const
xa_decode_t *xap)
{
int sinc,spos,i,iSize,iPlace,vl,vr;
if(!spu.bSPUIsOpen) return;
{
int sinc,spos,i,iSize,iPlace,vl,vr;
if(!spu.bSPUIsOpen) return;
- spu.xapGlobal = xap; // store info for save states
spu.XARepeat = 3; // set up repeat
#if 0//def XA_HACK
spu.XARepeat = 3; // set up repeat
#if 0//def XA_HACK
@@
-410,12
+409,12
@@
INLINE void FeedXA(xa_decode_t *xap)
// FEED CDDA
////////////////////////////////////////////////////////////////////////
// FEED CDDA
////////////////////////////////////////////////////////////////////////
-
INLINE int
FeedCDDA(unsigned char *pcm, int nBytes)
+
void
FeedCDDA(unsigned char *pcm, int nBytes)
{
int space;
space=(spu.CDDAPlay-spu.CDDAFeed-1)*4 & (CDDA_BUFFER_SIZE - 1);
if(space<nBytes)
{
int space;
space=(spu.CDDAPlay-spu.CDDAFeed-1)*4 & (CDDA_BUFFER_SIZE - 1);
if(space<nBytes)
- return
0x7761; // rearmed_wait
+ return
;
while(nBytes>0)
{
while(nBytes>0)
{
@@
-431,8
+430,6
@@
INLINE int FeedCDDA(unsigned char *pcm, int nBytes)
nBytes-=space;
pcm+=space;
}
nBytes-=space;
pcm+=space;
}
-
- return 0x676f; // rearmed_go
}
#endif
}
#endif