diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-02-17 16:24:10 -0800 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2012-02-22 11:46:53 -0800 |
| commit | f063b49e95c28d63a58215ebda892a5fee4204cc (patch) | |
| tree | 9909300bea158357aa45f1fb64f7b83c15208636 /media/libmedia/AudioEffect.cpp | |
| parent | c33305c5dd4cc06e71eb0c66a7150aa6ab647c99 (diff) | |
| download | frameworks_av-f063b49e95c28d63a58215ebda892a5fee4204cc.zip frameworks_av-f063b49e95c28d63a58215ebda892a5fee4204cc.tar.gz frameworks_av-f063b49e95c28d63a58215ebda892a5fee4204cc.tar.bz2 | |
Fix build warning
warning: pointer of type 'void *' used in arithmetic
warning: enumeral and non-enumeral type in conditional expression
Change-Id: I7b8d626a636145ef648e3b5d0e77068216dd012e
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 19b7e32..6808aa2 100644 --- a/media/libmedia/AudioEffect.cpp +++ b/media/libmedia/AudioEffect.cpp @@ -202,7 +202,7 @@ bool AudioEffect::getEnabled() const status_t AudioEffect::setEnabled(bool enabled) { if (mStatus != NO_ERROR) { - return (mStatus == ALREADY_EXISTS) ? INVALID_OPERATION : mStatus; + return (mStatus == ALREADY_EXISTS) ? (status_t) INVALID_OPERATION : mStatus; } status_t status = NO_ERROR; @@ -263,7 +263,7 @@ status_t AudioEffect::command(uint32_t cmdCode, status_t AudioEffect::setParameter(effect_param_t *param) { if (mStatus != NO_ERROR) { - return (mStatus == ALREADY_EXISTS) ? INVALID_OPERATION : mStatus; + return (mStatus == ALREADY_EXISTS) ? (status_t) INVALID_OPERATION : mStatus; } if (param == NULL || param->psize == 0 || param->vsize == 0) { @@ -281,7 +281,7 @@ status_t AudioEffect::setParameter(effect_param_t *param) status_t AudioEffect::setParameterDeferred(effect_param_t *param) { if (mStatus != NO_ERROR) { - return (mStatus == ALREADY_EXISTS) ? INVALID_OPERATION : mStatus; + return (mStatus == ALREADY_EXISTS) ? (status_t) INVALID_OPERATION : mStatus; } if (param == NULL || param->psize == 0 || param->vsize == 0) { @@ -307,7 +307,7 @@ status_t AudioEffect::setParameterDeferred(effect_param_t *param) status_t AudioEffect::setParameterCommit() { if (mStatus != NO_ERROR) { - return (mStatus == ALREADY_EXISTS) ? INVALID_OPERATION : mStatus; + return (mStatus == ALREADY_EXISTS) ? (status_t) INVALID_OPERATION : mStatus; } Mutex::Autolock _l(mCblk->lock); |