From c9725afa5cf6a15a407a93b05241a4df9c6eed98 Mon Sep 17 00:00:00 2001 From: Themaister Date: Sun, 7 Apr 2013 13:19:43 +0200 Subject: [PATCH] Update Android shader paths. --- .../src/org/retroarch/browser/RetroArch.java | 15 ++++++--------- .../src/org/retroarch/browser/ShaderActivity.java | 2 +- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/android/phoenix/src/org/retroarch/browser/RetroArch.java b/android/phoenix/src/org/retroarch/browser/RetroArch.java index 3cd5d55391..9c036c148c 100644 --- a/android/phoenix/src/org/retroarch/browser/RetroArch.java +++ b/android/phoenix/src/org/retroarch/browser/RetroArch.java @@ -391,15 +391,12 @@ public class RetroArch extends Activity implements config.setBoolean("video_scale_integer", prefs.getBoolean("video_scale_integer", false)); - String shaderPath = prefs.getString("video_bsnes_shader", ""); - if (prefs.getBoolean("video_shader_enable", false) && new File(shaderPath).exists()) { - config.setString("video_shader_type", "bsnes"); - config.setString("video_bsnes_shader", shaderPath); - } else { - config.setString("video_shader_type", "none"); - config.setString("video_bsnes_shader", ""); - } - + String shaderPath = prefs.getString("video_shader", ""); + config.setString("video_shader", shaderPath); + config.setBoolean("video_shader_enable", + prefs.getBoolean("video_shader_enable", false) + && new File(shaderPath).exists()); + boolean useOverlay = prefs.getBoolean("input_overlay_enable", true); if (useOverlay) { String overlayPath = prefs.getString("input_overlay", getCacheDir() + "/Overlays/snes-landscape.cfg"); diff --git a/android/phoenix/src/org/retroarch/browser/ShaderActivity.java b/android/phoenix/src/org/retroarch/browser/ShaderActivity.java index 43cc16329d..ada7355f13 100644 --- a/android/phoenix/src/org/retroarch/browser/ShaderActivity.java +++ b/android/phoenix/src/org/retroarch/browser/ShaderActivity.java @@ -12,7 +12,7 @@ public class ShaderActivity extends DirectoryActivity { super.setStartDirectory(shaderDir.getAbsolutePath()); super.addAllowedExt(".shader"); - super.setPathSettingKey("video_bsnes_shader"); + super.setPathSettingKey("video_shader"); super.onCreate(savedInstanceState); } }