CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-01-27 14:23:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(Android frontend) Take out audio_latency_auto - now handled in native activity

Browse Source
This commit is contained in:
twinaphex 2014-06-13 00:36:58 +02:00
parent 9ed3f3847c
commit 86ee594b68
3 changed files with 1 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
android/phoenix/res/xml/audio_preferences.xml
View File

@ -18,10 +18,4 @@
android:summary="@string/audio_latency_desc"
android:title="@string/audio_latency"
android:dependency="audio_enable" />
<CheckBoxPreference
android:defaultValue="true"
android:key="audio_latency_auto"
android:summary="@string/auto_audio_latency_desc"
android:title="@string/auto_audio_latency"
android:dependency="audio_enable" />
</PreferenceScreen>
</PreferenceScreen>

43
android/phoenix/src/com/retroarch/browser/mainmenu/MainMenuFragment.java
View File

@ -224,47 +224,6 @@ public final class MainMenuFragment extends PreferenceListFragment implements On
SharedPreferences prefs = UserPreferences.getPreferences(ctx);
SharedPreferences.Editor edit = prefs.edit();
edit.putString("video_refresh_rate", Double.toString(60.00d));
edit.putBoolean("audio_latency_auto", true);
edit.commit();
UserPreferences.updateConfigFile(ctx);
}
});
alert.show();
retval = true;
}
else if (Build.MODEL.equals("GAMEMID_BT"))
{
AlertDialog.Builder alert = new AlertDialog.Builder(ctx);
alert.setTitle(R.string.game_mid_detected);
alert.setMessage(messageId);
alert.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener()
{
@Override
public void onClick(DialogInterface dialog, int which)
{
SharedPreferences prefs = UserPreferences.getPreferences(ctx);
SharedPreferences.Editor edit = prefs.edit();
edit.putBoolean("audio_latency_auto", false);
edit.commit();
UserPreferences.updateConfigFile(ctx);
}
});
alert.show();
retval = true;
}
else if (Build.MODEL.equals("OUYA Console"))
{
AlertDialog.Builder alert = new AlertDialog.Builder(ctx);
alert.setTitle(R.string.ouya_detected);
alert.setMessage(messageId);
alert.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener()
{
@Override
public void onClick(DialogInterface dialog, int which)
{
SharedPreferences prefs = UserPreferences.getPreferences(ctx);
SharedPreferences.Editor edit = prefs.edit();
edit.putBoolean("audio_latency_auto", true);
edit.commit();
UserPreferences.updateConfigFile(ctx);
}
@ -286,7 +245,6 @@ public final class MainMenuFragment extends PreferenceListFragment implements On
SharedPreferences.Editor edit = prefs.edit();
edit.putBoolean("video_threaded", false);
edit.putString("video_refresh_rate", Double.toString(59.19132938771038));
edit.putBoolean("audio_latency_auto", false);
edit.commit();
UserPreferences.updateConfigFile(ctx);
}
@ -307,7 +265,6 @@ public final class MainMenuFragment extends PreferenceListFragment implements On
SharedPreferences prefs = UserPreferences.getPreferences(ctx);
SharedPreferences.Editor edit = prefs.edit();
edit.putString("video_refresh_rate", Double.toString(59.65));
edit.putBoolean("audio_latency_auto", false);
edit.commit();
UserPreferences.updateConfigFile(ctx);
}

8
android/phoenix/src/com/retroarch/browser/preferences/fragments/AudioPreferenceFragment.java
View File

@ -19,13 +19,5 @@ public final class AudioPreferenceFragment extends PreferenceListFragment
// Add audio preferences from the XML.
addPreferencesFromResource(R.xml.audio_preferences);
// Disable automatic detection of optimal audio latency if a device is below Android 4.1
final CheckBoxPreference autoDetectAudioLatency = (CheckBoxPreference) findPreference("audio_latency_auto");
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN)
{
autoDetectAudioLatency.setChecked(false);
autoDetectAudioLatency.setEnabled(false);
}
}
}