[Android] Change default aout to Java, for now

[Jean-Baptiste Kempf]

android | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Jun 22 21:17:56 2012 +0200| [a9e16df20af7724fd8c846c0d8912b6d1b55c579] | committer: Jean-Baptiste Kempf

Change default aout to Java, for now

> http://git.videolan.org/gitweb.cgi/android.git/?a=commit;h=a9e16df20af7724fd8c846c0d8912b6d1b55c579
---

 vlc-android/res/values/strings.xml           |    4 ++--
 vlc-android/res/xml/preferences.xml          |    2 +-
 vlc-android/src/org/videolan/vlc/LibVLC.java |    8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/vlc-android/res/values/strings.xml b/vlc-android/res/values/strings.xml
index 29a4261..1c9ad09 100644
--- a/vlc-android/res/values/strings.xml
+++ b/vlc-android/res/values/strings.xml
@@ -107,12 +107,12 @@
     <string name="aout_audiotrack_java">AudioTrack (Java)</string>
     <string name="aout_opensles">OpenSL ES</string>
     <string-array name="aouts_froyo">
-        <item>@string/aout_audiotrack</item>
         <item>@string/aout_audiotrack_java</item>
+        <item>@string/aout_audiotrack</item>
     </string-array>
     <string-array name="aouts">
-        <item>@string/aout_audiotrack</item>
         <item>@string/aout_audiotrack_java</item>
+        <item>@string/aout_audiotrack</item>
         <item>@string/aout_opensles</item>
     </string-array>
 </resources>
diff --git a/vlc-android/res/xml/preferences.xml b/vlc-android/res/xml/preferences.xml
index c4fca2e..c572ae6 100644
--- a/vlc-android/res/xml/preferences.xml
+++ b/vlc-android/res/xml/preferences.xml
@@ -45,7 +45,7 @@
         </CheckBoxPreference>
         <ListPreference
             android:key="aout"
-            android:defaultValue="@string/aout_audiotrack"
+            android:defaultValue="@string/aout_audiotrack_java"
             android:title="@string/aout" >
         </ListPreference>
         <PreferenceScreen android:title="@string/advanced_debugging">
diff --git a/vlc-android/src/org/videolan/vlc/LibVLC.java b/vlc-android/src/org/videolan/vlc/LibVLC.java
index 36ec59d..bbbb5fc 100644
--- a/vlc-android/src/org/videolan/vlc/LibVLC.java
+++ b/vlc-android/src/org/videolan/vlc/LibVLC.java
@@ -22,7 +22,6 @@ package org.videolan.vlc;
 
 import org.videolan.vlc.gui.video.VideoPlayerActivity;
 import org.videolan.vlc.LibVlcException;
-import org.videolan.vlc.TrackInfo;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -117,6 +116,7 @@ public class LibVLC {
      * It is bad practice to rely on them, so please don't forget to call
      * destroy() before exiting.
      */
+    @Override
     public void finalize() {
         if (mLibVlcInstance != 0) {
             Log.d(TAG, "LibVLC is was destroyed yet before finalize()");
@@ -153,12 +153,12 @@ public class LibVLC {
 
     public static synchronized void setAout(Context context, String aoutPref, boolean reset) {
         Resources res = context.getResources();
-        if (aoutPref.equals(res.getString(R.string.aout_audiotrack_java)))
-            sAout = AOUT_AUDIOTRACK_JAVA;
+        if (aoutPref.equals(res.getString(R.string.aout_audiotrack)))
+            sAout = AOUT_AUDIOTRACK;
         else if (aoutPref.equals(res.getString(R.string.aout_opensles)) && Util.isGingerbreadOrLater())
             sAout = AOUT_OPENSLES;
         else
-            sAout = AOUT_AUDIOTRACK;
+            sAout = AOUT_AUDIOTRACK_JAVA;
 
         if (reset && sInstance != null) {
             try {