diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-03-26 21:13:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-26 21:13:18 +0000 |
| commit | b8f8d231685afdec472136b45c527a71bfb8bcc4 (patch) | |
| tree | 8f5afcbeec0aa0e9c441c5fc1c42a8a8b35d77f3 /media | |
| parent | 9b6fcc2f8294d21b859b4cbcff84107a499e221f (diff) | |
| parent | 0ed19594452c901c3c8665d06610fffe46895d06 (diff) | |
| download | frameworks_av-b8f8d231685afdec472136b45c527a71bfb8bcc4.zip frameworks_av-b8f8d231685afdec472136b45c527a71bfb8bcc4.tar.gz frameworks_av-b8f8d231685afdec472136b45c527a71bfb8bcc4.tar.bz2 | |
Merge "Remove stream type from AudioSystem::getRenderPosition()"
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmedia/AudioSystem.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/media/libmedia/AudioSystem.cpp b/media/libmedia/AudioSystem.cpp index 9325d6e..243ea40 100644 --- a/media/libmedia/AudioSystem.cpp +++ b/media/libmedia/AudioSystem.cpp @@ -400,19 +400,11 @@ status_t AudioSystem::setVoiceVolume(float value) } status_t AudioSystem::getRenderPosition(audio_io_handle_t output, uint32_t *halFrames, - uint32_t *dspFrames, audio_stream_type_t stream) + uint32_t *dspFrames) { const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger(); if (af == 0) return PERMISSION_DENIED; - if (stream == AUDIO_STREAM_DEFAULT) { - stream = AUDIO_STREAM_MUSIC; - } - - if (output == 0) { - output = getOutput(stream); - } - return af->getRenderPosition(halFrames, dspFrames, output); } |