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
/
alsa.c
diff --git
a/plugins/dfsound/alsa.c
b/plugins/dfsound/alsa.c
index
2eba878
..
c67943a
100644
(file)
--- a/
plugins/dfsound/alsa.c
+++ b/
plugins/dfsound/alsa.c
@@
-40,8
+40,7
@@
void SetupSound(void)
unsigned int period_time = buffer_time / 4;
int err;
unsigned int period_time = buffer_time / 4;
int err;
- if (iDisStereo) pchannels = 1;
- else pchannels=2;
+ pchannels=2;
pspeed = 44100;
format = SND_PCM_FORMAT_S16;
pspeed = 44100;
format = SND_PCM_FORMAT_S16;
@@
-136,11
+135,11
@@
unsigned long SoundGetBytesBuffered(void)
unsigned long l;
if (handle == NULL) // failed to open?
unsigned long l;
if (handle == NULL) // failed to open?
- return
SOUNDSIZE
;
+ return
1
;
l = snd_pcm_avail(handle);
if (l < 0) return 0;
if (l < buffer_size / 2) // can we write in at least the half of fragments?
l = snd_pcm_avail(handle);
if (l < 0) return 0;
if (l < buffer_size / 2) // can we write in at least the half of fragments?
- l =
SOUNDSIZE;
// -> no? wait
+ l =
1;
// -> no? wait
else l = 0; // -> else go on
return l;
else l = 0; // -> else go on
return l;
@@
-153,6
+152,5
@@
void SoundFeedStreamData(unsigned char* pSound,long lBytes)
if (snd_pcm_state(handle) == SND_PCM_STATE_XRUN)
snd_pcm_prepare(handle);
if (snd_pcm_state(handle) == SND_PCM_STATE_XRUN)
snd_pcm_prepare(handle);
- snd_pcm_writei(handle,pSound,
- iDisStereo ? lBytes / 2 : lBytes / 4);
+ snd_pcm_writei(handle,pSound, lBytes / 4);
}
}