diff options
author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-01 17:15:57 +0000 |
---|---|---|
committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-01 17:15:57 +0000 |
commit | a6e6910a717353139ce540da41ded6986c004ee3 (patch) | |
tree | 881ca6e0889a7873402512da1d8ec8e99b06692d /media/audio/mac | |
parent | b2ab4efc5aca698fa6a8f6c518b2cab54eb4f28d (diff) | |
download | chromium_src-a6e6910a717353139ce540da41ded6986c004ee3.zip chromium_src-a6e6910a717353139ce540da41ded6986c004ee3.tar.gz chromium_src-a6e6910a717353139ce540da41ded6986c004ee3.tar.bz2 |
Adding GetAudioInputDeviceNames() to AudioManager, which allows for device enumeration.
The current version only supports the default device and isn't fully implemented for Mac/Windows yet.
Patch by xians@chromium.org:
http://codereview.chromium.org/7060011/
BUG=none
TEST=media_unittests
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87493 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio/mac')
-rw-r--r-- | media/audio/mac/audio_manager_mac.cc | 14 | ||||
-rw-r--r-- | media/audio/mac/audio_manager_mac.h | 1 |
2 files changed, 15 insertions, 0 deletions
diff --git a/media/audio/mac/audio_manager_mac.cc b/media/audio/mac/audio_manager_mac.cc index 8b2c918..84d5fee 100644 --- a/media/audio/mac/audio_manager_mac.cc +++ b/media/audio/mac/audio_manager_mac.cc @@ -81,6 +81,20 @@ bool AudioManagerMac::HasAudioInputDevices() { return HasAudioHardware(kAudioHardwarePropertyDefaultInputDevice); } +void AudioManagerMac::GetAudioInputDeviceNames( + media::AudioDeviceNames* device_names) { + // TODO(xians): query a full list of valid devices. + if (HasAudioInputDevices()) { + // Add the default device to the list. + // We use index 0 to make up the unique_id to identify the + // default devices. + media::AudioDeviceName name; + name.device_name = AudioManagerBase::kDefaultDeviceName; + name.unique_id = "0"; + device_names->push_back(name); + } +} + AudioOutputStream* AudioManagerMac::MakeAudioOutputStream( AudioParameters params) { if (!params.IsValid()) diff --git a/media/audio/mac/audio_manager_mac.h b/media/audio/mac/audio_manager_mac.h index 1977bac..2556aec 100644 --- a/media/audio/mac/audio_manager_mac.h +++ b/media/audio/mac/audio_manager_mac.h @@ -21,6 +21,7 @@ class AudioManagerMac : public AudioManagerBase { // Implementation of AudioManager. virtual bool HasAudioOutputDevices(); virtual bool HasAudioInputDevices(); + virtual void GetAudioInputDeviceNames(media::AudioDeviceNames* device_names); virtual AudioOutputStream* MakeAudioOutputStream(AudioParameters params); virtual AudioInputStream* MakeAudioInputStream(AudioParameters params); virtual void MuteAll(); |