notaz.gp2x.de
/
pcsx_rearmed.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
97e07db
)
spu: check buffer state less often
author
notaz
<notasas@gmail.com>
Fri, 4 Jan 2013 22:55:59 +0000
(
00:55
+0200)
committer
notaz
<notasas@gmail.com>
Sat, 5 Jan 2013 02:06:39 +0000
(
04:06
+0200)
plugins/dfsound/spu.c
patch
|
blob
|
blame
|
history
diff --git
a/plugins/dfsound/spu.c
b/plugins/dfsound/spu.c
index
9f91b8b
..
1456a21
100644
(file)
--- a/
plugins/dfsound/spu.c
+++ b/
plugins/dfsound/spu.c
@@
-689,25
+689,18
@@
static int do_samples(int forced_updates)
int ch,d,silentch;
int bIRQReturn=0;
int ch,d,silentch;
int bIRQReturn=0;
+ // ok, at the beginning we are looking if there is
+ // enuff free place in the dsound/oss buffer to
+ // fill in new data, or if there is a new channel to start.
+ // if not, we return until enuff free place is available
+ // /a new channel gets started
+
+ if(!forced_updates && out_current->busy()) // still enuff data in sound buffer?
+ return 0;
+
while(!bIRQReturn)
{
while(!bIRQReturn)
{
- // ok, at the beginning we are looking if there is
- // enuff free place in the dsound/oss buffer to
- // fill in new data, or if there is a new channel to start.
- // if not, we wait (thread) or return (timer/spuasync)
- // until enuff free place is available/a new channel gets
- // started
-
- if(!forced_updates && out_current->busy()) // still enuff data in sound buffer?
- {
- return 0;
- }
-
cycles_since_update = 0;
cycles_since_update = 0;
- if(forced_updates > 0)
- forced_updates--;
-
- //--------------------------------------------------// continue from irq handling in timer mode?
ns_from=0;
ns_to=NSSIZE;
ns_from=0;
ns_to=NSSIZE;
@@
-872,12
+865,21
@@
static int do_samples(int forced_updates)
// feed the sound
// wanna have around 1/60 sec (16.666 ms) updates
// feed the sound
// wanna have around 1/60 sec (16.666 ms) updates
- if (iCycle++ > 16/FRAG_MSECS)
+ if (iCycle++ >
=
16/FRAG_MSECS)
{
{
- out_current->feed(pSpuBuffer,
- ((unsigned char *)pS) - ((unsigned char *)pSpuBuffer));
+ out_current->feed(pSpuBuffer, (unsigned char *)pS - pSpuBuffer);
pS = (short *)pSpuBuffer;
iCycle = 0;
pS = (short *)pSpuBuffer;
iCycle = 0;
+
+ if(!forced_updates && out_current->busy())
+ break;
+ }
+
+ if(forced_updates > 0)
+ {
+ forced_updates--;
+ if(forced_updates == 0 && out_current->busy())
+ break;
}
}
}
}