wineoss minor cleanup
Robert Reif
reif at earthlink.net
Wed Aug 18 18:23:22 CDT 2004
Cleanup messages in supportedFormat.
-------------- next part --------------
Index: dlls/winmm/wineoss/audio.c
===================================================================
RCS file: /home/wine/wine/dlls/winmm/wineoss/audio.c,v
retrieving revision 1.142
diff -u -r1.142 audio.c
--- dlls/winmm/wineoss/audio.c 18 Aug 2004 00:30:01 -0000 1.142
+++ dlls/winmm/wineoss/audio.c 18 Aug 2004 23:19:33 -0000
@@ -394,24 +394,25 @@
return FALSE;
if (wf->wFormatTag == WAVE_FORMAT_PCM) {
- if (wf->nChannels==1||wf->nChannels==2) {
- if (wf->wBitsPerSample==8||wf->wBitsPerSample==16) {
+ if (wf->nChannels==1||wf->nChannels==2) {
+ if (wf->wBitsPerSample==8||wf->wBitsPerSample==16)
return TRUE;
- }
}
- }
- else if (wf->wFormatTag == WAVE_FORMAT_EXTENSIBLE) {
- WAVEFORMATEXTENSIBLE * wfex = (WAVEFORMATEXTENSIBLE *)wf;
+ } else if (wf->wFormatTag == WAVE_FORMAT_EXTENSIBLE) {
+ WAVEFORMATEXTENSIBLE * wfex = (WAVEFORMATEXTENSIBLE *)wf;
+
if (wf->cbSize == 22 && IsEqualGUID(&wfex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM)) {
- if (wf->nChannels==1||wf->nChannels==2) {
- if ((wf->wBitsPerSample==8||wf->wBitsPerSample==16) &&
- (wfex->Samples.wValidBitsPerSample==8||wfex->Samples.wValidBitsPerSample==16)) {
- FIXME("WAVE_FORMAT_EXTENSIBLE not fully supported\n");
- return TRUE;
- }
+ if (wf->nChannels==1||wf->nChannels==2) {
+ if (wf->wBitsPerSample==wfex->Samples.wValidBitsPerSample) {
+ if (wf->wBitsPerSample==8||wf->wBitsPerSample==16)
+ return TRUE;
+ } else
+ WARN("wBitsPerSample != wValidBitsPerSample not supported yet\n");
}
- }
- }
+ } else
+ WARN("only KSDATAFORMAT_SUBTYPE_PCM supported\n");
+ } else
+ WARN("only WAVE_FORMAT_PCM and WAVE_FORMAT_EXTENSIBLE supported\n");
return FALSE;
}
More information about the wine-patches
mailing list