From 6e31131dc148be814134987404c89ee946e432ca Mon Sep 17 00:00:00 2001
From: Jean-Michel Trivi <jmtrivi@google.com>
Date: Mon, 27 Sep 2010 17:05:06 -0700
Subject: Remove old stream type code that's not used anymore.

Change-Id: I66e0d93ffa8fbf8fd64642d5554026513d561153
---
 opensles/libopensles/android_AudioPlayer.cpp | 47 ----------------------------
 opensles/libopensles/android_AudioPlayer.h   |  3 --
 2 files changed, 50 deletions(-)

diff --git a/opensles/libopensles/android_AudioPlayer.cpp b/opensles/libopensles/android_AudioPlayer.cpp
index a0080d43..a85e7c76 100644
--- a/opensles/libopensles/android_AudioPlayer.cpp
+++ b/opensles/libopensles/android_AudioPlayer.cpp
@@ -1035,53 +1035,6 @@ SLresult android_audioPlayer_realize(CAudioPlayer *pAudioPlayer, SLboolean async
     return result;
 }
 
-//-----------------------------------------------------------------------------
-/*
- * Called with a lock held on the CAudioPlayer
- */
-SLresult android_audioPlayer_setStreamType_l(CAudioPlayer *pAudioPlayer, SLuint32 type) {
-    SLresult result = SL_RESULT_SUCCESS;
-    SL_LOGV("android_audioPlayer_setStreamType %lu", type);
-
-    if (pAudioPlayer->mAudioTrack == NULL) {
-        return SL_RESULT_RESOURCE_ERROR;
-    }
-    if (type == android_to_sles_streamType(pAudioPlayer->mAudioTrack->streamType())) {
-        return SL_RESULT_SUCCESS;
-    }
-
-    int format =  pAudioPlayer->mAudioTrack->format();
-    uint32_t sr = sles_to_android_sampleRate(pAudioPlayer->mSampleRateMilliHz);
-
-    pAudioPlayer->mAudioTrack->stop();
-    delete pAudioPlayer->mAudioTrack;
-    pAudioPlayer->mAudioTrack = new android::AudioTrack(
-                    sles_to_android_streamType(type),               // streamType
-                    sr,                                             // sampleRate
-                    format,                                         // format
-                    pAudioPlayer->mNumChannels== 1 ?                //channel mask
-                            android::AudioSystem::CHANNEL_OUT_MONO :
-                            android::AudioSystem::CHANNEL_OUT_STEREO,
-                    0,                                              // frameCount (here min)
-                    0,                                              // flags
-                    pAudioPlayer->mAndroidObjType == MEDIAPLAYER ?  // callback
-                            audioTrack_callBack_uri : audioTrack_callBack_pullFromBuffQueue,
-                    (void *) pAudioPlayer,                          // user
-                    0    // FIXME find appropriate frame count      // notificationFrame
-#ifndef USE_BACKPORT
-                    , pAudioPlayer->mSessionId
-#endif
-                    );
-#ifndef USE_BACKPORT
-    if (pAudioPlayer->mAndroidObjType == MEDIAPLAYER) {
-        if (pAudioPlayer->mSfPlayer != 0) {
-            pAudioPlayer->mSfPlayer->useAudioTrack(pAudioPlayer->mAudioTrack);
-        }
-    }
-#endif
-
-    return result;
-}
 
 //-----------------------------------------------------------------------------
 SLresult android_audioPlayer_destroy(CAudioPlayer *pAudioPlayer) {
diff --git a/opensles/libopensles/android_AudioPlayer.h b/opensles/libopensles/android_AudioPlayer.h
index e7ff8680..ac86b6e3 100644
--- a/opensles/libopensles/android_AudioPlayer.h
+++ b/opensles/libopensles/android_AudioPlayer.h
@@ -75,9 +75,6 @@ extern SLresult android_audioPlayer_destroy(CAudioPlayer *pAudioPlayer);
 /**************************************************************************************************
  * Configuration
  ****************************/
-extern SLresult android_audioPlayer_setStreamType_l(CAudioPlayer *pAudioPlayer,
-        SLuint32 type);
-
 extern SLresult android_audioPlayer_setPlayRate(IPlaybackRate *pRateItf, SLpermille rate);
 
 extern SLresult android_audioPlayer_setPlaybackRateBehavior(IPlaybackRate *pRateItf,
-- 
cgit v1.2.3