Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d5b7aca authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change Ic0e3ddf8 into eclair-mr2 

* changes:
  Remove unused Java object reference in native SoundPool code.
parents 38f6bdc4 c0e3ddf8

media/jni/soundpool/SoundPool.cpp

+1 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ uint32_t kMaxSampleRate = 48000; 
uint32_t kDefaultSampleRate = 44100;

uint32_t kDefaultFrameCount = 1200;



SoundPool::SoundPool(jobject soundPoolRef, int maxChannels, int streamType, int srcQuality)

SoundPool::SoundPool(int maxChannels, int streamType, int srcQuality)

{

    LOGV("SoundPool constructor: maxChannels=%d, streamType=%d, srcQuality=%d",

            maxChannels, streamType, srcQuality);
@@ -54,7 +54,6 @@ SoundPool::SoundPool(jobject soundPoolRef, int maxChannels, int streamType, int 
    LOGW_IF(maxChannels != mMaxChannels, "App requested %d channels", maxChannels);



    mQuit = false;

    mSoundPoolRef = soundPoolRef;

    mDecodeThread = 0;

    mStreamType = streamType;

    mSrcQuality = srcQuality;

media/jni/soundpool/SoundPool.h

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ class SoundPool { 
    friend class SoundPoolThread;

    friend class SoundChannel;

public:

    SoundPool(jobject soundPoolRef, int maxChannels, int streamType, int srcQuality);

    SoundPool(int maxChannels, int streamType, int srcQuality);

    ~SoundPool();

    int load(const char* url, int priority);

    int load(int fd, int64_t offset, int64_t length, int priority);

media/jni/soundpool/android_media_SoundPool.cpp

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ android_media_SoundPool_native_setup(JNIEnv *env, jobject thiz, 
        jobject weak_this, jint maxChannels, jint streamType, jint srcQuality)

{

    LOGV("android_media_SoundPool_native_setup");

    SoundPool *ap = new SoundPool(weak_this, maxChannels, streamType, srcQuality);

    SoundPool *ap = new SoundPool(maxChannels, streamType, srcQuality);

    if (ap == NULL) {

        jniThrowException(env, "java/lang/RuntimeException", "Out of memory");

        return;