diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-07-17 21:39:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-17 21:04:20 +0000 |
| commit | e94754c9601d132354e5db2079762c7d1a0bddda (patch) | |
| tree | deb178075a48d8f87b06e57c099e41ee90db99d8 /include | |
| parent | 2e8186a258c934798129847f66171df36e95d23e (diff) | |
| parent | b3b1660ecb67f61f9da54efced8677fa3a6f4863 (diff) | |
| download | frameworks_av-e94754c9601d132354e5db2079762c7d1a0bddda.zip frameworks_av-e94754c9601d132354e5db2079762c7d1a0bddda.tar.gz frameworks_av-e94754c9601d132354e5db2079762c7d1a0bddda.tar.bz2 | |
Merge "Add audio_input_flags_t to IAudioPolicyService::getInput" into lmp-dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/AudioSystem.h | 3 | ||||
| -rw-r--r-- | include/media/IAudioPolicyService.h | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/include/media/AudioSystem.h b/include/media/AudioSystem.h index e1aab41..9ea18de 100644 --- a/include/media/AudioSystem.h +++ b/include/media/AudioSystem.h @@ -234,7 +234,8 @@ public: uint32_t samplingRate, audio_format_t format, audio_channel_mask_t channelMask, - int sessionId); + int sessionId, + audio_input_flags_t); static status_t startInput(audio_io_handle_t input); static status_t stopInput(audio_io_handle_t input); diff --git a/include/media/IAudioPolicyService.h b/include/media/IAudioPolicyService.h index 959e4c3..e08b5ae 100644 --- a/include/media/IAudioPolicyService.h +++ b/include/media/IAudioPolicyService.h @@ -70,10 +70,11 @@ public: int session = 0) = 0; virtual void releaseOutput(audio_io_handle_t output) = 0; virtual audio_io_handle_t getInput(audio_source_t inputSource, - uint32_t samplingRate = 0, - audio_format_t format = AUDIO_FORMAT_DEFAULT, - audio_channel_mask_t channelMask = 0, - int audioSession = 0) = 0; + uint32_t samplingRate, + audio_format_t format, + audio_channel_mask_t channelMask, + int audioSession, + audio_input_flags_t flags) = 0; virtual status_t startInput(audio_io_handle_t input) = 0; virtual status_t stopInput(audio_io_handle_t input) = 0; virtual void releaseInput(audio_io_handle_t input) = 0; |