marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winealsa: Only linear PCM is supported.

oldstable
Jörg Höhle 2010-06-22 06:51:18 +02:00 committed by Alexandre Julliard
parent bee7850344
commit 3d94ea8215
2 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/winealsa.drv/alsa.c
View File

@ -358,10 +358,6 @@ void ALSA_copyFormat(LPWAVEFORMATEX wf1, LPWAVEFORMATPCMEX wf2)
iLength = sizeof(WAVEFORMATPCMEX);
else
iLength = sizeof(WAVEFORMATEX) + wf1->cbSize;
if (iLength > sizeof(WAVEFORMATPCMEX)) {
ERR("calculated %u bytes, capping\n", iLength);
iLength = sizeof(WAVEFORMATPCMEX);
}
memcpy(wf2, wf1, iLength);
}
@ -395,17 +391,6 @@ BOOL ALSA_supportedFormat(LPWAVEFORMATEX wf)
} else
WARN("only KSDATAFORMAT_SUBTYPE_PCM and KSDATAFORMAT_SUBTYPE_IEEE_FLOAT "
"supported\n");
} else if (wf->wFormatTag == WAVE_FORMAT_MULAW || wf->wFormatTag == WAVE_FORMAT_ALAW) {
if (wf->wBitsPerSample==8)
return TRUE;
else
ERR("WAVE_FORMAT_MULAW and WAVE_FORMAT_ALAW wBitsPerSample must = 8\n");
} else if (wf->wFormatTag == WAVE_FORMAT_ADPCM) {
if (wf->wBitsPerSample==4)
return TRUE;
else
ERR("WAVE_FORMAT_ADPCM wBitsPerSample must = 4\n");
} else
WARN("only WAVE_FORMAT_PCM and WAVE_FORMAT_EXTENSIBLE supported\n");

12
dlls/winealsa.drv/waveout.c
View File

@ -716,18 +716,6 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags)
} else if ((wwo->format.Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE) &&
IsEqualGUID(&wwo->format.SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT)){
format = (wwo->format.Format.wBitsPerSample == 32) ? SND_PCM_FORMAT_FLOAT_LE : -1;
} else if (wwo->format.Format.wFormatTag == WAVE_FORMAT_MULAW) {
FIXME("unimplemented format: WAVE_FORMAT_MULAW\n");
retcode = WAVERR_BADFORMAT;
goto errexit;
} else if (wwo->format.Format.wFormatTag == WAVE_FORMAT_ALAW) {
FIXME("unimplemented format: WAVE_FORMAT_ALAW\n");
retcode = WAVERR_BADFORMAT;
goto errexit;
} else if (wwo->format.Format.wFormatTag == WAVE_FORMAT_ADPCM) {
FIXME("unimplemented format: WAVE_FORMAT_ADPCM\n");
retcode = WAVERR_BADFORMAT;
goto errexit;
} else {
ERR("invalid format: %0x04x\n", wwo->format.Format.wFormatTag);
retcode = WAVERR_BADFORMAT;