diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-06 14:32:51 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-06 14:32:51 +0200 |
| commit | 25be64586258d290b4ed5fd8185d37d4e9b2fd88 (patch) | |
| tree | d05cd1877215b7cea498f1adb4b960758b392111 /src/multimedia | |
| parent | 71808302a572e622c20095726d74beaef152a9bc (diff) | |
| parent | 4715ec52b17a220c48a380a2cd1619ad5fb069a7 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I2cba36426d8af40f94712f7f05f4e0dd4efce6e7
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/audio/qaudiooutput_win32_p.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/multimedia/audio/qaudiooutput_win32_p.cpp b/src/multimedia/audio/qaudiooutput_win32_p.cpp index 4d13d4349..286cecba7 100644 --- a/src/multimedia/audio/qaudiooutput_win32_p.cpp +++ b/src/multimedia/audio/qaudiooutput_win32_p.cpp @@ -702,7 +702,7 @@ void QAudioOutputPrivate::setVolume(qreal v) volumeCache = normalizedVolume; return; } - const qint16 scaled = normalizedVolume * 0xFFFF; + const quint16 scaled = normalizedVolume * 0xFFFF; DWORD vol = MAKELONG(scaled, scaled); MMRESULT res = waveOutSetVolume(hWaveOut, vol); if (res == MMSYSERR_NOERROR) |