diff options
| author | cychiang <cychiang@chromium.org> | 2015-07-08 02:59:00 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-08 09:59:39 +0000 |
| commit | 3c3d910e31448a88e014b31334a57242ba5e8960 (patch) | |
| tree | 76631613eb6d3f78168026b204d1dc86c266ffe7 /chromeos | |
| parent | a152535799a629264d64d740bafadccaff740805 (diff) | |
| download | chromium_src-3c3d910e31448a88e014b31334a57242ba5e8960.zip chromium_src-3c3d910e31448a88e014b31334a57242ba5e8960.tar.gz chromium_src-3c3d910e31448a88e014b31334a57242ba5e8960.tar.bz2 | |
Implement HasInputDevices in CrasAudioManager
Currently in CrasAudioManager, HasInputDevices always returns True.
We need to let HasInputDevices reflect the truth for device without
internal microphone like ChromeBox.
Let CrasAudioHandler updates the flag in CrasAudioManager whenever
CrasAudioHandler gets the audio node info from Cras.
Add a property is_for_simple_usage to AudioDeviceType to indicate
that a device is for simple usage, not for special usage like
loopback, always on keyword mic, or keyboard mic.
This property can also replace the logic in audio_detailed_view.cc
to filter out the devices that we do not want to display in UI.
BUG=490851
TEST=Check audio devices in UI does not contain loopback devices.
TEST=Check virtual keyboard does not show microphone for chromebox
(Not tested yet).
R=dalecurtis@chromium.org, derat@chromium.org, dgreid@chromium.org, jennyz@chromium.org
Review URL: https://codereview.chromium.org/1186293003
Cr-Commit-Position: refs/heads/master@{#337791}
Diffstat (limited to 'chromeos')
| -rw-r--r-- | chromeos/audio/audio_device.h | 14 | ||||
| -rw-r--r-- | chromeos/audio/cras_audio_handler.h | 2 |
2 files changed, 16 insertions, 0 deletions
diff --git a/chromeos/audio/audio_device.h b/chromeos/audio/audio_device.h index 67dca1c..2ed26b1 100644 --- a/chromeos/audio/audio_device.h +++ b/chromeos/audio/audio_device.h @@ -41,6 +41,20 @@ struct CHROMEOS_EXPORT AudioDevice { static std::string GetTypeString(chromeos::AudioDeviceType type); static chromeos::AudioDeviceType GetAudioType(const std::string& node_type); + // Indicates that an input or output audio device is for simple usage like + // playback or recording for user. In contrast, audio device such as + // loopback, always on keyword recognition (AOKR), and keyboard mic are + // not for simple usage. + bool is_for_simple_usage() { + return (type == AUDIO_TYPE_HEADPHONE || + type == AUDIO_TYPE_INTERNAL_MIC || + type == AUDIO_TYPE_MIC || + type == AUDIO_TYPE_USB || + type == AUDIO_TYPE_BLUETOOTH || + type == AUDIO_TYPE_HDMI || + type == AUDIO_TYPE_INTERNAL_SPEAKER); + } + bool is_input; uint64 id; std::string display_name; diff --git a/chromeos/audio/cras_audio_handler.h b/chromeos/audio/cras_audio_handler.h index 10c77a4..5d24973 100644 --- a/chromeos/audio/cras_audio_handler.h +++ b/chromeos/audio/cras_audio_handler.h @@ -128,6 +128,8 @@ class CHROMEOS_EXPORT CrasAudioHandler : public CrasAudioClient::Observer, virtual uint64_t GetPrimaryActiveInputNode() const; // Gets the audio devices back in |device_list|. + // This call can be invoked from I/O thread or UI thread because + // it does not need to access CrasAudioClient on DBus. virtual void GetAudioDevices(AudioDeviceList* device_list) const; virtual bool GetPrimaryActiveOutputDevice(AudioDevice* device) const; |