From f35fc9e1f7ee34913607c4e207bda9ed7d942d1b Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 10 Oct 2013 16:47:19 +0200 Subject: [PATCH] Revert "(Android) Changes for filename naming convention changes" This reverts commit d9b909aadb25cb1401b6e7c28fc345adcaf976c9. --- android/phoenix/assets/libretro_cores.cfg | 112 +++++++++--------- .../browser/preferences/UserPreferences.java | 3 +- 2 files changed, 58 insertions(+), 57 deletions(-) diff --git a/android/phoenix/assets/libretro_cores.cfg b/android/phoenix/assets/libretro_cores.cfg index 5628e07d7f..8662f1c800 100644 --- a/android/phoenix/assets/libretro_cores.cfg +++ b/android/phoenix/assets/libretro_cores.cfg @@ -1,86 +1,86 @@ -mednafen_pce_fast_libretro = "Mednafen PCE-fast" -mednafen_pce_fast_libretro_system = "PC Engine/PC Engine CD" +mednafen_pce_fast_libretro_android = "Mednafen PCE-fast" +mednafen_pce_fast_libretro_android_system = "PC Engine/PC Engine CD" -mednafen_wswan_libretro = "Mednafen WSwan" -mednafen_wswan_libretro_system = "Wonderswan" +mednafen_wswan_libretro_android = "Mednafen WSwan" +mednafen_wswan_libretro_android_system = "Wonderswan" -fceumm_libretro = "FCEUmm" -fceumm_libretro_system = "Nintendo NES" +fceumm_libretro_android = "FCEUmm" +fceumm_libretro_android_system = "Nintendo NES" -mednafen_vb_libretro = "Mednafen VB" -mednafen_vb_libretro_system = "Virtual Boy" +mednafen_vb_libretro_android = "Mednafen VB" +mednafen_vb_libretro_android_system = "Virtual Boy" -fba_libretro = "Final Burn Alpha" -fba_libretro_system = "Arcade" +fba_libretro_android = "Final Burn Alpha" +fba_libretro_anddroid_system = "Arcade" -mednafen_ngp_libretro = "Mednafen NGP" -mednafen_ngp_libretro_system = "Neo-Geo Pocket" +mednafen_ngp_libretro_android = "Mednafen NGP" +mednafen_ngp_libretro_android_system = "Neo-Geo Pocket" -mednafen_psx_libretro = "Mednafen PSX" -mednafen_psx_libretro_system = "PlayStation1" +mednafen_psx_libretro_android = "Mednafen PSX" +mednafen_psx_libretro_android_system = "PlayStation1" -gambatte_libretro = "Gambatte" -gambatte_libretro_system = "GameBoy/GameBoy Color" +gambatte_libretro_android = "Gambatte" +gambatte_libretro_android_system = "GameBoy/GameBoy Color" -handy_libretro = "Handy" -handy_libretro_system = "Atari Lynx" +handy_libretro_android = "Handy" +handy_libretro_android_system = "Atari Lynx" -genesis_plus_gx_libretro = "Genesis Plus GX" -genesis_plus_gx_libretro_system = "Sega Genesis/Sega CD/Master System" +genesis_plus_gx_libretro_android = "Genesis Plus GX" +genesis_plus_gx_libretro_android_system = "Sega Genesis/Sega CD/Master System" -picodrive_libretro = "Picodrive" -picodrive_libretro_system = "Sega Genesis/Sega CD/Master System/32X" +picodrive_libretro_android = "Picodrive" +picodrive_libretro_android_system = "Sega Genesis/Sega CD/Master System/32X" -vba_next_libretro = "VBA Next" -vba_next_libretro_system = "GameBoy Advance" +vba_next_libretro_android = "VBA Next" +vba_next_libretro_android_system = "GameBoy Advance" vbam_libretro_android = "VBA-M" vbam_libretro_android_system = "GameBoy Advance" -prboom_libretro = "PrBoom" -prboom_libretro_system = "DOOM" +prboom_libretro_android = "PrBoom" +prboom_libretro_android_system = "DOOM" -snes9x_libretro = "SNES9x" -snes9x_libretro_system = "Nintendo SNES" +snes9x_libretro_android = "SNES9x" +snes9x_libretro_android_system = "Nintendo SNES" -snes9x_next_libretro = "SNES9x Next" -snes9x_next_libretro_system = "Nintendo SNES" +snes9x_next_libretro_android = "SNES9x Next" +snes9x_next_libretro_android_system = "Nintendo SNES" -nestopia_libretro = "Nestopia" -nestopia_libretro_system = "Nintendo NES" +nestopia_libretro_android = "Nestopia" +nestopia_libretro_android_system = "Nintendo NES" -pcsx_rearmed_libretro = "PCSX-reARMed" -pcsx_rearmed_libretro_system = "PlayStation1" +pcsx_rearmed_libretro_android = "PCSX-reARMed" +pcsx_rearmed_libretro_android_system = "PlayStation1" -nxengine_libretro = "NXEngine" -nxengine_libretro_system = "Cave Story/Doukutsu Monogatari" +nxengine_libretro_android = "NXEngine" +nxengine_libretro_android_system = "Cave Story/Doukutsu Monogatari" -quicknes_libretro = "QuickNES" -quicknes_libretro_system = "Nintendo NES" +quicknes_libretro_android = "QuickNES" +quicknes_libretro_android_system = "Nintendo NES" -tyrquake_libretro = "TyrQuake" -tyrquake_libretro_system = "Quake 1" +tyrquake_libretro_android = "TyrQuake" +tyrquake_libretro_android_system = "Quake 1" -instancingviewer_libretro = "InstancingViewer" -instancingviewer_libretro_system = "Images" +instancingviewer_libretro_android = "InstancingViewer" +instancingviewer_libretro_android_system = "Images" -desmume_libretro = "Desmume" -desmume_libretro_system = "Nintendo DS" +desmume_libretro_android = "Desmume" +desmume_libretro_android_system = "Nintendo DS" -stella_libretro = "Stella" -stella_lilbretro_system = "Atari 2600" +stella_libretro_android = "Stella" +stella_lilbretro_android_system = "Atari 2600" -scenewalker_libretro = "SceneWalker" -scenewalker_libretro_system = "Objects" +scenewalker_libretro_android = "SceneWalker" +scenewalker_libretro_android_system = "Objects" -modelviewer_libretro = "ModelViewer" -modelviewer_libretro_system = "Objects" +modelviewer_libretro_android = "ModelViewer" +modelviewer_libretro_android_system = "Objects" -mame078_libretro = "MAME 2003 [0.78]" -mame078_libretro_system = "Arcade" +mame078_libretro_android = "MAME 2003 [0.78]" +mame078_libretro_android_system = "Arcade" -bsnes_performance_libretro = "bsnes/higan Performance" -bsnes_performance_libretro_system = "Nintendo SNES" +bsnes_performance_libretro_android = "bsnes/higan Performance" +bsnes_performance_libretro_android_system = "Nintendo SNES" -dinothawr_libretro = "Dinothawr" -dinothawr_libretro_system = "Puzzle Game" +dinothawr_libretro_android = "Dinothawr" +dinothawr_libretro_android_system = "Puzzle Game" diff --git a/android/phoenix/src/org/retroarch/browser/preferences/UserPreferences.java b/android/phoenix/src/org/retroarch/browser/preferences/UserPreferences.java index c91e5e7008..087339fb56 100644 --- a/android/phoenix/src/org/retroarch/browser/preferences/UserPreferences.java +++ b/android/phoenix/src/org/retroarch/browser/preferences/UserPreferences.java @@ -372,7 +372,8 @@ public final class UserPreferences path.lastIndexOf("/") + 1, path.lastIndexOf(".")); sanitized_name = sanitized_name.replace("neon", ""); - sanitized_name = sanitized_name.replace("_libretro", ""); + sanitized_name = sanitized_name.replace("libretro_", ""); + sanitized_name = sanitized_name.replace("_android", ""); return sanitized_name; }