Remove dead code

Change-Id: Ic68d4d7b942ef99120ad30ee3ef7ce48ff1d697a

diff --git a/wilhelm/src/android/AudioPlayer_to_android.cpp b/wilhelm/src/android/AudioPlayer_to_android.cpp
index 1409066..519cdd5 100644 (file)
--- a/wilhelm/src/android/AudioPlayer_to_android.cpp
+++ b/wilhelm/src/android/AudioPlayer_to_android.cpp
@@ -458,42 +458,6 @@ void audioPlayer_dispatch_headAtEnd_lockPlay(CAudioPlayer *ap, bool setPlayState
 
 
 //-----------------------------------------------------------------------------
-/**
- * pre-condition: AudioPlayer has SLPrefetchStatusItf initialized
- * post-condition:
- *  - ap->mPrefetchStatus.mStatus == status
- *  - the prefetch status callback, if any, has been notified if a change occurred
- *
- */
-void audioPlayer_dispatch_prefetchStatus_lockPrefetch(CAudioPlayer *ap, SLuint32 status,
-        bool needToLock) {
-    slPrefetchCallback prefetchCallback = NULL;
-    void * prefetchContext = NULL;
-
-    if (needToLock) {
-        interface_lock_exclusive(&ap->mPrefetchStatus);
-    }
-    // status change?
-    if (ap->mPrefetchStatus.mStatus != status) {
-        ap->mPrefetchStatus.mStatus = status;
-        // callback or no callback?
-        if (ap->mPrefetchStatus.mCallbackEventsMask & SL_PREFETCHEVENT_STATUSCHANGE) {
-            prefetchCallback = ap->mPrefetchStatus.mCallback;
-            prefetchContext  = ap->mPrefetchStatus.mContext;
-        }
-    }
-    if (needToLock) {
-        interface_unlock_exclusive(&ap->mPrefetchStatus);
-    }
-
-    // callback with no lock held
-    if (NULL != prefetchCallback) {
-        (*prefetchCallback)(&ap->mPrefetchStatus.mItf, prefetchContext, status);
-    }
-}
-
-
-//-----------------------------------------------------------------------------
 SLresult audioPlayer_setStreamType(CAudioPlayer* ap, SLint32 type) {
     SLresult result = SL_RESULT_SUCCESS;
     SL_LOGV("type %d", type);

diff --git a/wilhelm/src/android/BufferQueueSource.cpp b/wilhelm/src/android/BufferQueueSource.cpp
index dce5ed2..323a3a0 100644 (file)
--- a/wilhelm/src/android/BufferQueueSource.cpp
+++ b/wilhelm/src/android/BufferQueueSource.cpp
@@ -68,11 +68,10 @@ ssize_t BufferQueueSource::readAt(off64_t offset, void *data, size_t size) {
         return 0;
     }
 
-    ssize_t readSize = 0;
+    ssize_t readSize;
     slAndroidBufferQueueCallback callback = NULL;
-    void* pBufferContext, *pBufferData, *callbackPContext = NULL;
-    AdvancedBufferHeader *oldFront = NULL;
-    uint32_t dataSize, dataUsed = 0;
+    void* pBufferContext, *pBufferData, *callbackPContext;
+    uint32_t dataSize, dataUsed;
 
     interface_lock_exclusive(mAndroidBufferQueueSource);
 
@@ -81,7 +80,7 @@ ssize_t BufferQueueSource::readAt(off64_t offset, void *data, size_t size) {
     } else {
         assert(mAndroidBufferQueueSource->mFront != mAndroidBufferQueueSource->mRear);
 
-        oldFront = mAndroidBufferQueueSource->mFront;
+        AdvancedBufferHeader *oldFront = mAndroidBufferQueueSource->mFront;
         AdvancedBufferHeader *newFront = &oldFront[1];
 
         // where to read from

diff --git a/wilhelm/src/android/android_AudioToCbRenderer.cpp b/wilhelm/src/android/android_AudioToCbRenderer.cpp
index 721226f..d53ec1e 100644 (file)
--- a/wilhelm/src/android/android_AudioToCbRenderer.cpp
+++ b/wilhelm/src/android/android_AudioToCbRenderer.cpp
@@ -45,12 +45,6 @@ void AudioToCbRenderer::setDataPushListener(const data_push_cbf_t pushCbf, CAudi
 
 //--------------------------------------------------
 // Event handlers
-void AudioToCbRenderer::onPrepare() {
-    SL_LOGD("AudioToCbRenderer::onPrepare()");
-    AudioSfDecoder::onPrepare();
-    SL_LOGD("AudioToCbRenderer::onPrepare() done, mStateFlags=0x%x", mStateFlags);
-}
-
 
 void AudioToCbRenderer::onRender() {
     SL_LOGV("AudioToCbRenderer::onRender");

diff --git a/wilhelm/src/android/android_AudioToCbRenderer.h b/wilhelm/src/android/android_AudioToCbRenderer.h
index f9d5e40..3d5658d 100644 (file)
--- a/wilhelm/src/android/android_AudioToCbRenderer.h
+++ b/wilhelm/src/android/android_AudioToCbRenderer.h
@@ -34,7 +34,6 @@ public:
 protected:
 
     // Async event handlers (called from GenericPlayer's event loop)
-    virtual void onPrepare();
     virtual void onRender();
 
     // overridden from AudioSfDecoder

diff --git a/wilhelm/src/android/android_GenericMediaPlayer.cpp b/wilhelm/src/android/android_GenericMediaPlayer.cpp
index 8cca0d8..0842848 100644 (file)
--- a/wilhelm/src/android/android_GenericMediaPlayer.cpp
+++ b/wilhelm/src/android/android_GenericMediaPlayer.cpp
@@ -304,7 +304,7 @@ void GenericMediaPlayer::onSeek(const sp<AMessage> &msg) {
         // we are not ready to accept a seek command at this time, retry later
         msg->post(DEFAULT_COMMAND_DELAY_FOR_REPOST_US);
     } else {
-        if (msg->findInt64(WHATPARAM_SEEK_SEEKTIME_MS, &timeMsec) && (mPlayer != 0)) {
+        if (mPlayer != 0) {
             mStateFlags |= kFlagSeeking;
             mSeekTimeMsec = (int32_t)timeMsec;
             if (OK != mPlayer->seekTo(timeMsec)) {