diff options
| author | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-29 12:05:53 +0000 |
|---|---|---|
| committer | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-29 12:05:53 +0000 |
| commit | 8e04fe4bf4b0525d9397ae91918b6916878f6d96 (patch) | |
| tree | 2262025ec51bd987bf39c4f072fc5c86565e3cbd /media | |
| parent | f6969c01e277685ea1e7a11a220380fe4d477e31 (diff) | |
| download | chromium_src-8e04fe4bf4b0525d9397ae91918b6916878f6d96.zip chromium_src-8e04fe4bf4b0525d9397ae91918b6916878f6d96.tar.gz chromium_src-8e04fe4bf4b0525d9397ae91918b6916878f6d96.tar.bz2 | |
Fix device id matching in AudioDeviceListenerWin::OnDefaultDeviceChanged. The original problem was pointed out by Nico here: https://codereview.chromium.org/187593004 And discussed further here: https://codereview.chromium.org/419323002/
TBR=thakis@chromium.org
BUG=347531
Review URL: https://codereview.chromium.org/416173004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@286176 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/audio/win/audio_device_listener_win.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media/audio/win/audio_device_listener_win.cc b/media/audio/win/audio_device_listener_win.cc index b0eba59..d7e017c 100644 --- a/media/audio/win/audio_device_listener_win.cc +++ b/media/audio/win/audio_device_listener_win.cc @@ -146,12 +146,12 @@ STDMETHODIMP AudioDeviceListenerWin::OnDefaultDeviceChanged( // Grab a pointer to the appropriate ID member. // Note that there are three "?:"'s here to select the right ID. std::string* current_device_id = - role == eConsole ? ( - flow == eRender ? + flow == eRender ? ( + role == eConsole ? &default_render_device_id_ : &default_communications_render_device_id_ ) : ( - flow == eRender ? + role == eConsole ? &default_capture_device_id_ : &default_communications_capture_device_id_ ); |