diff options
author | Glenn Kasten <gkasten@google.com> | 2012-02-08 07:40:23 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-08 07:40:23 -0800 |
commit | b5a66e15f371143f48665bbd462d75309582845d (patch) | |
tree | 45d58fa394a3d11bb4fb68ab6356191d863fc559 /services | |
parent | e98bbd36d67243fe987b09904956550a68af1cc7 (diff) | |
parent | 4c340c6521b634f159d2d6bc4e9359226fd8edf8 (diff) | |
download | frameworks_av-b5a66e15f371143f48665bbd462d75309582845d.zip frameworks_av-b5a66e15f371143f48665bbd462d75309582845d.tar.gz frameworks_av-b5a66e15f371143f48665bbd462d75309582845d.tar.bz2 |
Merge "Use bool instead of int"
Diffstat (limited to 'services')
-rw-r--r-- | services/audioflinger/AudioMixer.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/services/audioflinger/AudioMixer.cpp b/services/audioflinger/AudioMixer.cpp index 0b9f8ba..3a03092 100644 --- a/services/audioflinger/AudioMixer.cpp +++ b/services/audioflinger/AudioMixer.cpp @@ -68,7 +68,7 @@ AudioMixer::AudioMixer(size_t frameCount, uint32_t sampleRate) // t->prevAuxLevel // t->frameCount t->channelCount = 2; - t->enabled = 0; + t->enabled = false; t->format = 16; t->channelMask = AUDIO_CHANNEL_OUT_STEREO; t->bufferProvider = NULL; @@ -121,8 +121,8 @@ void AudioMixer::deleteTrackName(int name) assert(uint32_t(name) < MAX_NUM_TRACKS); ALOGV("deleteTrackName(%d)", name); track_t& track(mState.tracks[ name ]); - if (track.enabled != 0) { - track.enabled = 0; + if (track.enabled) { + track.enabled = false; invalidateState(1<<name); } if (track.resampler != NULL) { @@ -143,8 +143,8 @@ void AudioMixer::enable(int name) assert(uint32_t(name) < MAX_NUM_TRACKS); track_t& track = mState.tracks[name]; - if (track.enabled != 1) { - track.enabled = 1; + if (!track.enabled) { + track.enabled = true; ALOGV("enable(%d)", name); invalidateState(1 << name); } @@ -156,8 +156,8 @@ void AudioMixer::disable(int name) assert(uint32_t(name) < MAX_NUM_TRACKS); track_t& track = mState.tracks[name]; - if (track.enabled != 0) { - track.enabled = 0; + if (track.enabled) { + track.enabled = false; ALOGV("disable(%d)", name); invalidateState(1 << name); } @@ -383,9 +383,9 @@ void AudioMixer::process__validate(state_t* state) // compute everything we need... int countActiveTracks = 0; - int all16BitsStereoNoResample = 1; - int resampling = 0; - int volumeRamp = 0; + bool all16BitsStereoNoResample = true; + bool resampling = false; + bool volumeRamp = false; uint32_t en = state->enabledTracks; while (en) { const int i = 31 - __builtin_clz(en); @@ -402,7 +402,7 @@ void AudioMixer::process__validate(state_t* state) } if (t.volumeInc[0]|t.volumeInc[1]) { - volumeRamp = 1; + volumeRamp = true; } else if (!t.doesResample() && t.volumeRL == 0) { n |= NEEDS_MUTE_ENABLED; } @@ -412,16 +412,16 @@ void AudioMixer::process__validate(state_t* state) t.hook = track__nop; } else { if ((n & NEEDS_AUX__MASK) == NEEDS_AUX_ENABLED) { - all16BitsStereoNoResample = 0; + all16BitsStereoNoResample = false; } if ((n & NEEDS_RESAMPLE__MASK) == NEEDS_RESAMPLE_ENABLED) { - all16BitsStereoNoResample = 0; - resampling = 1; + all16BitsStereoNoResample = false; + resampling = true; t.hook = track__genericResample; } else { if ((n & NEEDS_CHANNEL_COUNT__MASK) == NEEDS_CHANNEL_1){ t.hook = track__16BitsMono; - all16BitsStereoNoResample = 0; + all16BitsStereoNoResample = false; } if ((n & NEEDS_CHANNEL_COUNT__MASK) == NEEDS_CHANNEL_2){ t.hook = track__16BitsStereo; @@ -469,7 +469,7 @@ void AudioMixer::process__validate(state_t* state) // Now that the volume ramp has been done, set optimal state and // track hooks for subsequent mixer process if (countActiveTracks) { - int allMuted = 1; + bool allMuted = true; uint32_t en = state->enabledTracks; while (en) { const int i = 31 - __builtin_clz(en); @@ -480,7 +480,7 @@ void AudioMixer::process__validate(state_t* state) t.needs |= NEEDS_MUTE_ENABLED; t.hook = track__nop; } else { - allMuted = 0; + allMuted = false; } } if (allMuted) { |