From 704938979441fd20012bd5de4fe2bb1543bca86b Mon Sep 17 00:00:00 2001 From: "punyabrata@webrtc.org" Date: Wed, 17 Aug 2011 00:15:52 +0000 Subject: [PATCH] Fixes volume problem controls, happening with some Logitech headset [from gips P4 depot CL 38122] Review URL: http://webrtc-codereview.appspot.com/108004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@389 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../main/source/win/audio_mixer_manager_win.cc | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/modules/audio_device/main/source/win/audio_mixer_manager_win.cc b/src/modules/audio_device/main/source/win/audio_mixer_manager_win.cc index 4855f5043d..465f94c091 100644 --- a/src/modules/audio_device/main/source/win/audio_mixer_manager_win.cc +++ b/src/modules/audio_device/main/source/win/audio_mixer_manager_win.cc @@ -349,13 +349,15 @@ WebRtc_Word32 AudioMixerManager::EnumerateMicrophones() { // selection now contains the index of the selected source => // read the line information for this source - if (!GetSourceLineInfo(mixId, destId, selection, sourceLine)) - { - return -1; - } - if (sourceLine.cControls == 0 || // no controls - (sourceLine.fdwLine & MIXERLINE_LINEF_DISCONNECTED) || // disconnected - !(sourceLine.fdwLine & MIXERLINE_LINEF_ACTIVE)) // inactive + // if conditions listed below + // condition 1: invalid source + // condition 2: no controls + // condition 3: disconnected + // condition 4: inactive + if (!GetSourceLineInfo(mixId, destId, selection, sourceLine) || + (sourceLine.cControls == 0) || + (sourceLine.fdwLine & MIXERLINE_LINEF_DISCONNECTED) || + !(sourceLine.fdwLine & MIXERLINE_LINEF_ACTIVE)) { continue; }