diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-21 03:00:20 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-21 03:00:20 +0200 |
| commit | 87d4252f36ee85615c72d8ba21008ba4018b841d (patch) | |
| tree | f657f421ef7ac567f0b5dc60fdcd7f7534f73413 /src/plugins/windowsaudio | |
| parent | 3064d50f0e58599dbb9818a1c558b4ad77e47350 (diff) | |
| parent | 0bc28be67c2854a4c06cddd536e43ac87c225670 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I7f644741677dbd848d480dde7c76cdf7ad81e4b9
Diffstat (limited to 'src/plugins/windowsaudio')
| -rw-r--r-- | src/plugins/windowsaudio/qwindowsaudioinput.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/windowsaudio/qwindowsaudioinput.cpp b/src/plugins/windowsaudio/qwindowsaudioinput.cpp index 8d0fc8c24..4771fe1cc 100644 --- a/src/plugins/windowsaudio/qwindowsaudioinput.cpp +++ b/src/plugins/windowsaudio/qwindowsaudioinput.cpp @@ -415,9 +415,10 @@ void QWindowsAudioInput::initMixer() // Get the Mixer ID from the Sound Device ID UINT mixerIntID = 0; - if (mixerGetID((HMIXEROBJ)(quintptr(inputDevice)), &mixerIntID, MIXER_OBJECTF_WAVEIN) != MMSYSERR_NOERROR) + if (mixerGetID(reinterpret_cast<HMIXEROBJ>(quintptr(inputDevice)), + &mixerIntID, MIXER_OBJECTF_WAVEIN) != MMSYSERR_NOERROR) return; - mixerID = (HMIXEROBJ)mixerIntID; + mixerID = reinterpret_cast<HMIXEROBJ>(quintptr(mixerIntID)); // Get the Destination (Recording) Line Information MIXERLINE mixerLine; |