From ad216e51b33c55634ec89d15e81e97cdffd08e1c Mon Sep 17 00:00:00 2001 From: Dave Sparks Date: Tue, 19 May 2009 14:38:46 -0700 Subject: Add inputSource to openInputStream Continuation of bug 1846343 --- libs/audioflinger/AudioHardwareGeneric.cpp | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'libs/audioflinger/AudioHardwareGeneric.cpp') diff --git a/libs/audioflinger/AudioHardwareGeneric.cpp b/libs/audioflinger/AudioHardwareGeneric.cpp index 62beadabddcb..8b9a5a75e5b7 100644 --- a/libs/audioflinger/AudioHardwareGeneric.cpp +++ b/libs/audioflinger/AudioHardwareGeneric.cpp @@ -30,6 +30,7 @@ #include #include "AudioHardwareGeneric.h" +#include namespace android { @@ -93,9 +94,15 @@ void AudioHardwareGeneric::closeOutputStream(AudioStreamOutGeneric* out) { } AudioStreamIn* AudioHardwareGeneric::openInputStream( - int format, int channelCount, uint32_t sampleRate, status_t *status, - AudioSystem::audio_in_acoustics acoustics) + int inputSource, int format, int channelCount, uint32_t sampleRate, + status_t *status, AudioSystem::audio_in_acoustics acoustics) { + // check for valid input source + if ((inputSource != AudioRecord::DEFAULT_INPUT) && + (inputSource != AudioRecord::MIC_INPUT)) { + return 0; + } + AutoMutex lock(mLock); // only one input stream allowed @@ -120,6 +127,15 @@ AudioStreamIn* AudioHardwareGeneric::openInputStream( return mInput; } +// DEPRECATED +AudioStreamIn* AudioHardwareGeneric::openInputStream( + int format, int channelCount, uint32_t sampleRate, status_t *status, + AudioSystem::audio_in_acoustics acoustic_flags) +{ + return openInputStream(AudioRecord::DEFAULT_INPUT, format, channelCount, + sampleRate, status, acoustic_flags); +} + void AudioHardwareGeneric::closeInputStream(AudioStreamInGeneric* in) { if (in == mInput) mInput = 0; } -- cgit v1.2.3-59-g8ed1b