diff options
author | 2009-05-22 01:27:01 -0700 | |
---|---|---|
committer | 2009-05-22 02:16:08 -0700 | |
commit | 310f8da0c3122ed5419db8f12a6e98d3188325b2 (patch) | |
tree | 0f3435d35e7fe8fca8dc2b347ff46276a8c351c8 /libs/audioflinger/A2dpAudioInterface.cpp | |
parent | 20f68782a4ea71c6a977d7f87d8288d3daa265ec (diff) | |
parent | bdbf6b094d61f694f162a5a5279caededcb1f0a5 (diff) |
merge master to master_gl
Diffstat (limited to 'libs/audioflinger/A2dpAudioInterface.cpp')
-rw-r--r-- | libs/audioflinger/A2dpAudioInterface.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/audioflinger/A2dpAudioInterface.cpp b/libs/audioflinger/A2dpAudioInterface.cpp index b6d5078c44..16a4f2d4c1 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; |