ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed a couple of bugs.

This commit is contained in:
Ove Kaaven 2004-04-28 00:24:09 +00:00 committed by Alexandre Julliard
parent ab6cd7bdb6
commit c6ad91ba3c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/winmm/winealsa/audio.c
View File

@ -596,14 +596,14 @@ LONG ALSA_WaveInit(void)
if (snd_pcm_format_mask_test( fmask, SND_PCM_FORMAT_U8)) \ if (snd_pcm_format_mask_test( fmask, SND_PCM_FORMAT_U8)) \
{ \ { \
if (chmin <= 1 && 1 <= chmax) \ if (chmin <= 1 && 1 <= chmax) \
wwo->caps.dwFormats |= WAVE_FORMAT_##v##S08; \ wwo->caps.dwFormats |= WAVE_FORMAT_##v##M08; \
if (chmin <= 2 && 2 <= chmax) \ if (chmin <= 2 && 2 <= chmax) \
wwo->caps.dwFormats |= WAVE_FORMAT_##v##S08; \ wwo->caps.dwFormats |= WAVE_FORMAT_##v##S08; \
} \ } \
if (snd_pcm_format_mask_test( fmask, SND_PCM_FORMAT_S16_LE)) \ if (snd_pcm_format_mask_test( fmask, SND_PCM_FORMAT_S16_LE)) \
{ \ { \
if (chmin <= 1 && 1 <= chmax) \ if (chmin <= 1 && 1 <= chmax) \
wwo->caps.dwFormats |= WAVE_FORMAT_##v##S16; \ wwo->caps.dwFormats |= WAVE_FORMAT_##v##M16; \
if (chmin <= 2 && 2 <= chmax) \ if (chmin <= 2 && 2 <= chmax) \
wwo->caps.dwFormats |= WAVE_FORMAT_##v##S16; \ wwo->caps.dwFormats |= WAVE_FORMAT_##v##S16; \
} \ } \
@ -703,14 +703,14 @@ LONG ALSA_WaveInit(void)
if (snd_pcm_format_mask_test( fmask, SND_PCM_FORMAT_U8)) \ if (snd_pcm_format_mask_test( fmask, SND_PCM_FORMAT_U8)) \
{ \ { \
if (chmin <= 1 && 1 <= chmax) \ if (chmin <= 1 && 1 <= chmax) \
wwi->caps.dwFormats |= WAVE_FORMAT_##v##S08; \ wwi->caps.dwFormats |= WAVE_FORMAT_##v##M08; \
if (chmin <= 2 && 2 <= chmax) \ if (chmin <= 2 && 2 <= chmax) \
wwi->caps.dwFormats |= WAVE_FORMAT_##v##S08; \ wwi->caps.dwFormats |= WAVE_FORMAT_##v##S08; \
} \ } \
if (snd_pcm_format_mask_test( fmask, SND_PCM_FORMAT_S16_LE)) \ if (snd_pcm_format_mask_test( fmask, SND_PCM_FORMAT_S16_LE)) \
{ \ { \
if (chmin <= 1 && 1 <= chmax) \ if (chmin <= 1 && 1 <= chmax) \
wwi->caps.dwFormats |= WAVE_FORMAT_##v##S16; \ wwi->caps.dwFormats |= WAVE_FORMAT_##v##M16; \
if (chmin <= 2 && 2 <= chmax) \ if (chmin <= 2 && 2 <= chmax) \
wwi->caps.dwFormats |= WAVE_FORMAT_##v##S16; \ wwi->caps.dwFormats |= WAVE_FORMAT_##v##S16; \
} \ } \
@ -947,7 +947,7 @@ static BOOL wodUpdatePlayedTotal(WINE_WAVEOUT* wwo, snd_pcm_status_t* ps)
{ {
snd_pcm_sframes_t delay = 0; snd_pcm_sframes_t delay = 0;
snd_pcm_delay(wwo->p_handle, &delay); snd_pcm_delay(wwo->p_handle, &delay);
wwo->dwPlayedTotal = wwo->dwWrittenTotal - delay; wwo->dwPlayedTotal = wwo->dwWrittenTotal - snd_pcm_frames_to_bytes(wwo->p_handle, delay);
return TRUE; return TRUE;
} }