diff options
| author | dgreid@chromium.org <dgreid@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-05 03:12:32 +0000 |
|---|---|---|
| committer | dgreid@chromium.org <dgreid@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-05 03:12:32 +0000 |
| commit | 551dfc6b4bbf66440f6f976bdf18725d7a87e167 (patch) | |
| tree | 71ce06967be4ef71046f4e9318b96747b5d40217 /chromeos | |
| parent | ab01a39b6f49f5db81d64031cf73d9ba7e1143c1 (diff) | |
| download | chromium_src-551dfc6b4bbf66440f6f976bdf18725d7a87e167.zip chromium_src-551dfc6b4bbf66440f6f976bdf18725d7a87e167.tar.gz chromium_src-551dfc6b4bbf66440f6f976bdf18725d7a87e167.tar.bz2 | |
ChromeOS: audio - Assign correct device type to internal mics.
A substring match is used to assign audio types. "mic" was checked
before "internal mic", leading to all internal mics being assigned
external priority and the incorrect device to be selected. Check for
"internal mic" first to avoid it matching with "mic".
BUG=chrome-os-partner:19849
TEST=boot with USB mic attached and check that it is chosen as default
Review URL: https://chromiumcodereview.appspot.com/16093033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204141 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos')
| -rw-r--r-- | chromeos/audio/audio_device.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chromeos/audio/audio_device.cc b/chromeos/audio/audio_device.cc index 4c28719..bcf7ec4 100644 --- a/chromeos/audio/audio_device.cc +++ b/chromeos/audio/audio_device.cc @@ -59,6 +59,8 @@ std::string GetTypeString(chromeos::AudioDeviceType type) { chromeos::AudioDeviceType GetAudioType(const std::string& node_type) { if (node_type.find("HEADPHONE") != std::string::npos) return chromeos::AUDIO_TYPE_HEADPHONE; + else if (node_type.find("INTERNAL_MIC") != std::string::npos) + return chromeos::AUDIO_TYPE_INTERNAL_MIC; else if (node_type.find("MIC") != std::string::npos) return chromeos::AUDIO_TYPE_MIC; else if (node_type.find("USB") != std::string::npos) @@ -69,8 +71,6 @@ chromeos::AudioDeviceType GetAudioType(const std::string& node_type) { return chromeos::AUDIO_TYPE_HDMI; else if (node_type.find("INTERNAL_SPEAKER") != std::string::npos) return chromeos::AUDIO_TYPE_INTERNAL_SPEAKER; - else if (node_type.find("INTERNAL_MIC") != std::string::npos) - return chromeos::AUDIO_TYPE_INTERNAL_MIC; else return chromeos::AUDIO_TYPE_OTHER; } |