diff options
| author | Hochi Huang <hochi.huang@mediatek.com> | 2014-09-21 09:47:31 +0800 |
|---|---|---|
| committer | Leo Wang <leozwang@google.com> | 2014-09-30 19:01:22 +0000 |
| commit | 327cb70dcbf3a1f1679aeafaaa62d8532abea86d (patch) | |
| tree | 5c82c0c4c0d384add6f2f87fefb7427e1fb7f9a9 /services/audiopolicy/AudioPolicyManager.h | |
| parent | 4379c03433e4613c417998ca7917059ef17dc3a9 (diff) | |
| download | frameworks_av-327cb70dcbf3a1f1679aeafaaa62d8532abea86d.zip frameworks_av-327cb70dcbf3a1f1679aeafaaa62d8532abea86d.tar.gz frameworks_av-327cb70dcbf3a1f1679aeafaaa62d8532abea86d.tar.bz2 | |
[AU] Update volume setting and Audio Device API 3.0
Signed-off-by: Hochi Huang <hochi.huang@mediatek.com>
Review: https://partner-android-review.git.corp.google.com/#/c/182522
Change-Id: Ida2dfedc6eaa3204354cdc182e0ee13a35472661
Diffstat (limited to 'services/audiopolicy/AudioPolicyManager.h')
| -rw-r--r-- | services/audiopolicy/AudioPolicyManager.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/services/audiopolicy/AudioPolicyManager.h b/services/audiopolicy/AudioPolicyManager.h index 0ea7b97..7dbd73f 100644 --- a/services/audiopolicy/AudioPolicyManager.h +++ b/services/audiopolicy/AudioPolicyManager.h @@ -600,8 +600,10 @@ protected: audio_io_handle_t output, audio_devices_t device); // check that volume change is permitted, compute and send new volume to audio hardware - status_t checkAndSetVolume(audio_stream_type_t stream, int index, audio_io_handle_t output, - audio_devices_t device, int delayMs = 0, bool force = false); + virtual status_t checkAndSetVolume(audio_stream_type_t stream, int index, + audio_io_handle_t output, + audio_devices_t device, + int delayMs = 0, bool force = false); // apply all stream volumes to the specified output and device void applyStreamVolumes(audio_io_handle_t output, audio_devices_t device, int delayMs = 0, bool force = false); @@ -820,10 +822,9 @@ protected: uint32_t mTestChannels; uint32_t mTestLatencyMs; #endif //AUDIO_POLICY_TEST - -private: static float volIndexToAmpl(audio_devices_t device, const StreamDescriptor& streamDesc, int indexInUi); +private: // updates device caching and output for streams that can influence the // routing of notifications void handleNotificationRoutingForStream(audio_stream_type_t stream); |