Commit a9e16df2 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files

Change default aout to Java, for now

parent 768c84e0
......@@ -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>
......@@ -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">
......
......@@ -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 {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment