diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-01-18 07:46:18 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-18 07:46:18 -0800 |
| commit | 04eaf3e5f20d7faa956c0d672024ffb5117f4c26 (patch) | |
| tree | a1c32a1cd2e94f80e11748b6e56c0d7899492c11 /media/libmedia | |
| parent | 63ad6aacc6ce6b729bf25f41376cfea731a2c1eb (diff) | |
| parent | b1cf75c4935001f61057989ee3cf27bbf09ecd9c (diff) | |
| download | frameworks_av-04eaf3e5f20d7faa956c0d672024ffb5117f4c26.zip frameworks_av-04eaf3e5f20d7faa956c0d672024ffb5117f4c26.tar.gz frameworks_av-04eaf3e5f20d7faa956c0d672024ffb5117f4c26.tar.bz2 | |
Merge "Track volume cleanup"
Diffstat (limited to 'media/libmedia')
| -rw-r--r-- | media/libmedia/AudioTrack.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp index 97b2312..7e338de 100644 --- a/media/libmedia/AudioTrack.cpp +++ b/media/libmedia/AudioTrack.cpp @@ -480,7 +480,6 @@ status_t AudioTrack::setVolume(float left, float right) mVolume[LEFT] = left; mVolume[RIGHT] = right; - // write must be atomic mCblk->volumeLR = (uint32_t(uint16_t(right * 0x1000)) << 16) | uint16_t(left * 0x1000); return NO_ERROR; |