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/common/managerdefinitions/include/AudioOutputDescriptor.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/common/managerdefinitions/include/AudioOutputDescriptor.h')
| -rw-r--r-- | services/audiopolicy/common/managerdefinitions/include/AudioOutputDescriptor.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/audiopolicy/common/managerdefinitions/include/AudioOutputDescriptor.h b/services/audiopolicy/common/managerdefinitions/include/AudioOutputDescriptor.h index c6bb975..f1aee46 100644 --- a/services/audiopolicy/common/managerdefinitions/include/AudioOutputDescriptor.h +++ b/services/audiopolicy/common/managerdefinitions/include/AudioOutputDescriptor.h @@ -74,7 +74,7 @@ public: audio_patch_handle_t mPatchHandle; uint32_t mRefCount[AUDIO_STREAM_CNT]; // number of streams of each type using this output nsecs_t mStopTime[AUDIO_STREAM_CNT]; - float mCurVolume[AUDIO_STREAM_CNT]; // current stream volume + float mCurVolume[AUDIO_STREAM_CNT]; // current stream volume in dB int mMuteCount[AUDIO_STREAM_CNT]; // mute request counter bool mStrategyMutedByDevice[NUM_STRATEGIES]; // strategies muted because of incompatible // device selection. See checkDeviceMuteStrategies() |