diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-13 13:10:48 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-13 13:10:48 +0100 |
| commit | f9014d136f504c6377d1329c822f11a8b58ccdbe (patch) | |
| tree | 1c1a752d8ba6b5094b182305d65ca0d0101e1ed0 /src/plugins/windowsaudio | |
| parent | bbfccc713546f9e7341fbe1af7482cafbdc4ea25 (diff) | |
| parent | 06259f1dfbd9cb2ebd58bba59381a42dc8a758df (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: I5575a4ba13212c9bfe73a3de3ef17c6528beafc3
Diffstat (limited to 'src/plugins/windowsaudio')
| -rw-r--r-- | src/plugins/windowsaudio/qwindowsaudiodeviceinfo.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/windowsaudio/qwindowsaudioinput.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/windowsaudio/qwindowsaudiodeviceinfo.cpp b/src/plugins/windowsaudio/qwindowsaudiodeviceinfo.cpp index cae7316ff..ede60c963 100644 --- a/src/plugins/windowsaudio/qwindowsaudiodeviceinfo.cpp +++ b/src/plugins/windowsaudio/qwindowsaudiodeviceinfo.cpp @@ -454,7 +454,9 @@ QList<QByteArray> QWindowsAudioDeviceInfo::availableDevices(QAudio::Mode mode) pPropBag->Release(); pMoniker->Release(); } + pEnum->Release(); } + pDevEnum->Release(); } CoUninitialize(); #else // Q_OS_WINCE diff --git a/src/plugins/windowsaudio/qwindowsaudioinput.cpp b/src/plugins/windowsaudio/qwindowsaudioinput.cpp index 3dad12450..7ddd5391c 100644 --- a/src/plugins/windowsaudio/qwindowsaudioinput.cpp +++ b/src/plugins/windowsaudio/qwindowsaudioinput.cpp @@ -430,7 +430,7 @@ void QWindowsAudioInput::initMixer() return; mixerID = (HMIXEROBJ)mixerIntID; - // Get the Destination (Recording) Line Infomation + // Get the Destination (Recording) Line Information MIXERLINE mixerLine; mixerLine.cbStruct = sizeof(MIXERLINE); mixerLine.dwComponentType = MIXERLINE_COMPONENTTYPE_DST_WAVEIN; |