diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-20 08:54:45 -0700 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2009-05-20 08:54:45 -0700 |
commit | d131275a8121348a2d6eeb46fe3cec5f76f88323 (patch) | |
tree | cfd6dc935fe6febe7d616fd5d1f6403a762f8cc0 | |
parent | 352ea0e1d2d21ac5adf5e8c14e075818a90f2669 (diff) | |
parent | a59aba8cd88b8f98fa4de2a903899bc6ac9f73e8 (diff) | |
download | frameworks_base-d131275a8121348a2d6eeb46fe3cec5f76f88323.zip frameworks_base-d131275a8121348a2d6eeb46fe3cec5f76f88323.tar.gz frameworks_base-d131275a8121348a2d6eeb46fe3cec5f76f88323.tar.bz2 |
am a59aba8c: Merge changes 2023,2036 into donut
Merge commit 'a59aba8cd88b8f98fa4de2a903899bc6ac9f73e8'
* commit 'a59aba8cd88b8f98fa4de2a903899bc6ac9f73e8':
Update more references to openInputStream in support classes.
Modify AudioFlinger to use updated openInputStream factory method.
-rw-r--r-- | libs/audioflinger/A2dpAudioInterface.cpp | 4 | ||||
-rw-r--r-- | libs/audioflinger/A2dpAudioInterface.h | 12 | ||||
-rw-r--r-- | libs/audioflinger/AudioDumpInterface.h | 10 | ||||
-rw-r--r-- | libs/audioflinger/AudioFlinger.cpp | 4 |
4 files changed, 24 insertions, 6 deletions
diff --git a/libs/audioflinger/A2dpAudioInterface.cpp b/libs/audioflinger/A2dpAudioInterface.cpp index b6d5078..16a4f2d 100644 --- a/libs/audioflinger/A2dpAudioInterface.cpp +++ b/libs/audioflinger/A2dpAudioInterface.cpp @@ -71,8 +71,8 @@ AudioStreamOut* A2dpAudioInterface::openOutputStream( } AudioStreamIn* A2dpAudioInterface::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) { if (status) *status = -1; diff --git a/libs/audioflinger/A2dpAudioInterface.h b/libs/audioflinger/A2dpAudioInterface.h index 7901a8c..1348197 100644 --- a/libs/audioflinger/A2dpAudioInterface.h +++ b/libs/audioflinger/A2dpAudioInterface.h @@ -55,12 +55,24 @@ public: status_t *status=0); virtual AudioStreamIn* openInputStream( + int inputSource, int format, int channelCount, uint32_t sampleRate, status_t *status, AudioSystem::audio_in_acoustics acoustics); + // DEPRECATED - WILL BE REMOVED + virtual AudioStreamIn* openInputStream( + int format, + int channelCount, + uint32_t sampleRate, + status_t *status, + AudioSystem::audio_in_acoustics acoustics) + { + return openInputStream(-1, format, channelCount, sampleRate, status, acoustics); + } + protected: virtual status_t doRouting(); virtual status_t dump(int fd, const Vector<String16>& args); diff --git a/libs/audioflinger/AudioDumpInterface.h b/libs/audioflinger/AudioDumpInterface.h index 9a94102..6d94ac8 100644 --- a/libs/audioflinger/AudioDumpInterface.h +++ b/libs/audioflinger/AudioDumpInterface.h @@ -78,9 +78,13 @@ public: virtual status_t setParameter(const char* key, const char* value) {return mFinalInterface->setParameter(key, value);} - virtual AudioStreamIn* openInputStream( int format, int channelCount, uint32_t sampleRate, status_t *status, - AudioSystem::audio_in_acoustics acoustics) - {return mFinalInterface->openInputStream( format, channelCount, sampleRate, status, acoustics);} + virtual AudioStreamIn* openInputStream(int inputSource, int format, int channelCount, + uint32_t sampleRate, status_t *status, AudioSystem::audio_in_acoustics acoustics) + { return mFinalInterface->openInputStream(inputSource, format, channelCount, sampleRate, status, acoustics); } + + virtual AudioStreamIn* openInputStream(int format, int channelCount, uint32_t sampleRate, + status_t *status, AudioSystem::audio_in_acoustics acoustics) + { return mFinalInterface->openInputStream(-1, format, channelCount, sampleRate, status, acoustics); } virtual status_t dump(int fd, const Vector<String16>& args) { return mFinalInterface->dumpState(fd, args); } diff --git a/libs/audioflinger/AudioFlinger.cpp b/libs/audioflinger/AudioFlinger.cpp index a4050b3..efcf2b0 100644 --- a/libs/audioflinger/AudioFlinger.cpp +++ b/libs/audioflinger/AudioFlinger.cpp @@ -2414,7 +2414,9 @@ bool AudioFlinger::AudioRecordThread::threadLoop() LOGV("AudioRecordThread: loop starting"); if (mRecordTrack != 0) { - input = mAudioHardware->openInputStream(mRecordTrack->format(), + input = mAudioHardware->openInputStream( + mRecordTrack->type(), + mRecordTrack->format(), mRecordTrack->channelCount(), mRecordTrack->sampleRate(), &mStartStatus, |