diff options
author | Eric Laurent <elaurent@google.com> | 2015-04-09 01:12:06 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-09 01:12:06 +0000 |
commit | 17769490d499bc665ddfef83143ac1ed647fa0d4 (patch) | |
tree | b2d5bc5fe875be119ffd3ce3352a9444caf2d1e2 /services/audiopolicy/enginedefault/src/Gains.h | |
parent | 9c7f67264d3b3ace9703b3a96bd7bc4922111b4f (diff) | |
parent | ffbc80f5908eaf67a033c6e93a343c39dd6894eb (diff) | |
download | frameworks_av-17769490d499bc665ddfef83143ac1ed647fa0d4.zip frameworks_av-17769490d499bc665ddfef83143ac1ed647fa0d4.tar.gz frameworks_av-17769490d499bc665ddfef83143ac1ed647fa0d4.tar.bz2 |
Merge "audio policy: volume in dBs"
Diffstat (limited to 'services/audiopolicy/enginedefault/src/Gains.h')
-rw-r--r-- | services/audiopolicy/enginedefault/src/Gains.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/services/audiopolicy/enginedefault/src/Gains.h b/services/audiopolicy/enginedefault/src/Gains.h index b5601ca..7620b7d 100644 --- a/services/audiopolicy/enginedefault/src/Gains.h +++ b/services/audiopolicy/enginedefault/src/Gains.h @@ -29,8 +29,13 @@ class StreamDescriptor; class Gains { public : - static float volIndexToAmpl(audio_devices_t device, const StreamDescriptor& streamDesc, - int indexInUi); + static float volIndexToAmpl(Volume::device_category deviceCategory, + const StreamDescriptor& streamDesc, + int indexInUi); + + static float volIndexToDb(Volume::device_category deviceCategory, + const StreamDescriptor& streamDesc, + int indexInUi); // default volume curve static const VolumeCurvePoint sDefaultVolumeCurve[Volume::VOLCNT]; |