diff options
| author | Chris Robinson <[email protected]> | 2019-09-14 12:44:35 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2019-09-14 12:44:35 -0700 |
| commit | 532197a650729be5e4405fd64f81e4443090a01e (patch) | |
| tree | a029aea53b4959b865da8edda438503bcc2d40b5 /alc/backends/dsound.cpp | |
| parent | fa64b1fd6d48165d1e028d1ec96174c3b7fc6341 (diff) | |
Clean up (most) implicit conversions in the backends
Diffstat (limited to 'alc/backends/dsound.cpp')
| -rw-r--r-- | alc/backends/dsound.cpp | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/alc/backends/dsound.cpp b/alc/backends/dsound.cpp index 1c44c2ec..f9184968 100644 --- a/alc/backends/dsound.cpp +++ b/alc/backends/dsound.cpp @@ -465,11 +465,13 @@ ALCboolean DSoundPlayback::reset() retry_open: hr = S_OK; OutputType.Format.wFormatTag = WAVE_FORMAT_PCM; - OutputType.Format.nChannels = mDevice->channelsFromFmt(); - OutputType.Format.wBitsPerSample = mDevice->bytesFromFmt() * 8; - OutputType.Format.nBlockAlign = OutputType.Format.nChannels*OutputType.Format.wBitsPerSample/8; + OutputType.Format.nChannels = static_cast<WORD>(mDevice->channelsFromFmt()); + OutputType.Format.wBitsPerSample = static_cast<WORD>(mDevice->bytesFromFmt() * 8); + OutputType.Format.nBlockAlign = static_cast<WORD>(OutputType.Format.nChannels * + OutputType.Format.wBitsPerSample / 8); OutputType.Format.nSamplesPerSec = mDevice->Frequency; - OutputType.Format.nAvgBytesPerSec = OutputType.Format.nSamplesPerSec*OutputType.Format.nBlockAlign; + OutputType.Format.nAvgBytesPerSec = OutputType.Format.nSamplesPerSec * + OutputType.Format.nBlockAlign; OutputType.Format.cbSize = 0; } @@ -728,11 +730,13 @@ ALCenum DSoundCapture::open(const ALCchar *name) } InputType.Format.wFormatTag = WAVE_FORMAT_PCM; - InputType.Format.nChannels = mDevice->channelsFromFmt(); - InputType.Format.wBitsPerSample = mDevice->bytesFromFmt() * 8; - InputType.Format.nBlockAlign = InputType.Format.nChannels*InputType.Format.wBitsPerSample/8; + InputType.Format.nChannels = static_cast<WORD>(mDevice->channelsFromFmt()); + InputType.Format.wBitsPerSample = static_cast<WORD>(mDevice->bytesFromFmt() * 8); + InputType.Format.nBlockAlign = static_cast<WORD>(InputType.Format.nChannels * + InputType.Format.wBitsPerSample / 8); InputType.Format.nSamplesPerSec = mDevice->Frequency; - InputType.Format.nAvgBytesPerSec = InputType.Format.nSamplesPerSec*InputType.Format.nBlockAlign; + InputType.Format.nAvgBytesPerSec = InputType.Format.nSamplesPerSec * + InputType.Format.nBlockAlign; InputType.Format.cbSize = 0; InputType.Samples.wValidBitsPerSample = InputType.Format.wBitsPerSample; if(mDevice->FmtType == DevFmtFloat) |