Commit 3d94ea82 authored by Jörg Höhle's avatar Jörg Höhle Committed by Alexandre Julliard

winealsa: Only linear PCM is supported.

parent bee78503
...@@ -358,10 +358,6 @@ void ALSA_copyFormat(LPWAVEFORMATEX wf1, LPWAVEFORMATPCMEX wf2) ...@@ -358,10 +358,6 @@ void ALSA_copyFormat(LPWAVEFORMATEX wf1, LPWAVEFORMATPCMEX wf2)
iLength = sizeof(WAVEFORMATPCMEX); iLength = sizeof(WAVEFORMATPCMEX);
else else
iLength = sizeof(WAVEFORMATEX) + wf1->cbSize; iLength = sizeof(WAVEFORMATEX) + wf1->cbSize;
if (iLength > sizeof(WAVEFORMATPCMEX)) {
ERR("calculated %u bytes, capping\n", iLength);
iLength = sizeof(WAVEFORMATPCMEX);
}
memcpy(wf2, wf1, iLength); memcpy(wf2, wf1, iLength);
} }
...@@ -395,17 +391,6 @@ BOOL ALSA_supportedFormat(LPWAVEFORMATEX wf) ...@@ -395,17 +391,6 @@ BOOL ALSA_supportedFormat(LPWAVEFORMATEX wf)
} else } else
WARN("only KSDATAFORMAT_SUBTYPE_PCM and KSDATAFORMAT_SUBTYPE_IEEE_FLOAT " WARN("only KSDATAFORMAT_SUBTYPE_PCM and KSDATAFORMAT_SUBTYPE_IEEE_FLOAT "
"supported\n"); "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 } else
WARN("only WAVE_FORMAT_PCM and WAVE_FORMAT_EXTENSIBLE supported\n"); WARN("only WAVE_FORMAT_PCM and WAVE_FORMAT_EXTENSIBLE supported\n");
......
...@@ -716,18 +716,6 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) ...@@ -716,18 +716,6 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags)
} else if ((wwo->format.Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE) && } else if ((wwo->format.Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE) &&
IsEqualGUID(&wwo->format.SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT)){ IsEqualGUID(&wwo->format.SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT)){
format = (wwo->format.Format.wBitsPerSample == 32) ? SND_PCM_FORMAT_FLOAT_LE : -1; 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 { } else {
ERR("invalid format: %0x04x\n", wwo->format.Format.wFormatTag); ERR("invalid format: %0x04x\n", wwo->format.Format.wFormatTag);
retcode = WAVERR_BADFORMAT; retcode = WAVERR_BADFORMAT;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment