diff options
| author | Eric Laurent <elaurent@google.com> | 2012-08-28 14:30:35 -0700 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2012-09-07 10:32:57 -0700 |
| commit | 85e08e26258711f2fd672d9a920d88bf91410f6b (patch) | |
| tree | 193e2b4f3a228c32f508575218fcd712f24d0a2d /modules/audio | |
| parent | 88b79cb001d1c733275c7cad490c32b143f78860 (diff) | |
| download | hardware_libhardware-85e08e26258711f2fd672d9a920d88bf91410f6b.zip hardware_libhardware-85e08e26258711f2fd672d9a920d88bf91410f6b.tar.gz hardware_libhardware-85e08e26258711f2fd672d9a920d88bf91410f6b.tar.bz2 | |
audio: new audio devices enums
Changed audio device API version to 2.0 because of
new enums for audio input and output devices.
Removed implementations of get_supported_devices() in
stub and usb audio modules.
Change-Id: I09345d38929d931e5015e36d18259f5a5f950298
Diffstat (limited to 'modules/audio')
| -rw-r--r-- | modules/audio/audio_hw.c | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/modules/audio/audio_hw.c b/modules/audio/audio_hw.c index e4fb711..3051519 100644 --- a/modules/audio/audio_hw.c +++ b/modules/audio/audio_hw.c @@ -379,29 +379,6 @@ static int adev_close(hw_device_t *device) return 0; } -static uint32_t adev_get_supported_devices(const struct audio_hw_device *dev) -{ - return (/* OUT */ - AUDIO_DEVICE_OUT_EARPIECE | - AUDIO_DEVICE_OUT_SPEAKER | - AUDIO_DEVICE_OUT_WIRED_HEADSET | - AUDIO_DEVICE_OUT_WIRED_HEADPHONE | - AUDIO_DEVICE_OUT_AUX_DIGITAL | - AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET | - AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET | - AUDIO_DEVICE_OUT_ALL_SCO | - AUDIO_DEVICE_OUT_DEFAULT | - /* IN */ - AUDIO_DEVICE_IN_COMMUNICATION | - AUDIO_DEVICE_IN_AMBIENT | - AUDIO_DEVICE_IN_BUILTIN_MIC | - AUDIO_DEVICE_IN_WIRED_HEADSET | - AUDIO_DEVICE_IN_AUX_DIGITAL | - AUDIO_DEVICE_IN_BACK_MIC | - AUDIO_DEVICE_IN_ALL_SCO | - AUDIO_DEVICE_IN_DEFAULT); -} - static int adev_open(const hw_module_t* module, const char* name, hw_device_t** device) { @@ -416,11 +393,10 @@ static int adev_open(const hw_module_t* module, const char* name, return -ENOMEM; adev->device.common.tag = HARDWARE_DEVICE_TAG; - adev->device.common.version = AUDIO_DEVICE_API_VERSION_1_0; + adev->device.common.version = AUDIO_DEVICE_API_VERSION_2_0; adev->device.common.module = (struct hw_module_t *) module; adev->device.common.close = adev_close; - adev->device.get_supported_devices = adev_get_supported_devices; adev->device.init_check = adev_init_check; adev->device.set_voice_volume = adev_set_voice_volume; adev->device.set_master_volume = adev_set_master_volume; |