diff options
| author | Eric Laurent <elaurent@google.com> | 2012-01-17 17:35:03 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-17 17:35:03 -0800 |
| commit | 63ad6aacc6ce6b729bf25f41376cfea731a2c1eb (patch) | |
| tree | 7f5a8de6e8540f2424668e5c650dee567194fb4d /media/libmedia/AudioSystem.cpp | |
| parent | f237a30e9344d43f832ba11db6f62c6ad2084444 (diff) | |
| parent | 83844cc2f95dc279015b47fd1e18c7cb4eabe9a1 (diff) | |
| download | frameworks_av-63ad6aacc6ce6b729bf25f41376cfea731a2c1eb.zip frameworks_av-63ad6aacc6ce6b729bf25f41376cfea731a2c1eb.tar.gz frameworks_av-63ad6aacc6ce6b729bf25f41376cfea731a2c1eb.tar.bz2 | |
Merge "audio framework: manage stream volume per device"
Diffstat (limited to 'media/libmedia/AudioSystem.cpp')
| -rw-r--r-- | media/libmedia/AudioSystem.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/media/libmedia/AudioSystem.cpp b/media/libmedia/AudioSystem.cpp index e537e5a..28892df 100644 --- a/media/libmedia/AudioSystem.cpp +++ b/media/libmedia/AudioSystem.cpp @@ -668,18 +668,22 @@ status_t AudioSystem::initStreamVolume(audio_stream_type_t stream, return aps->initStreamVolume(stream, indexMin, indexMax); } -status_t AudioSystem::setStreamVolumeIndex(audio_stream_type_t stream, int index) +status_t AudioSystem::setStreamVolumeIndex(audio_stream_type_t stream, + int index, + audio_devices_t device) { const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service(); if (aps == 0) return PERMISSION_DENIED; - return aps->setStreamVolumeIndex(stream, index); + return aps->setStreamVolumeIndex(stream, index, device); } -status_t AudioSystem::getStreamVolumeIndex(audio_stream_type_t stream, int *index) +status_t AudioSystem::getStreamVolumeIndex(audio_stream_type_t stream, + int *index, + audio_devices_t device) { const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service(); if (aps == 0) return PERMISSION_DENIED; - return aps->getStreamVolumeIndex(stream, index); + return aps->getStreamVolumeIndex(stream, index, device); } uint32_t AudioSystem::getStrategyForStream(audio_stream_type_t stream) |