diff options
| author | Eric Laurent <elaurent@google.com> | 2014-11-27 00:06:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-27 00:06:00 +0000 |
| commit | 61280541836947ce0b281b240ffa4c55bbf5bd55 (patch) | |
| tree | 4a287a2b07095295e7f054399fd9fb3052629d70 /services/audiopolicy/AudioPolicyService.h | |
| parent | b438123fb1ee0a8c232fd66de658d5382d2083cf (diff) | |
| parent | 390ef84373b7edd1397381f780ca235326357094 (diff) | |
| download | frameworks_av-61280541836947ce0b281b240ffa4c55bbf5bd55.zip frameworks_av-61280541836947ce0b281b240ffa4c55bbf5bd55.tar.gz frameworks_av-61280541836947ce0b281b240ffa4c55bbf5bd55.tar.bz2 | |
am 390ef843: am f20c4356: Merge "AudioRecord: use audio attributes instead of audio source." into lmp-mr1-dev
* commit '390ef84373b7edd1397381f780ca235326357094':
AudioRecord: use audio attributes instead of audio source.
Diffstat (limited to 'services/audiopolicy/AudioPolicyService.h')
| -rw-r--r-- | services/audiopolicy/AudioPolicyService.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/services/audiopolicy/AudioPolicyService.h b/services/audiopolicy/AudioPolicyService.h index 23f335e..74a59a8 100644 --- a/services/audiopolicy/AudioPolicyService.h +++ b/services/audiopolicy/AudioPolicyService.h @@ -92,12 +92,13 @@ public: virtual void releaseOutput(audio_io_handle_t output, audio_stream_type_t stream, audio_session_t session); - virtual audio_io_handle_t getInput(audio_source_t inputSource, - uint32_t samplingRate, - audio_format_t format, - audio_channel_mask_t channelMask, - audio_session_t audioSession, - audio_input_flags_t flags); + virtual status_t getInputForAttr(const audio_attributes_t *attr, + audio_io_handle_t *input, + audio_session_t session, + uint32_t samplingRate, + audio_format_t format, + audio_channel_mask_t channelMask, + audio_input_flags_t flags); virtual status_t startInput(audio_io_handle_t input, audio_session_t session); virtual status_t stopInput(audio_io_handle_t input, |