From 8426bb7baf7f600ed01afe83971f7792265e83e3 Mon Sep 17 00:00:00 2001 From: shadowislord Date: Thu, 20 Nov 2014 20:36:36 -0500 Subject: [PATCH] Officially switch to the new Android audio system (PART 2..) --- jme3-android/src/main/java/com/jme3/app/AndroidHarness.java | 4 ++-- .../main/java/com/jme3/system/android/JmeAndroidSystem.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jme3-android/src/main/java/com/jme3/app/AndroidHarness.java b/jme3-android/src/main/java/com/jme3/app/AndroidHarness.java index db1d52358..b601e879f 100644 --- a/jme3-android/src/main/java/com/jme3/app/AndroidHarness.java +++ b/jme3-android/src/main/java/com/jme3/app/AndroidHarness.java @@ -91,7 +91,7 @@ public class AndroidHarness extends Activity implements TouchListener, DialogInt /** * Sets the type of Audio Renderer to be used. *

- * Android MediaPlayer / SoundPool is the default and can be used on all + * Android MediaPlayer / SoundPool can be used on all * supported Android platform versions (2.2+)
* OpenAL Soft uses an OpenSL backend and is only supported on Android * versions 2.3+. @@ -99,7 +99,7 @@ public class AndroidHarness extends Activity implements TouchListener, DialogInt * Only use ANDROID_ static strings found in AppSettings * */ - protected String audioRendererType = AppSettings.ANDROID_MEDIAPLAYER; + protected String audioRendererType = AppSettings.ANDROID_OPENAL_SOFT; /** * If true Android Sensors are used as simulated Joysticks. Users can use the diff --git a/jme3-android/src/main/java/com/jme3/system/android/JmeAndroidSystem.java b/jme3-android/src/main/java/com/jme3/system/android/JmeAndroidSystem.java index e036a53e1..6dadba841 100644 --- a/jme3-android/src/main/java/com/jme3/system/android/JmeAndroidSystem.java +++ b/jme3-android/src/main/java/com/jme3/system/android/JmeAndroidSystem.java @@ -106,8 +106,8 @@ public class JmeAndroidSystem extends JmeSystemDelegate { } else if (settings.getAudioRenderer().equals(AppSettings.ANDROID_OPENAL_SOFT)) { audioRendererType = AppSettings.ANDROID_OPENAL_SOFT; } else { - logger.log(Level.INFO, "AudioRenderer not set. Defaulting to Android MediaPlayer / SoundPool"); - audioRendererType = AppSettings.ANDROID_MEDIAPLAYER; + logger.log(Level.INFO, "AudioRenderer not set. Defaulting to OpenAL Soft"); + audioRendererType = AppSettings.ANDROID_OPENAL_SOFT; } initialize(settings); JmeContext ctx = new OGLESContext();