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
spu: remove some hacks, to be reworked
[pcsx_rearmed.git]
/
plugins
/
dfsound
/
sdl.c
diff --git
a/plugins/dfsound/sdl.c
b/plugins/dfsound/sdl.c
index
45ccba2
..
f7dc298
100644
(file)
--- a/
plugins/dfsound/sdl.c
+++ b/
plugins/dfsound/sdl.c
@@
-70,7
+70,7
@@
void SetupSound(void) {
spec.freq = 44100;
spec.format = AUDIO_S16SYS;
spec.freq = 44100;
spec.format = AUDIO_S16SYS;
- spec.channels =
iDisStereo ? 1 :
2;
+ spec.channels = 2;
spec.samples = 512;
spec.callback = SOUND_FillAudio;
spec.samples = 512;
spec.callback = SOUND_FillAudio;
@@
-80,7
+80,6
@@
void SetupSound(void) {
}
iBufSize = BUFFER_SIZE;
}
iBufSize = BUFFER_SIZE;
- if (iDisStereo) iBufSize /= 2;
pSndBuffer = (short *)malloc(iBufSize * sizeof(short));
if (pSndBuffer == NULL) {
pSndBuffer = (short *)malloc(iBufSize * sizeof(short));
if (pSndBuffer == NULL) {
@@
-107,12
+106,12
@@
void RemoveSound(void) {
unsigned long SoundGetBytesBuffered(void) {
int size;
unsigned long SoundGetBytesBuffered(void) {
int size;
- if (pSndBuffer == NULL) return
SOUNDSIZE
;
+ if (pSndBuffer == NULL) return
1
;
size = iReadPos - iWritePos;
if (size <= 0) size += iBufSize;
size = iReadPos - iWritePos;
if (size <= 0) size += iBufSize;
- if (size < iBufSize / 2) return
SOUNDSIZE
;
+ if (size < iBufSize / 2) return
1
;
return 0;
}
return 0;
}