diff options
| author | Eric Laurent <elaurent@google.com> | 2014-07-28 20:56:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-25 21:16:23 +0000 |
| commit | ca413b6ec9fe7bd83e748c87fe46408607e8f117 (patch) | |
| tree | dcd45a220eaef73f00f3c115114741da9c309755 /modules/usbaudio | |
| parent | 634e9484ebe324cbeb8aa874f5d71143f8354232 (diff) | |
| parent | f5e2469c02825f018df6336125882812003b8e64 (diff) | |
| download | hardware_libhardware-ca413b6ec9fe7bd83e748c87fe46408607e8f117.zip hardware_libhardware-ca413b6ec9fe7bd83e748c87fe46408607e8f117.tar.gz hardware_libhardware-ca413b6ec9fe7bd83e748c87fe46408607e8f117.tar.bz2 | |
Merge "audio HAL: add parameters to open stream" into lmp-dev
Diffstat (limited to 'modules/usbaudio')
| -rw-r--r-- | modules/usbaudio/audio_hw.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/modules/usbaudio/audio_hw.c b/modules/usbaudio/audio_hw.c index 4a946e7..d9bb611 100644 --- a/modules/usbaudio/audio_hw.c +++ b/modules/usbaudio/audio_hw.c @@ -473,7 +473,8 @@ static int adev_open_output_stream(struct audio_hw_device *dev, audio_devices_t devices, audio_output_flags_t flags, struct audio_config *config, - struct audio_stream_out **stream_out) + struct audio_stream_out **stream_out, + const char *address __unused) { ALOGV("usb:audio_hw::out adev_open_output_stream() handle:0x%X, device:0x%X, flags:0x%X", handle, devices, flags); @@ -888,7 +889,9 @@ static int adev_open_input_stream(struct audio_hw_device *dev, audio_devices_t devices, struct audio_config *config, struct audio_stream_in **stream_in, - audio_input_flags_t flags __unused) + audio_input_flags_t flags __unused, + const char *address __unused, + audio_source_t source __unused) { ALOGV("usb: in adev_open_input_stream() rate:%" PRIu32 ", chanMask:0x%" PRIX32 ", fmt:%" PRIu8, config->sample_rate, config->channel_mask, config->format); |