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

winejack.drv only supports 16bit sound so we can simplify the sound 

format checks.
This commit is contained in:
Francois Gouget 2004-05-05 01:06:27 +00:00 committed by Alexandre Julliard
parent 91c2507dd4
commit df4409fb95
1 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
dlls/winmm/winejack/audio.c
View File

@ -1231,22 +1231,17 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags)
return MMSYSERR_ALLOCATED;
}
/* make sure we aren't being opened in 8 bit mode */
if(lpDesc->lpFormat->wBitsPerSample == 8)
{
TRACE("8bits per sample unsupported, returning WAVERR_BADFORMAT\n");
return WAVERR_BADFORMAT;
}
/* only PCM format is supported so far... */
/* Only the PCM format is supported so far...
* Also we only support 16 bit mode.
*/
if (lpDesc->lpFormat->wFormatTag != WAVE_FORMAT_PCM ||
lpDesc->lpFormat->nChannels == 0 ||
lpDesc->lpFormat->nSamplesPerSec == 0 ||
(lpDesc->lpFormat->wBitsPerSample!=8 && lpDesc->lpFormat->wBitsPerSample!=16))
lpDesc->lpFormat->wBitsPerSample != 16)
{
WARN("Bad format: tag=%04X nChannels=%d nSamplesPerSec=%ld !\n",
WARN("Bad format: tag=%04X nChannels=%d nSamplesPerSec=%ld wBitsPerSample=%d !\n",
lpDesc->lpFormat->wFormatTag, lpDesc->lpFormat->nChannels,
lpDesc->lpFormat->nSamplesPerSec);
lpDesc->lpFormat->nSamplesPerSec, lpDesc->lpFormat->wBitsPerSample);
return WAVERR_BADFORMAT;
}
@ -2104,22 +2099,17 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags)
return MMSYSERR_ALLOCATED;
}
/* make sure we aren't being opened in 8 bit mode */
if(lpDesc->lpFormat->wBitsPerSample == 8)
{
TRACE("8bits per sample unsupported, returning WAVERR_BADFORMAT\n");
return WAVERR_BADFORMAT;
}
/* only PCM format is supported so far... */
/* Only the PCM format is supported so far...
* Also we only support 16 bit mode.
*/
if (lpDesc->lpFormat->wFormatTag != WAVE_FORMAT_PCM ||
lpDesc->lpFormat->nChannels == 0 ||
lpDesc->lpFormat->nSamplesPerSec == 0 ||
(lpDesc->lpFormat->wBitsPerSample!=8 && lpDesc->lpFormat->wBitsPerSample!=16))
lpDesc->lpFormat->wBitsPerSample!=16)
{
WARN("Bad format: tag=%04X nChannels=%d nSamplesPerSec=%ld !\n",
WARN("Bad format: tag=%04X nChannels=%d nSamplesPerSec=%ld wBitsPerSample=%d !\n",
lpDesc->lpFormat->wFormatTag, lpDesc->lpFormat->nChannels,
lpDesc->lpFormat->nSamplesPerSec);
lpDesc->lpFormat->nSamplesPerSec, lpDesc->lpFormat->wBitsPerSample);
return WAVERR_BADFORMAT;
}