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 /media/libmedia/AudioEffect.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 'media/libmedia/AudioEffect.cpp')
| -rw-r--r-- | media/libmedia/AudioEffect.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/media/libmedia/AudioEffect.cpp b/media/libmedia/AudioEffect.cpp index 6639d06..a242846 100644 --- a/media/libmedia/AudioEffect.cpp +++ b/media/libmedia/AudioEffect.cpp @@ -342,7 +342,7 @@ void AudioEffect::binderDied() { ALOGW("IEffect died"); mStatus = NO_INIT; - if (mCbf) { + if (mCbf != NULL) { status_t status = DEAD_OBJECT; mCbf(EVENT_ERROR, mUserData, &status); } @@ -363,7 +363,7 @@ void AudioEffect::controlStatusChanged(bool controlGranted) mStatus = ALREADY_EXISTS; } } - if (mCbf) { + if (mCbf != NULL) { mCbf(EVENT_CONTROL_STATUS_CHANGED, mUserData, &controlGranted); } } @@ -373,7 +373,7 @@ void AudioEffect::enableStatusChanged(bool enabled) ALOGV("enableStatusChanged %p enabled %d mCbf %p", this, enabled, mCbf); if (mStatus == ALREADY_EXISTS) { mEnabled = enabled; - if (mCbf) { + if (mCbf != NULL) { mCbf(EVENT_ENABLE_STATUS_CHANGED, mUserData, &enabled); } } @@ -389,7 +389,7 @@ void AudioEffect::commandExecuted(uint32_t cmdCode, return; } - if (mCbf && cmdCode == EFFECT_CMD_SET_PARAM) { + if (mCbf != NULL && cmdCode == EFFECT_CMD_SET_PARAM) { effect_param_t *cmd = (effect_param_t *)cmdData; cmd->status = *(int32_t *)replyData; mCbf(EVENT_PARAMETER_CHANGED, mUserData, cmd); |