diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-01-11 10:01:34 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-11 10:01:34 -0800 |
| commit | 02b2d2dddc9be339cf7647d4ead53cecd1c51038 (patch) | |
| tree | 4a743ee6a972a2d35b2cb4a9f73234bd31dc8440 /services/audioflinger/AudioMixer.cpp | |
| parent | c1dc1cb1d1eaf84e88669f1a5f22579a0d9237c2 (diff) | |
| parent | f9a27779634ce3a01e5957f234cd04eba74fa07f (diff) | |
| download | frameworks_av-02b2d2dddc9be339cf7647d4ead53cecd1c51038.zip frameworks_av-02b2d2dddc9be339cf7647d4ead53cecd1c51038.tar.gz frameworks_av-02b2d2dddc9be339cf7647d4ead53cecd1c51038.tar.bz2 | |
Merge "Fix build warning"
Diffstat (limited to 'services/audioflinger/AudioMixer.cpp')
| -rw-r--r-- | services/audioflinger/AudioMixer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/audioflinger/AudioMixer.cpp b/services/audioflinger/AudioMixer.cpp index 8df4605..a8102e5 100644 --- a/services/audioflinger/AudioMixer.cpp +++ b/services/audioflinger/AudioMixer.cpp @@ -309,7 +309,7 @@ void AudioMixer::track_t::resetResampler() inline void AudioMixer::track_t::adjustVolumeRamp(bool aux) { - for (int i=0 ; i<MAX_NUM_CHANNELS ; i++) { + for (uint32_t i=0 ; i<MAX_NUM_CHANNELS ; i++) { if (((volumeInc[i]>0) && (((prevVolume[i]+volumeInc[i])>>16) >= volume[i])) || ((volumeInc[i]<0) && (((prevVolume[i]+volumeInc[i])>>16) <= volume[i]))) { volumeInc[i] = 0; |