diff options
author | Glenn Kasten <gkasten@google.com> | 2012-02-10 13:52:03 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-02-10 13:52:03 -0800 |
commit | c6253d501f8d9a39439c9a450697023e93013c43 (patch) | |
tree | 6bd4c716065b6cbddab130a44868edea8e70eb55 | |
parent | 5c39f03cc794561e448a82a2395bea8ab3cef5db (diff) | |
parent | 1137be1a686fdfc9f02c3aca7c33f28006df4742 (diff) | |
download | frameworks_base-c6253d501f8d9a39439c9a450697023e93013c43.zip frameworks_base-c6253d501f8d9a39439c9a450697023e93013c43.tar.gz frameworks_base-c6253d501f8d9a39439c9a450697023e93013c43.tar.bz2 |
am 1137be1a: Follow raw pointer and sp<> conventions
* commit '1137be1a686fdfc9f02c3aca7c33f28006df4742':
Follow raw pointer and sp<> conventions
-rw-r--r-- | core/jni/android_media_ToneGenerator.cpp | 4 | ||||
-rw-r--r-- | media/jni/soundpool/SoundPool.cpp | 7 | ||||
-rw-r--r-- | media/jni/soundpool/SoundPool.h | 2 | ||||
-rw-r--r-- | media/libmedia/IAudioFlinger.cpp | 2 | ||||
-rw-r--r-- | media/libmedia/JetPlayer.cpp | 8 | ||||
-rw-r--r-- | media/libmedia/ToneGenerator.cpp | 2 | ||||
-rw-r--r-- | services/audioflinger/AudioPolicyService.cpp | 4 |
7 files changed, 13 insertions, 16 deletions
diff --git a/core/jni/android_media_ToneGenerator.cpp b/core/jni/android_media_ToneGenerator.cpp index aabb778..0a337fa 100644 --- a/core/jni/android_media_ToneGenerator.cpp +++ b/core/jni/android_media_ToneGenerator.cpp @@ -72,9 +72,7 @@ static void android_media_ToneGenerator_release(JNIEnv *env, jobject thiz) { env->SetIntField(thiz, fields.context, 0); - if (lpToneGen) { - delete lpToneGen; - } + delete lpToneGen; } static void android_media_ToneGenerator_native_setup(JNIEnv *env, jobject thiz, diff --git a/media/jni/soundpool/SoundPool.cpp b/media/jni/soundpool/SoundPool.cpp index 0d51def..df4fbb5 100644 --- a/media/jni/soundpool/SoundPool.cpp +++ b/media/jni/soundpool/SoundPool.cpp @@ -840,7 +840,7 @@ void SoundChannel::autoResume() void SoundChannel::setRate(float rate) { Mutex::Autolock lock(&mLock); - if (mAudioTrack != 0 && mSample.get() != 0) { + if (mAudioTrack != NULL && mSample != 0) { uint32_t sampleRate = uint32_t(float(mSample->sampleRate()) * rate + 0.5); mAudioTrack->setSampleRate(sampleRate); mRate = rate; @@ -852,7 +852,8 @@ void SoundChannel::setVolume_l(float leftVolume, float rightVolume) { mLeftVolume = leftVolume; mRightVolume = rightVolume; - if (mAudioTrack != 0) mAudioTrack->setVolume(leftVolume, rightVolume); + if (mAudioTrack != NULL) + mAudioTrack->setVolume(leftVolume, rightVolume); } void SoundChannel::setVolume(float leftVolume, float rightVolume) @@ -864,7 +865,7 @@ void SoundChannel::setVolume(float leftVolume, float rightVolume) void SoundChannel::setLoop(int loop) { Mutex::Autolock lock(&mLock); - if (mAudioTrack != 0 && mSample.get() != 0) { + if (mAudioTrack != NULL && mSample != 0) { uint32_t loopEnd = mSample->size()/mNumChannels/ ((mSample->format() == AUDIO_FORMAT_PCM_16_BIT) ? sizeof(int16_t) : sizeof(uint8_t)); mAudioTrack->setLoop(0, loopEnd, loop); diff --git a/media/jni/soundpool/SoundPool.h b/media/jni/soundpool/SoundPool.h index 6b11c28..002b045 100644 --- a/media/jni/soundpool/SoundPool.h +++ b/media/jni/soundpool/SoundPool.h @@ -116,7 +116,7 @@ protected: class SoundChannel : public SoundEvent { public: enum state { IDLE, RESUMING, STOPPING, PAUSED, PLAYING }; - SoundChannel() : mAudioTrack(0), mState(IDLE), mNumChannels(1), + SoundChannel() : mAudioTrack(NULL), mState(IDLE), mNumChannels(1), mPos(0), mToggle(0), mAutoPaused(false) {} ~SoundChannel(); void init(SoundPool* soundPool); diff --git a/media/libmedia/IAudioFlinger.cpp b/media/libmedia/IAudioFlinger.cpp index c3252e7..4507e5d 100644 --- a/media/libmedia/IAudioFlinger.cpp +++ b/media/libmedia/IAudioFlinger.cpp @@ -559,7 +559,7 @@ public: if (status != NO_ERROR) { return status; } - if (numEffects) { + if (numEffects != NULL) { *numEffects = (uint32_t)reply.readInt32(); } return NO_ERROR; diff --git a/media/libmedia/JetPlayer.cpp b/media/libmedia/JetPlayer.cpp index 8456db5..6cb5b82 100644 --- a/media/libmedia/JetPlayer.cpp +++ b/media/libmedia/JetPlayer.cpp @@ -246,14 +246,12 @@ int JetPlayer::render() { }//while (1) threadExit: - if (mAudioTrack) { + if (mAudioTrack != NULL) { mAudioTrack->stop(); mAudioTrack->flush(); } - if (mAudioBuffer) { - delete [] mAudioBuffer; - mAudioBuffer = NULL; - } + delete [] mAudioBuffer; + mAudioBuffer = NULL; mMutex.lock(); mTid = -1; mCondition.signal(); diff --git a/media/libmedia/ToneGenerator.cpp b/media/libmedia/ToneGenerator.cpp index dfa41c4..6cb10aa 100644 --- a/media/libmedia/ToneGenerator.cpp +++ b/media/libmedia/ToneGenerator.cpp @@ -1045,7 +1045,7 @@ bool ToneGenerator::initAudioTrack() { initAudioTrack_exit: // Cleanup - if (mpAudioTrack) { + if (mpAudioTrack != NULL) { ALOGV("Delete Track I: %p", mpAudioTrack); delete mpAudioTrack; mpAudioTrack = NULL; diff --git a/services/audioflinger/AudioPolicyService.cpp b/services/audioflinger/AudioPolicyService.cpp index af464b2..f8b430e 100644 --- a/services/audioflinger/AudioPolicyService.cpp +++ b/services/audioflinger/AudioPolicyService.cpp @@ -588,10 +588,10 @@ status_t AudioPolicyService::dump(int fd, const Vector<String16>& args) } dumpInternals(fd); - if (mAudioCommandThread != NULL) { + if (mAudioCommandThread != 0) { mAudioCommandThread->dump(fd); } - if (mTonePlaybackThread != NULL) { + if (mTonePlaybackThread != 0) { mTonePlaybackThread->dump(fd); } |