diff options
| author | notaz | 2012-07-30 21:29:29 +0300 |
|---|---|---|
| committer | notaz | 2012-07-31 01:31:34 +0300 |
| commit | 07c13dfd11cbd45e96a5c21cd88ccd44601678ea (patch) | |
| tree | 8d9713246288c00ff5edb6e6301d710ed36bfa10 /plugins/dfsound/spu.c | |
| parent | f05d6ca255c80170e4e5fc61cc48d87e013b8807 (diff) | |
| download | pcsx_rearmed-07c13dfd11cbd45e96a5c21cd88ccd44601678ea.tar.gz pcsx_rearmed-07c13dfd11cbd45e96a5c21cd88ccd44601678ea.tar.bz2 pcsx_rearmed-07c13dfd11cbd45e96a5c21cd88ccd44601678ea.zip | |
allow multiple sound drivers to be compiled
Diffstat (limited to 'plugins/dfsound/spu.c')
| -rw-r--r-- | plugins/dfsound/spu.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/dfsound/spu.c b/plugins/dfsound/spu.c index bbbe1e3..45a7886 100644 --- a/plugins/dfsound/spu.c +++ b/plugins/dfsound/spu.c @@ -24,7 +24,7 @@ #include "externals.h" #include "registers.h" -#include "dsoundoss.h" +#include "out.h" #ifdef ENABLE_NLS #include <libintl.h> @@ -697,7 +697,7 @@ static int do_samples(int forced_updates) // until enuff free place is available/a new channel gets // started - if(!forced_updates && SoundGetBytesBuffered()) // still enuff data in sound buffer? + if(!forced_updates && out_current->busy()) // still enuff data in sound buffer? { return 0; } @@ -872,7 +872,7 @@ static int do_samples(int forced_updates) // wanna have around 1/60 sec (16.666 ms) updates if (iCycle++ > 16/FRAG_MSECS) { - SoundFeedStreamData((unsigned char *)pSpuBuffer, + out_current->feed(pSpuBuffer, ((unsigned char *)pS) - ((unsigned char *)pSpuBuffer)); pS = (short *)pSpuBuffer; iCycle = 0; @@ -1056,7 +1056,7 @@ long CALLBACK SPUclose(void) bSPUIsOpen = 0; // no more open - RemoveSound(); // no more sound handling + out_current->finish(); // no more sound handling return 0; } |