Jörg Höhle : winealsa: Only linear PCM is supported.
Alexandre Julliard
julliard at winehq.org
Wed Jun 23 10:57:07 CDT 2010
Module: wine
Branch: master
Commit: 3d94ea821500da21c711446ddc906dd8a284edc1
URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d94ea821500da21c711446ddc906dd8a284edc1
Author: Jörg Höhle <hoehle at users.sourceforge.net>
Date: Tue Jun 22 06:51:18 2010 +0200
winealsa: Only linear PCM is supported.
---
dlls/winealsa.drv/alsa.c | 15 ---------------
dlls/winealsa.drv/waveout.c | 12 ------------
2 files changed, 0 insertions(+), 27 deletions(-)
diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c
index 5ebb8b7..b242cfa 100644
--- a/dlls/winealsa.drv/alsa.c
+++ b/dlls/winealsa.drv/alsa.c
@@ -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");
diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c
index 18693c1..6ab1515 100644
--- a/dlls/winealsa.drv/waveout.c
+++ b/dlls/winealsa.drv/waveout.c
@@ -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;
More information about the wine-cvs
mailing list