ofAndroidSoundPlayer : removing unused funcntions in ofxAndroidSoundPlayer.h .cpp - adding a few modifications found in the iOS v12.0 version to the Java source

(cherry picked from commit 5c3f9de)

Author: tctr

addons/ofxAndroid/Java/cc/openframeworks/OFAndroidSoundPlayer.java

@@ -1,12 +1,13 @@
 package cc.openframeworks;
 
+import android.media.AudioAttributes;
 import android.media.AudioManager;
 import android.media.MediaPlayer;
 import android.media.SoundPool;
 import android.util.FloatMath;
 import android.util.Log;
 
-public class OFAndroidSoundPlayer extends OFAndroidObject{
+public class OFAndroidSoundPlayer extends OFAndroidObject implements MediaPlayer.OnPreparedListener, MediaPlayer.OnErrorListener{
 	OFAndroidSoundPlayer(){
 		pan = 0.f;
 		volume = leftVolume = rightVolume = 1;
@@ -18,15 +19,45 @@ public class OFAndroidSoundPlayer extends OFAndroidObject{
 		streamID = -1;
 		multiPlay = false;
 	}
+
+	public void onDestroy() {
+		stop();
+		unloadSound();
+		if (player != null) {player.stop(); player.release(); }
+		if(pool != null) pool.release(); pool = null;
+		if(attributes != null) attributes = null;
+	}
+
+	protected void setContentType(int contentType){
+		if(loop) contentType = AudioAttributes.CONTENT_TYPE_MUSIC;
+		 	attributes = new AudioAttributes.Builder()
+				.setUsage(AudioAttributes.USAGE_GAME)
+				.setContentType(contentType)
+				.build();
+
+	}
+
+	protected void createSoundPool(){
+		if(pool == null) {
+			pool = new SoundPool.Builder()
+					.setAudioAttributes(attributes)
+					.setMaxStreams(128)
+					.build();
+		}
+	}
 
 	void loadSound(String fileName, boolean stream){
 		try {
+			setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION);
 			if(stream){
 				if(player!=null) unloadSound();
 				player = new MediaPlayer();
+				player.setOnErrorListener(this);
+				player.setAudioAttributes(attributes);
 				player.setDataSource(fileName);
 				player.prepare();
 			}else{
+				createSoundPool();
 				if(soundID!=-1) unloadSound();
 				soundID = pool.load(fileName, 1);
 			}
@@ -41,13 +72,14 @@ void loadSound(String fileName, boolean stream){
 
 	void unloadSound(){
 		if(player!=null){
+			player.stop();
 			player.reset();
 			player.release();
 			player = null;
 		}
 
 		if(soundID!=-1){
-			pool.unload(soundID);
+			if(pool != null) pool.unload(soundID);
 		}
 		fileName = null;
 		soundID = -1;
@@ -59,9 +91,10 @@ void unloadSound(){
 	void play(){
 		if(stream){
 			if(player==null) return;
-			if(getIsPlaying()) setPosition(0);	
+			if(getIsPlaying() && getPosition() != 0) setPosition(0);
 			player.start();
 		}else{
+			if(pool == null) return;
 			if(!multiPlay){
 				pool.stop(streamID);
 			}
@@ -72,8 +105,13 @@ void play(){
 	void stop(){
 		if(stream){
 			if(player==null) return;
-			player.stop();
+			if(player.isPlaying()) {
+				//player.stop();
+				player.pause();
+				player.seekTo(0);
+			}
 		}else if(streamID!=-1){
+			if(pool == null) return;
 			pool.stop(streamID);
 			bIsPlaying = false;
 		}
@@ -98,7 +136,7 @@ void setVolume(float vol){
 		if(stream){
 			if(player!=null) player.setVolume(leftVolume, rightVolume);
 		}else if(streamID!=-1){
-			pool.setVolume(streamID, leftVolume, rightVolume);
+			if(pool != null) pool.setVolume(streamID, leftVolume, rightVolume);
 		}
 	}
 
@@ -116,7 +154,9 @@ void setSpeed(float spd){
 		if(spd<0.5) spd = 0.5f;
 		if(spd>2) spd=2;
 		speed = spd;
-		if(!stream && streamID!=-1) pool.setRate(streamID, spd);
+		if(!stream && streamID!=-1) {
+			if(pool != null) pool.setRate(streamID, spd);
+		}
 	}
 
 	void setPaused(boolean bP){
@@ -127,6 +167,7 @@ void setPaused(boolean bP){
 			else
 				player.start();
 		}else if(streamID!=-1){
+			if(pool == null) return;
 			if(bP){
 				pool.pause(streamID);
 			}else{
@@ -141,7 +182,7 @@ void setLoop(boolean bLp){
 			if(player!=null)
 				player.setLooping(bLp);
 		}else{
-			if(streamID!=-1) pool.setLoop(streamID, -1);
+			if(streamID!=-1 && pool != null) pool.setLoop(streamID, -1);
 		}
 		loop = bLp;
 	}
@@ -157,22 +198,28 @@ void setMultiPlay(boolean bMp){
 	}
 
 	void setPosition(float pct){
-		if(stream && player!=null) player.seekTo((int) (player.getDuration()*pct)); // 0 = start, 1 = end;
+		if(stream && player!=null && player.isPlaying()) {
+			if(getPositionMS() != pct)
+				player.seekTo((int) (player.getDuration() * pct)); // 0 = start, 1 = end;
+		}
 	}
 
 	void setPositionMS(int ms){
-		if(stream && player!=null) player.seekTo(ms); // 0 = start, 1 = end;
+		if(stream && player!=null && player.isPlaying()) {
+			if(getPosition() != ms)
+				player.seekTo(ms); // 0 = start, 1 = end;
+		}
 	}
 
 	float getPosition(){
-		if(stream && player!=null)
+		if(stream && player!=null && player.isPlaying())
 			return ((float)player.getCurrentPosition())/(float)player.getDuration();
 		else
 			return 0;
 	}
 
 	int getPositionMS(){
-		if(stream && player!=null)
+		if(stream && player!=null && player.isPlaying())
 			return player.getCurrentPosition();
 		else
 			return 0;
@@ -206,23 +253,40 @@ protected void appPause() {
 		unloadSound();
 		fileName = currFileName;
 		bIsLoaded = currIsLoaded;
+		if(pool != null) pool.autoPause();
 	}
 
 	@Override
 	protected void appResume() {
 		if(bIsLoaded){
 			loadSound(fileName, stream);
 		}
+		if(pool != null) pool.autoResume();
 	}
 
 	@Override
 	protected void appStop() {
 		appPause();
 	}
-	
-	
+
+	@Override
+	public void onPrepared(MediaPlayer mediaPlayer) {
+
+	}
+
+	@Override
+	public boolean onError(MediaPlayer mp, int what, int extra) {
+		// ... react appropriately ...
+		// The MediaPlayer has moved to the Error state, must be reset!
+		Log.w("OF", "onError The MediaPlayer has moved to the Error state, must be reset!");
+		return true;
+	}
+
+
+
 	private MediaPlayer player;
-	private static SoundPool pool = new SoundPool(128, AudioManager.STREAM_MUSIC, 0);
+	private static SoundPool pool = null;
+	AudioAttributes attributes;
 	private float pan;
 	private float volume;
 	private boolean bIsLoaded;

addons/ofxAndroid/src/ofxAndroidSoundPlayer.cpp

@@ -56,9 +56,7 @@ bool ofxAndroidSoundPlayer::load(const of::filesystem::path& fileName, bool stre
 		return false;
 	}
 
-    of::filesystem::path absolutePath = ofToDataPath(fileName,true);
-
-	jstring javaFileName = ofGetJNIEnv()->NewStringUTF(absolutePath.c_str());
+	jstring javaFileName = ofGetJNIEnv()->NewStringUTF(ofToDataPath(fileName,true).c_str());
 	env->CallVoidMethod(javaSoundPlayer,javaLoadMethod,javaFileName,stream?1:0);
 	env->DeleteLocalRef((jobject)javaFileName);
 	return true;
@@ -475,13 +473,3 @@ bool ofxAndroidSoundPlayer::isLoaded() const{
 
 	return env->CallBooleanMethod(javaSoundPlayer,javaIsLoadedMethod);
 }
-
-void ofxAndroidSoundPlayer::audioIn(ofSoundBuffer &) const {
-
-}
-
-void ofxAndroidSoundPlayer::audioOut(ofSoundBuffer &) const {
-
-}
-
-

addons/ofxAndroid/src/ofxAndroidSoundPlayer.h

@@ -3,8 +3,6 @@
 #include "ofSoundBaseTypes.h"
 #include <jni.h>
 
-class ofSoundBuffer;
-
 class ofxAndroidSoundPlayer: public ofBaseSoundPlayer{
 public:
 	ofxAndroidSoundPlayer();
@@ -33,9 +31,6 @@ class ofxAndroidSoundPlayer: public ofBaseSoundPlayer{
 	float getVolume() const;
 	bool isLoaded() const;
 
-	void audioIn(ofSoundBuffer&) const;
-	void audioOut(ofSoundBuffer&) const;
-
 private:
 	jobject javaSoundPlayer;
 	jclass javaClass;