diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-01-27 16:47:15 -0800 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2012-02-03 07:57:01 -0800 |
| commit | a0d68338a88c2ddb4502f95017b546d603ef1ec7 (patch) | |
| tree | f052125f4720fde00179d41d4ee04e02934052e4 /services/audioflinger/AudioMixer.cpp | |
| parent | 87f155d6655b2d3b27e69281a29e85c6407e4d26 (diff) | |
| download | frameworks_av-a0d68338a88c2ddb4502f95017b546d603ef1ec7.zip frameworks_av-a0d68338a88c2ddb4502f95017b546d603ef1ec7.tar.gz frameworks_av-a0d68338a88c2ddb4502f95017b546d603ef1ec7.tar.bz2 | |
Use NULL not 0 for raw pointers
Use if (p != NULL) instead of if (ptr)
Change-Id: Iaec3413a59ccbf233c98fcd918cc7d70ac5da9fa
Diffstat (limited to 'services/audioflinger/AudioMixer.cpp')
| -rw-r--r-- | services/audioflinger/AudioMixer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/audioflinger/AudioMixer.cpp b/services/audioflinger/AudioMixer.cpp index 1f7d883..0b9f8ba 100644 --- a/services/audioflinger/AudioMixer.cpp +++ b/services/audioflinger/AudioMixer.cpp @@ -125,7 +125,7 @@ void AudioMixer::deleteTrackName(int name) track.enabled = 0; invalidateState(1<<name); } - if (track.resampler) { + if (track.resampler != NULL) { // delete the resampler delete track.resampler; track.resampler = NULL; @@ -809,7 +809,7 @@ void AudioMixer::process__nop(state_t* state) while (outFrames) { t1.buffer.frameCount = outFrames; t1.bufferProvider->getNextBuffer(&t1.buffer); - if (!t1.buffer.raw) break; + if (t1.buffer.raw == NULL) break; outFrames -= t1.buffer.frameCount; t1.bufferProvider->releaseBuffer(&t1.buffer); } |