slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/stable' into dev

Browse Source 
Change-Id: I2cba36426d8af40f94712f7f05f4e0dd4efce6e7
This commit is contained in:
Sergio Ahumada
2013-09-06 14:32:51 +02:00
parent 71808302a5 4715ec52b1
commit 25be645862
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/multimedia/audio/qaudiooutput_win32_p.cpp
View File

@@ -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)