summaryrefslogtreecommitdiffstats
path: root/services/audioflinger/AudioFlinger.h
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2014-07-17 21:12:07 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-07-17 21:09:48 +0000
commitd1a4f35ec10f36c33cf7391e800910da8fdebb6e (patch)
tree64f754cc4b7a78ac9af645c0d5b45b421230b4c1 /services/audioflinger/AudioFlinger.h
parente1a8112edec713ff1d84f67145f22cca3a401951 (diff)
parentec40d284218466d8f0e832e7eb88e6ea6c479c88 (diff)
downloadframeworks_av-d1a4f35ec10f36c33cf7391e800910da8fdebb6e.zip
frameworks_av-d1a4f35ec10f36c33cf7391e800910da8fdebb6e.tar.gz
frameworks_av-d1a4f35ec10f36c33cf7391e800910da8fdebb6e.tar.bz2
Merge "Add audio_input_flags_t to IAudioFlinger::openInput" into lmp-dev
Diffstat (limited to 'services/audioflinger/AudioFlinger.h')
-rw-r--r--services/audioflinger/AudioFlinger.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h
index be19554..bae18fd 100644
--- a/services/audioflinger/AudioFlinger.h
+++ b/services/audioflinger/AudioFlinger.h
@@ -179,7 +179,8 @@ public:
audio_devices_t *pDevices,
uint32_t *pSamplingRate,
audio_format_t *pFormat,
- audio_channel_mask_t *pChannelMask);
+ audio_channel_mask_t *pChannelMask,
+ audio_input_flags_t flags);
virtual status_t closeInput(audio_io_handle_t input);