diff --git a/android/andretro/.classpath b/android/andretro/.classpath deleted file mode 100644 index c5c5afd01d..0000000000 --- a/android/andretro/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/android/andretro/.project b/android/andretro/.project deleted file mode 100644 index 1a51a6a5da..0000000000 --- a/android/andretro/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - Retroarch - - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - - diff --git a/android/andretro/.settings/org.eclipse.jdt.core.prefs b/android/andretro/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 8000cd6ca6..0000000000 --- a/android/andretro/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,11 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/android/andretro/AndroidManifest.xml b/android/andretro/AndroidManifest.xml deleted file mode 100644 index f27845d9e1..0000000000 --- a/android/andretro/AndroidManifest.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/android/andretro/project.properties b/android/andretro/project.properties deleted file mode 100644 index 9b84a6b4bf..0000000000 --- a/android/andretro/project.properties +++ /dev/null @@ -1,14 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system edit -# "ant.properties", and override values to adapt the script to your -# project structure. -# -# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): -#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt - -# Project target. -target=android-16 diff --git a/android/andretro/res/drawable-hdpi/ic_launcher.png b/android/andretro/res/drawable-hdpi/ic_launcher.png deleted file mode 100644 index ea7613b8c4..0000000000 Binary files a/android/andretro/res/drawable-hdpi/ic_launcher.png and /dev/null differ diff --git a/android/andretro/res/drawable-ldpi/ic_launcher.png b/android/andretro/res/drawable-ldpi/ic_launcher.png deleted file mode 100644 index f969b747a2..0000000000 Binary files a/android/andretro/res/drawable-ldpi/ic_launcher.png and /dev/null differ diff --git a/android/andretro/res/drawable-mdpi/ic_launcher.png b/android/andretro/res/drawable-mdpi/ic_launcher.png deleted file mode 100644 index 84f2bca830..0000000000 Binary files a/android/andretro/res/drawable-mdpi/ic_launcher.png and /dev/null differ diff --git a/android/andretro/res/drawable-xhdpi/ic_launcher.png b/android/andretro/res/drawable-xhdpi/ic_launcher.png deleted file mode 100644 index a113106a99..0000000000 Binary files a/android/andretro/res/drawable-xhdpi/ic_launcher.png and /dev/null differ diff --git a/android/andretro/res/values/strings.xml b/android/andretro/res/values/strings.xml deleted file mode 100644 index 0402da9b84..0000000000 --- a/android/andretro/res/values/strings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - RetroArch - Input Method - File type icon - - \ No newline at end of file diff --git a/android/phoenix/.classpath b/android/phoenix/.classpath index 3f9691c5dd..c5c5afd01d 100644 --- a/android/phoenix/.classpath +++ b/android/phoenix/.classpath @@ -1,8 +1,9 @@ - - + + + diff --git a/android/andretro/.gitignore b/android/phoenix/.gitignore similarity index 100% rename from android/andretro/.gitignore rename to android/phoenix/.gitignore diff --git a/android/phoenix/.project b/android/phoenix/.project index e2ce45675d..1a51a6a5da 100644 --- a/android/phoenix/.project +++ b/android/phoenix/.project @@ -1,16 +1,10 @@ - RetroArch + Retroarch - - org.eclipse.cdt.managedbuilder.core.genmakebuilder - full,incremental, - - - com.android.ide.eclipse.adt.ResourceManagerBuilder @@ -31,25 +25,9 @@ - - org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder - full,incremental, - - - com.android.ide.eclipse.adt.AndroidNature org.eclipse.jdt.core.javanature - org.eclipse.cdt.core.cnature - org.eclipse.cdt.managedbuilder.core.managedBuildNature - org.eclipse.cdt.managedbuilder.core.ScannerConfigNature - - - res/retroarch.cfg - 1 - PARENT-2-PROJECT_LOC/retroarch.cfg - - diff --git a/android/phoenix/.settings/org.eclipse.jdt.core.prefs b/android/phoenix/.settings/org.eclipse.jdt.core.prefs index f77b31c2d2..8000cd6ca6 100644 --- a/android/phoenix/.settings/org.eclipse.jdt.core.prefs +++ b/android/phoenix/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,11 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/android/phoenix/AndroidManifest.xml b/android/phoenix/AndroidManifest.xml index cbb8bace7d..f27845d9e1 100644 --- a/android/phoenix/AndroidManifest.xml +++ b/android/phoenix/AndroidManifest.xml @@ -1,27 +1,31 @@ - - + - + + - + android:label="@string/app_name" > + - + - - + + + - + + \ No newline at end of file diff --git a/android/andretro/ant.properties b/android/phoenix/ant.properties similarity index 100% rename from android/andretro/ant.properties rename to android/phoenix/ant.properties diff --git a/android/andretro/build.xml b/android/phoenix/build.xml similarity index 100% rename from android/andretro/build.xml rename to android/phoenix/build.xml diff --git a/android/andretro/jni/Android.mk b/android/phoenix/jni/Android.mk similarity index 100% rename from android/andretro/jni/Android.mk rename to android/phoenix/jni/Android.mk diff --git a/android/andretro/jni/Application.mk b/android/phoenix/jni/Application.mk similarity index 100% rename from android/andretro/jni/Application.mk rename to android/phoenix/jni/Application.mk diff --git a/android/andretro/jni/modules/Android.mk b/android/phoenix/jni/modules/Android.mk similarity index 100% rename from android/andretro/jni/modules/Android.mk rename to android/phoenix/jni/modules/Android.mk diff --git a/android/andretro/libs/android-support-v4.jar b/android/phoenix/libs/android-support-v4.jar similarity index 100% rename from android/andretro/libs/android-support-v4.jar rename to android/phoenix/libs/android-support-v4.jar diff --git a/android/andretro/proguard-project.txt b/android/phoenix/proguard-project.txt similarity index 100% rename from android/andretro/proguard-project.txt rename to android/phoenix/proguard-project.txt diff --git a/android/phoenix/project.properties b/android/phoenix/project.properties index 0840b4a059..9b84a6b4bf 100644 --- a/android/phoenix/project.properties +++ b/android/phoenix/project.properties @@ -11,4 +11,4 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-15 +target=android-16 diff --git a/android/phoenix/res/drawable-hdpi/ic_action_load.png b/android/phoenix/res/drawable-hdpi/ic_action_load.png deleted file mode 100644 index 3ef03ab59a..0000000000 Binary files a/android/phoenix/res/drawable-hdpi/ic_action_load.png and /dev/null differ diff --git a/android/phoenix/res/drawable-hdpi/ic_action_main.png b/android/phoenix/res/drawable-hdpi/ic_action_main.png deleted file mode 100644 index c659124b9e..0000000000 Binary files a/android/phoenix/res/drawable-hdpi/ic_action_main.png and /dev/null differ diff --git a/android/phoenix/res/drawable-hdpi/ic_action_open.png b/android/phoenix/res/drawable-hdpi/ic_action_open.png deleted file mode 100644 index 41233c5e00..0000000000 Binary files a/android/phoenix/res/drawable-hdpi/ic_action_open.png and /dev/null differ diff --git a/android/phoenix/res/drawable-hdpi/ic_action_save.png b/android/phoenix/res/drawable-hdpi/ic_action_save.png deleted file mode 100644 index dbc044c9d8..0000000000 Binary files a/android/phoenix/res/drawable-hdpi/ic_action_save.png and /dev/null differ diff --git a/android/phoenix/res/drawable-hdpi/ic_action_settings.png b/android/phoenix/res/drawable-hdpi/ic_action_settings.png deleted file mode 100644 index c73c92ec96..0000000000 Binary files a/android/phoenix/res/drawable-hdpi/ic_action_settings.png and /dev/null differ diff --git a/android/andretro/res/drawable-hdpi/ic_dir.png b/android/phoenix/res/drawable-hdpi/ic_dir.png similarity index 100% rename from android/andretro/res/drawable-hdpi/ic_dir.png rename to android/phoenix/res/drawable-hdpi/ic_dir.png diff --git a/android/andretro/res/drawable-hdpi/ic_file.png b/android/phoenix/res/drawable-hdpi/ic_file.png similarity index 100% rename from android/andretro/res/drawable-hdpi/ic_file.png rename to android/phoenix/res/drawable-hdpi/ic_file.png diff --git a/android/phoenix/res/drawable-ldpi/ic_action_load.png b/android/phoenix/res/drawable-ldpi/ic_action_load.png deleted file mode 100644 index 92ae2f321e..0000000000 Binary files a/android/phoenix/res/drawable-ldpi/ic_action_load.png and /dev/null differ diff --git a/android/phoenix/res/drawable-ldpi/ic_action_main.png b/android/phoenix/res/drawable-ldpi/ic_action_main.png deleted file mode 100644 index 81b838512f..0000000000 Binary files a/android/phoenix/res/drawable-ldpi/ic_action_main.png and /dev/null differ diff --git a/android/phoenix/res/drawable-ldpi/ic_action_open.png b/android/phoenix/res/drawable-ldpi/ic_action_open.png deleted file mode 100644 index a291177360..0000000000 Binary files a/android/phoenix/res/drawable-ldpi/ic_action_open.png and /dev/null differ diff --git a/android/phoenix/res/drawable-ldpi/ic_action_save.png b/android/phoenix/res/drawable-ldpi/ic_action_save.png deleted file mode 100644 index 929966cacb..0000000000 Binary files a/android/phoenix/res/drawable-ldpi/ic_action_save.png and /dev/null differ diff --git a/android/phoenix/res/drawable-ldpi/ic_action_settings.png b/android/phoenix/res/drawable-ldpi/ic_action_settings.png deleted file mode 100644 index 7a3dc396bc..0000000000 Binary files a/android/phoenix/res/drawable-ldpi/ic_action_settings.png and /dev/null differ diff --git a/android/andretro/res/drawable-ldpi/ic_dir.png b/android/phoenix/res/drawable-ldpi/ic_dir.png similarity index 100% rename from android/andretro/res/drawable-ldpi/ic_dir.png rename to android/phoenix/res/drawable-ldpi/ic_dir.png diff --git a/android/andretro/res/drawable-ldpi/ic_file.png b/android/phoenix/res/drawable-ldpi/ic_file.png similarity index 100% rename from android/andretro/res/drawable-ldpi/ic_file.png rename to android/phoenix/res/drawable-ldpi/ic_file.png diff --git a/android/phoenix/res/drawable-mdpi/ic_action_load.png b/android/phoenix/res/drawable-mdpi/ic_action_load.png deleted file mode 100644 index 659c27fc84..0000000000 Binary files a/android/phoenix/res/drawable-mdpi/ic_action_load.png and /dev/null differ diff --git a/android/phoenix/res/drawable-mdpi/ic_action_main.png b/android/phoenix/res/drawable-mdpi/ic_action_main.png deleted file mode 100644 index 65b5553331..0000000000 Binary files a/android/phoenix/res/drawable-mdpi/ic_action_main.png and /dev/null differ diff --git a/android/phoenix/res/drawable-mdpi/ic_action_open.png b/android/phoenix/res/drawable-mdpi/ic_action_open.png deleted file mode 100644 index 9d0c7c070b..0000000000 Binary files a/android/phoenix/res/drawable-mdpi/ic_action_open.png and /dev/null differ diff --git a/android/phoenix/res/drawable-mdpi/ic_action_save.png b/android/phoenix/res/drawable-mdpi/ic_action_save.png deleted file mode 100644 index 45c25de467..0000000000 Binary files a/android/phoenix/res/drawable-mdpi/ic_action_save.png and /dev/null differ diff --git a/android/phoenix/res/drawable-mdpi/ic_action_settings.png b/android/phoenix/res/drawable-mdpi/ic_action_settings.png deleted file mode 100644 index 522c8a9cf5..0000000000 Binary files a/android/phoenix/res/drawable-mdpi/ic_action_settings.png and /dev/null differ diff --git a/android/andretro/res/drawable-mdpi/ic_dir.png b/android/phoenix/res/drawable-mdpi/ic_dir.png similarity index 100% rename from android/andretro/res/drawable-mdpi/ic_dir.png rename to android/phoenix/res/drawable-mdpi/ic_dir.png diff --git a/android/andretro/res/drawable-mdpi/ic_file.png b/android/phoenix/res/drawable-mdpi/ic_file.png similarity index 100% rename from android/andretro/res/drawable-mdpi/ic_file.png rename to android/phoenix/res/drawable-mdpi/ic_file.png diff --git a/android/phoenix/res/drawable-xhdpi/ic_action_load.png b/android/phoenix/res/drawable-xhdpi/ic_action_load.png deleted file mode 100644 index 3ef03ab59a..0000000000 Binary files a/android/phoenix/res/drawable-xhdpi/ic_action_load.png and /dev/null differ diff --git a/android/phoenix/res/drawable-xhdpi/ic_action_main.png b/android/phoenix/res/drawable-xhdpi/ic_action_main.png deleted file mode 100644 index e5090aa3d9..0000000000 Binary files a/android/phoenix/res/drawable-xhdpi/ic_action_main.png and /dev/null differ diff --git a/android/phoenix/res/drawable-xhdpi/ic_action_open.png b/android/phoenix/res/drawable-xhdpi/ic_action_open.png deleted file mode 100644 index 41233c5e00..0000000000 Binary files a/android/phoenix/res/drawable-xhdpi/ic_action_open.png and /dev/null differ diff --git a/android/phoenix/res/drawable-xhdpi/ic_action_save.png b/android/phoenix/res/drawable-xhdpi/ic_action_save.png deleted file mode 100644 index dbc044c9d8..0000000000 Binary files a/android/phoenix/res/drawable-xhdpi/ic_action_save.png and /dev/null differ diff --git a/android/phoenix/res/drawable-xhdpi/ic_action_settings.png b/android/phoenix/res/drawable-xhdpi/ic_action_settings.png deleted file mode 100644 index c73c92ec96..0000000000 Binary files a/android/phoenix/res/drawable-xhdpi/ic_action_settings.png and /dev/null differ diff --git a/android/andretro/res/drawable-xhdpi/ic_dir.png b/android/phoenix/res/drawable-xhdpi/ic_dir.png similarity index 100% rename from android/andretro/res/drawable-xhdpi/ic_dir.png rename to android/phoenix/res/drawable-xhdpi/ic_dir.png diff --git a/android/andretro/res/drawable-xhdpi/ic_file.png b/android/phoenix/res/drawable-xhdpi/ic_file.png similarity index 100% rename from android/andretro/res/drawable-xhdpi/ic_file.png rename to android/phoenix/res/drawable-xhdpi/ic_file.png diff --git a/android/phoenix/res/layout/file_choose.xml b/android/phoenix/res/layout/file_choose.xml deleted file mode 100644 index 84efdaaade..0000000000 --- a/android/phoenix/res/layout/file_choose.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - diff --git a/android/phoenix/res/layout/file_view.xml b/android/phoenix/res/layout/file_view.xml deleted file mode 100644 index ff99ca0b62..0000000000 --- a/android/phoenix/res/layout/file_view.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - diff --git a/android/andretro/res/layout/icon_grid_item.xml b/android/phoenix/res/layout/icon_grid_item.xml similarity index 100% rename from android/andretro/res/layout/icon_grid_item.xml rename to android/phoenix/res/layout/icon_grid_item.xml diff --git a/android/andretro/res/layout/icon_grid_list.xml b/android/phoenix/res/layout/icon_grid_list.xml similarity index 100% rename from android/andretro/res/layout/icon_grid_list.xml rename to android/phoenix/res/layout/icon_grid_list.xml diff --git a/android/andretro/res/layout/line_list.xml b/android/phoenix/res/layout/line_list.xml similarity index 100% rename from android/andretro/res/layout/line_list.xml rename to android/phoenix/res/layout/line_list.xml diff --git a/android/andretro/res/layout/line_list_item.xml b/android/phoenix/res/layout/line_list_item.xml similarity index 100% rename from android/andretro/res/layout/line_list_item.xml rename to android/phoenix/res/layout/line_list_item.xml diff --git a/android/phoenix/res/layout/main.xml b/android/phoenix/res/layout/main.xml deleted file mode 100644 index c51a388d09..0000000000 --- a/android/phoenix/res/layout/main.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - diff --git a/android/phoenix/res/layout/rombrowser.xml b/android/phoenix/res/layout/rombrowser.xml deleted file mode 100644 index 1555563624..0000000000 --- a/android/phoenix/res/layout/rombrowser.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - diff --git a/android/andretro/res/menu/directory_list.xml b/android/phoenix/res/menu/directory_list.xml similarity index 100% rename from android/andretro/res/menu/directory_list.xml rename to android/phoenix/res/menu/directory_list.xml diff --git a/android/phoenix/res/menu/main_menu.xml b/android/phoenix/res/menu/main_menu.xml deleted file mode 100644 index 05e808b581..0000000000 --- a/android/phoenix/res/menu/main_menu.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/android/phoenix/res/raw/retroarch.cfg b/android/phoenix/res/raw/retroarch.cfg deleted file mode 100644 index a63fa08c89..0000000000 --- a/android/phoenix/res/raw/retroarch.cfg +++ /dev/null @@ -1,404 +0,0 @@ -## Skeleton config file for RetroArch - -# Save all save files (*.srm) to this directory. This includes related files like .bsv, .rtc, .psrm, etc ... -# This will be overridden by explicit command line options. -# savefile_directory = - -# Save all save states (*.state) to this directory. -# This will be overridden by explicit command line options. -# savestate_directory = - -# Automatically saves a savestate at the end of RetroArch's lifetime. -# The path is $SRAM_PATH.auto. -# RetroArch will automatically load any savestate with this path on startup. -# savestate_auto_save = false - -# Load libretro from a dynamic location for dynamically built RetroArch. -# This option is mandatory. -# libretro_path = "/path/to/libretro.so" - -# Environment variables internally in RetroArch. -# Implementations can tap into this user-specificed information to enable functionality -# that is deemed too obscure to expose directly. -# Some variables might be "standardized" at a later time if needed. -# The string is formatted as key value pairs delimited by a semicolon ';'. -# Any white space between the delimiter ';' and the '=' is significant. -# I.e.: "key1=value1;key2=value2;..." -# environment_variables = - -# Sets the "system" directory. -# Implementations can query for this directory to load BIOSes, system-specific configs, etc. -# system_directory = - -#### Video - -# Video driver to use. "gl", "xvideo", "sdl" or "ext" (external API driver) -# video_driver = "gl" - -# Path to external video driver using the RetroArch driver API. -# video_external_driver = - -# Windowed xscale and yscale -# (Real x res: base_size * xscale * aspect_ratio, real y res: base_size * yscale) -# video_xscale = 3.0 -# video_yscale = 3.0 - -# Fullscreen resolution. Resolution of 0 uses the resolution of the desktop. -# video_fullscreen_x = 0 -# video_fullscreen_y = 0 - -# Start in fullscreen. Can be changed at runtime. -# video_fullscreen = false - -# If fullscreen, prefer using a windowed fullscreen mode. -# video_windowed_fullscreen = false - -# Forcibly disable composition. Only works in Windows Vista/7 for now. -# video_disable_composition = false - -# Video vsync. -# video_vsync = true - -# Smoothens picture with bilinear filtering. Should be disabled if using pixel shaders. -# video_smooth = true - -# Forces rendering area to stay equal to game aspect ratio or as defined in video_aspect_ratio. -# video_force_aspect = true - -# A floating point value for video aspect ratio (width / height). -# If this is not set, aspect ratio is assumed to be automatic. -# Behavior then is defined by video_aspect_ratio_auto. -# video_aspect_ratio = - -# If this is true and video_aspect_ratio is not set, -# aspect ratio is decided by libretro implementation. -# If this is false, 1:1 PAR will always be assumed if video_aspect_ratio is not set. -# video_aspect_ratio_auto = false - -# Forces cropping of overscanned frames. Crops away top 7 scanlines and 8 bottom scanlines. (15/15 for interlaced frames). -# video_crop_overscan = false - -# Path to Cg shader. -# video_cg_shader = "/path/to/cg/shader.cg" - -# Path to bSNES XML shader (GLSL only). If both Cg shader path and XML shader path are defined, -# Cg shader will take priority unless overridden in video_shader_type. -# video_bsnes_shader = "/path/to/bsnes/xml/shader.shader" - -# Which shader type to use. Valid values are "cg", "bsnes", "none" and "auto" -# video_shader_type = auto - -# Defines a directory where XML shaders are kept. -# video_shader_dir = - -# Render to texture first. Useful when doing multi-pass shaders or control the output of shaders better. -# video_render_to_texture = false - -# Defines the video scale of render-to-texture. -# The output FBO size is scaled by these amounts against the input size (typically 256 * 224 for SNES). -# video_fbo_scale_x = 2.0 -# video_fbo_scale_y = 2.0 - -# Define shader to use for second pass (needs render-to-texture). -# video_second_pass_shader = "/path/to/second/shader.{cg,shader}" - -# Defines if bilinear filtering is used during second pass (needs render-to-texture). -# video_second_pass_smooth = true - -# CPU-based filter. Path to a bSNES CPU filter (*.filter) -# video_filter = - -# Path to a TTF font used for rendering messages. This path must be defined to enable fonts. -# Do note that the _full_ path of the font is necessary! -# video_font_path = - -# Size of the TTF font rendered. -# video_font_size = 48 - -# Attempt to scale the font to fit better for multiple window sizes. -# video_font_scale = true - -# Enable usage of OSD messages. -# video_font_enable = true - -# Offset for where messages will be placed on screen. Values are in range 0.0 to 1.0 for both x and y values. -# [0.0, 0.0] maps to the lower left corner of the screen. -# video_message_pos_x = 0.05 -# video_message_pos_y = 0.05 - -# Color for message. The value is treated as a hexadecimal value. -# It is a regular RGB hex number, i.e. red is "ff0000". -# video_message_color = ffffff - -# Video refresh rate of your monitor. -# Used to calculate a suitable audio input rate. -# video_refresh_rate = 59.95 - -# Allows libretro cores to set rotation modes. -# Setting this to false will honor, but ignore this request. -# This is useful for vertically oriented games where one manually rotates the monitor. -# video_allow_rotate = true - -#### Audio - -# Enable audio. -# audio_enable = true - -# Audio output samplerate. -# audio_out_rate = 48000 - -# When altering audio_in_rate on-the-fly, define by how much each time. -# audio_rate_step = 0.25 - -# Audio driver backend. Depending on configuration possible candidates are: alsa, pulse, oss, jack, rsound, roar, openal, sdl, xaudio and ext (external driver). -# audio_driver = - -# Path to external audio driver using the RetroArch audio driver API. -# audio_external_driver = - -# Override the default audio device the audio_driver uses. This is driver dependant. E.g. ALSA wants a PCM device, OSS wants a path (e.g. /dev/dsp), Jack wants portnames (e.g. system:playback1,system:playback_2), and so on ... -# audio_device = - -# External DSP plugin that processes audio before it's sent to the driver. -# audio_dsp_plugin = - -# Will sync (block) on audio. Recommended. -# audio_sync = true - -# Desired audio latency in milliseconds. Might not be honored if driver can't provide given latency. -# audio_latency = 64 - -# Enable experimental audio rate control. -# audio_rate_control = false - -# Controls audio rate control delta. Defines how much input rate can be adjusted dynamically. -# Input rate = in_rate * (1.0 +/- audio_rate_control_delta) -# audio_rate_control_delta = 0.005 - -#### Input - -# Input driver. Depending on video driver, it might force a different input driver. -# input_driver = sdl - -# Defines axis threshold. Possible values are [0.0, 1.0] -# input_axis_threshold = 0.5 - -# Keyboard input. Will recognize normal keypresses and special keys like "left", "right", and so on. -# Keyboard input, Joypad and Joyaxis will all obey the "nul" bind, which disables the bind completely, -# rather than relying on a default. -# input_player1_a = x -# input_player1_b = z -# input_player1_y = a -# input_player1_x = s -# input_player1_start = enter -# input_player1_select = rshift -# input_player1_l = q -# input_player1_r = w -# input_player1_left = left -# input_player1_right = right -# input_player1_up = up -# input_player1_down = down -# input_player1_l2 = -# input_player1_r2 = -# input_player1_l3 = -# input_player1_r3 = - -# Two analog sticks (DualShock-esque). -# Bound as usual, however, if a real analog axis is bound, -# it can be read as a true analog. -# Positive X axis is right, Positive Y axis is down. -# input_player1_l_x_plus = -# input_player1_l_x_minus = -# input_player1_l_y_plus = -# input_player1_l_y_minus = -# input_player1_r_x_plus = -# input_player1_r_x_minus = -# input_player1_r_y_plus = -# input_player1_r_y_minus = - -# If desired, it is possible to override which joypads are being used for player 1 through 5. First joypad available is 0. -# input_player1_joypad_index = 0 -# input_player2_joypad_index = 1 -# input_player3_joypad_index = 2 -# input_player4_joypad_index = 3 -# input_player5_joypad_index = 4 -# Player 6-8 is not directly expected by libretro API, but we'll futureproof it. -# input_player6_joypad_index = 5 -# input_player7_joypad_index = 6 -# input_player8_joypad_index = 7 - -# Joypad buttons. -# Figure these out by using RetroArch-Phoenix or retroarch-joyconfig. -# You can use joypad hats with hnxx, where n is the hat, and xx is a string representing direction. -# E.g. "h0up" -# input_player1_a_btn = -# input_player1_b_btn = -# input_player1_y_btn = -# input_player1_x_btn = -# input_player1_start_btn = -# input_player1_select_btn = -# input_player1_l_btn = -# input_player1_r_btn = -# input_player1_left_btn = -# input_player1_right_btn = -# input_player1_up_btn = -# input_player1_down_btn = -# input_player1_l2_btn = -# input_player1_r2_btn = -# input_player1_l3_btn = -# input_player1_r3_btn = - -# Axis for RetroArch D-Pad. -# Needs to be either '+' or '-' in the first character signaling either positive or negative direction of the axis, then the axis number. -# Do note that every other input option has the corresponding _btn and _axis binds as well; they are omitted here for clarity. -# input_player1_left_axis = -# input_player1_right_axis = -# input_player1_up_axis = -# input_player1_down_axis = - -# Holding the turbo while pressing another button will let the button enter a turbo mode -# where the button state is modulated with a periodic signal. -# The modulation stops when the button itself (not turbo button) is released. -# input_player1_turbo = - -# Describes the period and how long of that period a turbo-enabled button should behave. -# Numbers are described in frames. -# input_turbo_period = 6 -# input_turbo_duty_cycle = 3 - -# This goes all the way to player 8 (*_player2_*, *_player3_*, etc), but omitted for clarity. -# All input binds have corresponding binds for keyboard (none), joykeys (_btn) and joyaxes (_axis) as well. - -# Toggles fullscreen. -# input_toggle_fullscreen = f - -# Saves state. -# input_save_state = f2 -# Loads state. -# input_load_state = f4 - -# State slots. With slot set to 0, save state name is *.state (or whatever defined on commandline). -# When slot is != 0, path will be $path%d, where %d is slot number. -# input_state_slot_increase = f7 -# input_state_slot_decrease = f6 - -# Toggles between fast-forwarding and normal speed. -# input_toggle_fast_forward = space - -# Hold for fast-forward. Releasing button disables fast-forward. -# input_hold_fast_forward = l - -# Key to exit emulator cleanly. -# Killing it in any hard way (SIGTERM, SIGKILL, etc, will terminate emulator without saving RAM, etc.) -# input_exit_emulator = escape - -# Decrease/increase input sample rate on the fly. Amount to decrease/increase is defined by audio_rate_step. -# input_rate_step_up = kp_plus -# input_rate_step_down = kp_minus - -# Applies next and previous XML/Cg shader in directory. -# input_shader_next = m -# input_shader_prev = n - -# Hold button down to rewind. Rewinding must be enabled. -# input_rewind = r - -# Toggle between recording and not. -# input_movie_record_toggle = o - -# Toggle between paused and non-paused state -# input_pause_toggle = p - -# Frame advance when game is paused -# input_frame_advance = k - -# Reset the emulated SNES. -# input_reset = h - -# Configures DSP plugin -# input_dsp_config = c - -# Cheats. -# input_cheat_index_plus = y -# input_cheat_index_minus = t -# input_cheat_toggle = u - -# Mute/unmute audio -# input_audio_mute = f9 - -# Take screenshot -# input_screenshot = f8 - -# Netplay flip players. -# input_netplay_flip_players = i - -# Hold for slowmotion. -# input_slowmotion = e - -#### Misc - -# Enable rewinding. This will take a performance hit when playing, so it is disabled by default. -# Do note that rewinding will only work properly when using bSNES libretro core atm. -# rewind_enable = false - -# Rewinding buffer size in megabytes. Bigger rewinding buffer means you can rewind longer. -# The buffer should be approx. 20MB per minute of buffer time. -# rewind_buffer_size = 20 - -# Rewind granularity. When rewinding defined number of frames, you can rewind several frames at a time, increasing the rewinding speed. -# rewind_granularity = 1 - -# Pause gameplay when window focus is lost. -# pause_nonactive = true - -# Autosaves the non-volatile SRAM at a regular interval. This is disabled by default unless set otherwise. -# The interval is measured in seconds. A value of 0 disables autosave. -# autosave_interval = - -# When being client over netplay, use keybinds for player 1. -# netplay_client_swap_input = false - -# Path to XML cheat database (as used by bSNES). -# cheat_database_path = - -# Path to XML cheat config, a file which keeps track of which -# cheat settings are used for individual games. -# If the file does not exist, it will be created. -# cheat_settings_path = - -# Directory to dump screenshots to. -# screenshot_directory = - -# Records video assuming video is hi-res. -# video_hires_record = false - -# Enables lossless RGB H.264 recording if possible (if not, FFV1 is used). -# video_h264_record = true - -# Records video after CPU video filter. -# video_post_filter_record = false - -# Records output of GPU shaded material if available. -# video_gpu_record = false - -# Screenshots output of GPU shaded material if available. -# video_gpu_screenshot = true - -# Block SRAM from being overwritten when loading save states. -# Might potentially lead to buggy games. -# block_sram_overwrite = false - -# When saving a savestate, save state index is automatically increased before -# it is saved. -# Also, when loading a ROM, the index will be set to the highest existing index. -# There is no upper bound on the index. -# savestate_auto_index = false - -# Slowmotion ratio. When slowmotion, game will slow down by factor. -# slowmotion_ratio = 3.0 - -# Enable stdin/network command interface. -# network_cmd_enable = false -# network_cmd_port = 55355 -# stdin_cmd_enable = false - diff --git a/android/phoenix/res/values/strings.xml b/android/phoenix/res/values/strings.xml index 1e2ffa990e..0402da9b84 100644 --- a/android/phoenix/res/values/strings.xml +++ b/android/phoenix/res/values/strings.xml @@ -1,7 +1,7 @@ - - Hello World, MainActivity! RetroArch + Input Method + File type icon \ No newline at end of file diff --git a/android/phoenix/src/com/retroarch/fileio/FileArrayAdapter.java b/android/phoenix/src/com/retroarch/fileio/FileArrayAdapter.java deleted file mode 100644 index c6ee07cd6b..0000000000 --- a/android/phoenix/src/com/retroarch/fileio/FileArrayAdapter.java +++ /dev/null @@ -1,117 +0,0 @@ -package com.retroarch.fileio; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Set; - -import com.retroarch.R; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ArrayAdapter; -import android.widget.SectionIndexer; -import android.widget.TextView; - -public class FileArrayAdapter extends ArrayAdapter