Bump version code

general.h

@@ -30,7 +30,7 @@
 #endif
 
 #ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "1.3.1"
+#define PACKAGE_VERSION "1.3.2"
 #endif
 
 #ifdef __cplusplus

input/input_autodetect.c

@@ -330,7 +330,7 @@ bool input_config_autoconfigure_joypad(autoconfig_params_t *params)
    {
       char msg[PATH_MAX_LENGTH];
 
-      RARCH_LOG("Autodetect: no profiles found for %s (%d/%d)",
+      RARCH_LOG("Autodetect: no profiles found for %s (%d/%d)\n",
             params->name, params->vid, params->pid);
       snprintf(msg, sizeof(msg), "%s (%ld/%ld) not configured",
             params->name, (long)params->vid, (long)params->pid);

menu/menu_setting.c

@@ -158,7 +158,9 @@ struct rarch_setting
 };
 
 /* static local variables */
-static bool setting_netplay_enable;
+static bool menu_setting_netplay_enable;
+
+static settings_t menu_setting_vars;
 
 /* forward decls */
 static void setting_get_string_representation_default(void *data,
@@ -2777,6 +2779,154 @@ void general_read_handler(void *data)
 
    switch (hash)
    {
+      case MENU_LABEL_PLAYLIST_DIRECTORY:
+         strlcpy(setting->value.string,
+               settings->playlist_directory,
+               PATH_MAX_LENGTH);
+         break;
+      case MENU_LABEL_INPUT_REMAPPING_DIRECTORY:
+         strlcpy(setting->value.string,
+               settings->input_remapping_directory,
+               PATH_MAX_LENGTH);
+         break;
+      case MENU_LABEL_JOYPAD_AUTOCONFIG_DIR:
+         strlcpy(setting->value.string,
+               settings->input.autoconfig_dir,
+               PATH_MAX_LENGTH);
+         break;
+      case MENU_LABEL_SCREENSHOT_DIRECTORY:
+         strlcpy(setting->value.string,
+               settings->screenshot_directory,
+               PATH_MAX_LENGTH);
+         break;      
+      case MENU_LABEL_CACHE_DIRECTORY:
+         strlcpy(setting->value.string,
+               settings->cache_directory,
+               PATH_MAX_LENGTH);
+         break;
+      case MENU_LABEL_OVERLAY_DIRECTORY:
+         strlcpy(setting->value.string,
+               settings->overlay_directory,
+               PATH_MAX_LENGTH);
+         break;
+      case MENU_LABEL_VIDEO_SHADER_DIR:
+         strlcpy(setting->value.string,
+               settings->video.shader_dir,
+               PATH_MAX_LENGTH);
+         break;
+      case MENU_LABEL_AUDIO_FILTER_DIR:
+         strlcpy(setting->value.string,
+               settings->audio.filter_dir,
+               PATH_MAX_LENGTH);
+         break;
+      case MENU_LABEL_VIDEO_FILTER_DIR:
+         strlcpy(setting->value.string,
+               settings->video.filter_dir,
+               PATH_MAX_LENGTH);
+         break;
+      case MENU_LABEL_CHEAT_DATABASE_PATH:
+         strlcpy(setting->value.string,
+               settings->cheat_database,
+               PATH_MAX_LENGTH);
+         break;
+      case MENU_LABEL_CURSOR_DIRECTORY:
+         strlcpy(setting->value.string,
+               settings->cursor_directory,
+               PATH_MAX_LENGTH);
+         break;
+      case MENU_LABEL_CONTENT_DATABASE_DIRECTORY:
+#ifdef HAVE_LIBRETRODB
+         strlcpy(setting->value.string,
+               settings->content_database,
+               PATH_MAX_LENGTH);
+#endif
+         break;
+      case MENU_LABEL_MENU_WALLPAPER:
+         strlcpy(setting->value.string,
+               settings->menu.wallpaper,
+               PATH_MAX_LENGTH);
+         break;
+      case MENU_LABEL_LIBRETRO_INFO_PATH:
+         strlcpy(setting->value.string,
+               settings->libretro_info_path,
+               PATH_MAX_LENGTH);
+         break;
+      case MENU_LABEL_LIBRETRO_DIR_PATH:
+         strlcpy(setting->value.string,
+               settings->libretro_directory,
+               PATH_MAX_LENGTH);
+         break;
+      case MENU_LABEL_RGUI_CONFIG_DIRECTORY:
+         strlcpy(setting->value.string,
+               settings->menu_config_directory,
+               PATH_MAX_LENGTH);
+         break;
+      case MENU_LABEL_RGUI_BROWSER_DIRECTORY:
+         strlcpy(setting->value.string,
+               settings->menu_content_directory,
+               PATH_MAX_LENGTH);
+         break;
+      case MENU_LABEL_BOXARTS_DIRECTORY:
+         strlcpy(setting->value.string,
+               settings->boxarts_directory,
+               PATH_MAX_LENGTH);
+         break;
+      case MENU_LABEL_DYNAMIC_WALLPAPERS_DIRECTORY:
+         strlcpy(setting->value.string,
+               settings->dynamic_wallpapers_directory,
+               PATH_MAX_LENGTH);
+         break;
+      case MENU_LABEL_ASSETS_DIRECTORY:
+         strlcpy(setting->value.string,
+               settings->assets_directory,
+               PATH_MAX_LENGTH);
+         break;
+      case MENU_LABEL_CORE_ASSETS_DIRECTORY:
+         strlcpy(setting->value.string,
+               settings->core_assets_directory,
+               PATH_MAX_LENGTH);
+         break;
+      case MENU_LABEL_SYSTEM_DIRECTORY:
+         strlcpy(setting->value.string,
+               settings->system_directory,
+               PATH_MAX_LENGTH);
+         break;
+      case MENU_LABEL_CONFIG_SAVE_ON_EXIT:
+         *setting->value.boolean = settings->config_save_on_exit;
+         break;
+      case MENU_LABEL_CORE_SET_SUPPORTS_NO_CONTENT_ENABLE:
+         *setting->value.boolean = settings->set_supports_no_game_enable;
+         break;
+      case MENU_LABEL_DUMMY_ON_CORE_SHUTDOWN:
+         *setting->value.boolean = settings->load_dummy_on_core_shutdown;
+         break;
+      case MENU_LABEL_VIDEO_SHARED_CONTEXT:
+         *setting->value.boolean = settings->video.shared_context;
+         break;
+      case MENU_LABEL_SUSPEND_SCREENSAVER_ENABLE:
+         *setting->value.boolean = settings->ui.suspend_screensaver_enable;
+         break;
+      case MENU_LABEL_REWIND_GRANULARITY:
+         *setting->value.unsigned_integer = settings->rewind_granularity;
+         break;
+      case MENU_LABEL_REWIND_ENABLE:
+         *setting->value.boolean = settings->rewind_enable;
+         break;
+      case MENU_LABEL_DEBUG_PANEL_ENABLE:
+         *setting->value.boolean = settings->debug_panel_enable;
+         break;
+      case MENU_LABEL_LIBRETRO_LOG_LEVEL:
+         *setting->value.unsigned_integer = settings->libretro_log_level;
+         break;
+      case MENU_LABEL_STATE_SLOT: 
+         *setting->value.integer = settings->state_slot;
+         break;
+      case MENU_LABEL_FPS_SHOW:
+         *setting->value.boolean = settings->fps_show;
+         break;
+      case MENU_LABEL_MENU_THROTTLE_FRAMERATE:
+         *setting->value.boolean = settings->menu.throttle_framerate;
+         break;
       case MENU_LABEL_AUDIO_RATE_CONTROL_DELTA:
          *setting->value.fraction = settings->audio.rate_control_delta;
          if (*setting->value.fraction < 0.0005)
@@ -2845,6 +2995,155 @@ void general_write_handler(void *data)
 
    switch (hash)
    {
+      case MENU_LABEL_PLAYLIST_DIRECTORY:
+         strlcpy(settings->playlist_directory,
+               setting->value.string,
+               sizeof(settings->playlist_directory));
+         break;
+      case MENU_LABEL_INPUT_REMAPPING_DIRECTORY:
+         strlcpy(settings->input_remapping_directory,
+               setting->value.string,
+               sizeof(settings->input_remapping_directory));
+         break;
+      case MENU_LABEL_JOYPAD_AUTOCONFIG_DIR:
+         strlcpy(settings->input.autoconfig_dir,
+               setting->value.string,
+               sizeof(settings->input.autoconfig_dir));
+         break;
+      case MENU_LABEL_SCREENSHOT_DIRECTORY:
+         strlcpy(settings->screenshot_directory,
+               setting->value.string,
+               sizeof(settings->screenshot_directory));
+         break;      
+      case MENU_LABEL_CACHE_DIRECTORY:
+         strlcpy(settings->cache_directory,
+               setting->value.string,
+               sizeof(settings->cache_directory));
+         break;
+      case MENU_LABEL_OVERLAY_DIRECTORY:
+         strlcpy(settings->overlay_directory,
+               setting->value.string,
+               sizeof(settings->overlay_directory));
+         break;
+      case MENU_LABEL_VIDEO_SHADER_DIR:
+         strlcpy(settings->video.shader_dir,
+               setting->value.string,
+               sizeof(settings->video.shader_dir));
+         break;
+      case MENU_LABEL_AUDIO_FILTER_DIR:
+         strlcpy(
+               settings->audio.filter_dir,
+               setting->value.string,
+               sizeof(settings->audio.filter_dir));
+         break;
+      case MENU_LABEL_VIDEO_FILTER_DIR:
+         strlcpy(settings->video.filter_dir,
+               setting->value.string,
+               sizeof(settings->video.filter_dir));
+         break;
+      case MENU_LABEL_CHEAT_DATABASE_PATH:
+         strlcpy(settings->cheat_database,
+            setting->value.string,
+            sizeof(settings->cheat_database));
+         break;
+      case MENU_LABEL_CURSOR_DIRECTORY:
+         strlcpy(settings->cursor_directory,
+               setting->value.string,
+               sizeof(settings->cursor_directory));
+         break;
+      case MENU_LABEL_CONTENT_DATABASE_DIRECTORY:
+#ifdef HAVE_LIBRETRODB
+         strlcpy(settings->content_database,
+               setting->value.string,
+               sizeof(settings->content_database));
+#endif
+         break;
+      case MENU_LABEL_MENU_WALLPAPER:
+         strlcpy(settings->menu.wallpaper,
+               setting->value.string,
+               sizeof(settings->menu.wallpaper));
+         break;
+      case MENU_LABEL_LIBRETRO_INFO_PATH:
+         strlcpy(settings->libretro_info_path,
+               setting->value.string,
+               sizeof(settings->libretro_info_path));
+         break;
+      case MENU_LABEL_LIBRETRO_DIR_PATH:
+         strlcpy(settings->libretro_directory,
+               setting->value.string,
+               sizeof(settings->libretro_directory));
+         break;
+      case MENU_LABEL_RGUI_CONFIG_DIRECTORY:
+         strlcpy(settings->menu_config_directory,
+               setting->value.string,
+               sizeof(settings->menu_config_directory));
+         break;
+      case MENU_LABEL_RGUI_BROWSER_DIRECTORY:
+         strlcpy(settings->menu_content_directory,
+               setting->value.string,
+               sizeof(settings->menu_content_directory));
+         break;
+      case MENU_LABEL_BOXARTS_DIRECTORY:
+         strlcpy(settings->boxarts_directory,
+               setting->value.string,
+               sizeof(settings->boxarts_directory));
+         break;
+      case MENU_LABEL_DYNAMIC_WALLPAPERS_DIRECTORY:
+         strlcpy(settings->dynamic_wallpapers_directory,
+               setting->value.string,
+               sizeof(settings->dynamic_wallpapers_directory));
+         break;
+      case MENU_LABEL_ASSETS_DIRECTORY:
+         strlcpy(settings->assets_directory,
+               setting->value.string,
+               sizeof(settings->assets_directory));
+         break;
+      case MENU_LABEL_CORE_ASSETS_DIRECTORY:
+         strlcpy(settings->core_assets_directory,
+               setting->value.string,
+               sizeof(settings->core_assets_directory));
+         break;
+      case MENU_LABEL_SYSTEM_DIRECTORY:
+         strlcpy(settings->system_directory,
+               setting->value.string,
+               sizeof(settings->system_directory));
+         break;
+      case MENU_LABEL_CONFIG_SAVE_ON_EXIT:
+         settings->config_save_on_exit = *setting->value.boolean;
+         break;
+      case MENU_LABEL_CORE_SET_SUPPORTS_NO_CONTENT_ENABLE:
+         settings->set_supports_no_game_enable = *setting->value.boolean;
+         break;
+      case MENU_LABEL_DUMMY_ON_CORE_SHUTDOWN:
+         settings->load_dummy_on_core_shutdown = *setting->value.boolean;
+         break;
+      case MENU_LABEL_VIDEO_SHARED_CONTEXT:
+         settings->video.shared_context = *setting->value.boolean;
+         break;
+      case MENU_LABEL_SUSPEND_SCREENSAVER_ENABLE:
+         settings->ui.suspend_screensaver_enable = *setting->value.boolean;
+         break;
+      case MENU_LABEL_REWIND_GRANULARITY:
+         settings->rewind_granularity = *setting->value.unsigned_integer;
+         break;
+      case MENU_LABEL_REWIND_ENABLE:
+         settings->rewind_enable = *setting->value.boolean;
+         break;
+      case MENU_LABEL_DEBUG_PANEL_ENABLE:
+         settings->debug_panel_enable = *setting->value.boolean;
+         break;
+      case MENU_LABEL_LIBRETRO_LOG_LEVEL:
+         settings->libretro_log_level = *setting->value.unsigned_integer;
+         break;
+      case MENU_LABEL_STATE_SLOT: 
+         settings->state_slot = *setting->value.integer;
+         break;
+      case MENU_LABEL_FPS_SHOW:
+         settings->fps_show = *setting->value.boolean;
+         break;
+      case MENU_LABEL_MENU_THROTTLE_FRAMERATE:
+         settings->menu.throttle_framerate = *setting->value.boolean;
+         break;
       case MENU_LABEL_NETPLAY_ENABLE:
 #ifdef HAVE_NETPLAY
          if (*setting->value.boolean)
@@ -3327,7 +3626,7 @@ static bool setting_append_list_main_menu_options(
 
    CONFIG_INT(
          list, list_info,
-         &settings->state_slot,
+         &menu_setting_vars.state_slot,
          menu_hash_to_str(MENU_LABEL_STATE_SLOT),
          menu_hash_to_str(MENU_LABEL_VALUE_STATE_SLOT),
          0,
@@ -3718,7 +4017,6 @@ static bool setting_append_list_core_options(
 {
    rarch_setting_group_info_t group_info    = {0};
    rarch_setting_group_info_t subgroup_info = {0};
-   settings_t *settings = config_get_ptr();
 
    START_GROUP(list, list_info, &group_info, menu_hash_to_str(MENU_LABEL_VALUE_CORE_SETTINGS), parent_group);
    settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
@@ -3730,7 +4028,7 @@ static bool setting_append_list_core_options(
 
    CONFIG_BOOL(
          list, list_info,
-         &settings->video.shared_context,
+         &menu_setting_vars.video.shared_context,
          menu_hash_to_str(MENU_LABEL_VIDEO_SHARED_CONTEXT),
          menu_hash_to_str(MENU_LABEL_VALUE_VIDEO_SHARED_CONTEXT),
          false,
@@ -3745,7 +4043,7 @@ static bool setting_append_list_core_options(
 
    CONFIG_BOOL(
          list, list_info,
-         &settings->load_dummy_on_core_shutdown,
+         &menu_setting_vars.load_dummy_on_core_shutdown,
          menu_hash_to_str(MENU_LABEL_DUMMY_ON_CORE_SHUTDOWN),
          menu_hash_to_str(MENU_LABEL_VALUE_DUMMY_ON_CORE_SHUTDOWN),
          load_dummy_on_core_shutdown,
@@ -3760,7 +4058,7 @@ static bool setting_append_list_core_options(
 
    CONFIG_BOOL(
          list, list_info,
-         &settings->set_supports_no_game_enable,
+         &menu_setting_vars.set_supports_no_game_enable,
          menu_hash_to_str(MENU_LABEL_CORE_SET_SUPPORTS_NO_CONTENT_ENABLE),
          menu_hash_to_str(MENU_LABEL_VALUE_CORE_SET_SUPPORTS_NO_CONTENT_ENABLE),
          true,
@@ -3798,7 +4096,7 @@ static bool setting_append_list_configuration_options(
 
    CONFIG_BOOL(
          list, list_info,
-         &settings->config_save_on_exit,
+         &menu_setting_vars.config_save_on_exit,
          menu_hash_to_str(MENU_LABEL_CONFIG_SAVE_ON_EXIT),
          menu_hash_to_str(MENU_LABEL_VALUE_CONFIG_SAVE_ON_EXIT),
          config_save_on_exit,
@@ -4007,7 +4305,6 @@ static bool setting_append_list_logging_options(
    bool *tmp_b = NULL;
    rarch_setting_group_info_t group_info    = {0};
    rarch_setting_group_info_t subgroup_info = {0};
-   settings_t *settings = config_get_ptr();
 
    START_GROUP(list, list_info, &group_info, menu_hash_to_str(MENU_LABEL_VALUE_LOGGING_SETTINGS), parent_group);
    settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
@@ -4034,7 +4331,7 @@ static bool setting_append_list_logging_options(
 
    CONFIG_UINT(
          list, list_info,
-         &settings->libretro_log_level,
+         &menu_setting_vars.libretro_log_level,
          menu_hash_to_str(MENU_LABEL_LIBRETRO_LOG_LEVEL),
          menu_hash_to_str(MENU_LABEL_VALUE_LIBRETRO_LOG_LEVEL),
          libretro_log_level,
@@ -4050,7 +4347,7 @@ static bool setting_append_list_logging_options(
 
    CONFIG_BOOL(
          list, list_info,
-         &settings->debug_panel_enable,
+         &menu_setting_vars.debug_panel_enable,
          menu_hash_to_str(MENU_LABEL_DEBUG_PANEL_ENABLE),
          menu_hash_to_str(MENU_LABEL_VALUE_DEBUG_PANEL_ENABLE),
          false,
@@ -4139,7 +4436,7 @@ static bool setting_append_list_frame_throttling_options(
 
    CONFIG_BOOL(
          list, list_info,
-         &settings->menu.throttle_framerate,
+         &menu_setting_vars.menu.throttle_framerate,
          menu_hash_to_str(MENU_LABEL_MENU_THROTTLE_FRAMERATE),
          menu_hash_to_str(MENU_LABEL_VALUE_MENU_THROTTLE_FRAMERATE),
          true,
@@ -4163,7 +4460,6 @@ static bool setting_append_list_rewind_options(
 {
    rarch_setting_group_info_t group_info    = {0};
    rarch_setting_group_info_t subgroup_info = {0};
-   settings_t *settings = config_get_ptr();
 
    START_GROUP(list, list_info, &group_info, menu_hash_to_str(MENU_LABEL_VALUE_REWIND_SETTINGS), parent_group);
 
@@ -4174,7 +4470,7 @@ static bool setting_append_list_rewind_options(
 
    CONFIG_BOOL(
          list, list_info,
-         &settings->rewind_enable,
+         &menu_setting_vars.rewind_enable,
          menu_hash_to_str(MENU_LABEL_REWIND_ENABLE),
          menu_hash_to_str(MENU_LABEL_VALUE_REWIND_ENABLE),
          rewind_enable,
@@ -4202,7 +4498,7 @@ static bool setting_append_list_rewind_options(
 #endif
       CONFIG_UINT(
             list, list_info,
-            &settings->rewind_granularity,
+            &menu_setting_vars.rewind_granularity,
             menu_hash_to_str(MENU_LABEL_REWIND_GRANULARITY),
             menu_hash_to_str(MENU_LABEL_VALUE_REWIND_GRANULARITY),
             rewind_granularity,
@@ -4349,7 +4645,7 @@ static bool setting_append_list_video_options(
 
    CONFIG_BOOL(
          list, list_info,
-         &settings->ui.suspend_screensaver_enable,
+         &menu_setting_vars.ui.suspend_screensaver_enable,
          menu_hash_to_str(MENU_LABEL_SUSPEND_SCREENSAVER_ENABLE),
          menu_hash_to_str(MENU_LABEL_VALUE_SUSPEND_SCREENSAVER_ENABLE),
          true,
@@ -4363,7 +4659,7 @@ static bool setting_append_list_video_options(
 
    CONFIG_BOOL(
          list, list_info,
-         &settings->fps_show,
+         &menu_setting_vars.fps_show,
          menu_hash_to_str(MENU_LABEL_FPS_SHOW),
          menu_hash_to_str(MENU_LABEL_VALUE_FPS_SHOW),
          fps_show,
@@ -5690,8 +5986,8 @@ static bool setting_append_list_menu_options(
 
    CONFIG_PATH(
          list, list_info,
-         settings->menu.wallpaper,
-         sizeof(settings->menu.wallpaper),
+         menu_setting_vars.menu.wallpaper,
+         sizeof(menu_setting_vars.menu.wallpaper),
          menu_hash_to_str(MENU_LABEL_MENU_WALLPAPER),
          menu_hash_to_str(MENU_LABEL_VALUE_MENU_WALLPAPER),
          "",
@@ -6367,7 +6663,7 @@ static bool setting_append_list_netplay_options(
 
    CONFIG_BOOL(
          list, list_info,
-         &setting_netplay_enable,
+         &menu_setting_netplay_enable,
          menu_hash_to_str(MENU_LABEL_NETPLAY_ENABLE),
          menu_hash_to_str(MENU_LABEL_VALUE_NETPLAY_ENABLE),
          false,
@@ -6808,8 +7104,8 @@ static bool setting_append_list_directory_options(
 
    CONFIG_DIR(
          list, list_info,
-         settings->system_directory,
-         sizeof(settings->system_directory),
+         menu_setting_vars.system_directory,
+         sizeof(menu_setting_vars.system_directory),
          menu_hash_to_str(MENU_LABEL_SYSTEM_DIRECTORY),
          menu_hash_to_str(MENU_LABEL_VALUE_SYSTEM_DIRECTORY),
          "",
@@ -6826,8 +7122,8 @@ static bool setting_append_list_directory_options(
 
    CONFIG_DIR(
          list, list_info,
-         settings->core_assets_directory,
-         sizeof(settings->core_assets_directory),
+         menu_setting_vars.core_assets_directory,
+         sizeof(menu_setting_vars.core_assets_directory),
          menu_hash_to_str(MENU_LABEL_CORE_ASSETS_DIRECTORY),
          menu_hash_to_str(MENU_LABEL_VALUE_CORE_ASSETS_DIRECTORY),
          "",
@@ -6844,8 +7140,8 @@ static bool setting_append_list_directory_options(
 
    CONFIG_DIR(
          list, list_info,
-         settings->assets_directory,
-         sizeof(settings->assets_directory),
+         menu_setting_vars.assets_directory,
+         sizeof(menu_setting_vars.assets_directory),
          menu_hash_to_str(MENU_LABEL_ASSETS_DIRECTORY),
          menu_hash_to_str(MENU_LABEL_VALUE_ASSETS_DIRECTORY),
          "",
@@ -6862,8 +7158,8 @@ static bool setting_append_list_directory_options(
 
    CONFIG_DIR(
          list, list_info,
-         settings->dynamic_wallpapers_directory,
-         sizeof(settings->dynamic_wallpapers_directory),
+         menu_setting_vars.dynamic_wallpapers_directory,
+         sizeof(menu_setting_vars.dynamic_wallpapers_directory),
          menu_hash_to_str(MENU_LABEL_DYNAMIC_WALLPAPERS_DIRECTORY),
          menu_hash_to_str(MENU_LABEL_VALUE_DYNAMIC_WALLPAPERS_DIRECTORY),
          "",
@@ -6880,8 +7176,8 @@ static bool setting_append_list_directory_options(
 
    CONFIG_DIR(
          list, list_info,
-         settings->boxarts_directory,
-         sizeof(settings->boxarts_directory),
+         menu_setting_vars.boxarts_directory,
+         sizeof(menu_setting_vars.boxarts_directory),
          menu_hash_to_str(MENU_LABEL_BOXARTS_DIRECTORY),
          menu_hash_to_str(MENU_LABEL_VALUE_BOXARTS_DIRECTORY),
          "",
@@ -6898,8 +7194,8 @@ static bool setting_append_list_directory_options(
 
    CONFIG_DIR(
          list, list_info,
-         settings->menu_content_directory,
-         sizeof(settings->menu_content_directory),
+         menu_setting_vars.menu_content_directory,
+         sizeof(menu_setting_vars.menu_content_directory),
          menu_hash_to_str(MENU_LABEL_RGUI_BROWSER_DIRECTORY),
          menu_hash_to_str(MENU_LABEL_VALUE_RGUI_BROWSER_DIRECTORY),
          "",
@@ -6917,8 +7213,8 @@ static bool setting_append_list_directory_options(
 
    CONFIG_DIR(
          list, list_info,
-         settings->menu_config_directory,
-         sizeof(settings->menu_config_directory),
+         menu_setting_vars.menu_config_directory,
+         sizeof(menu_setting_vars.menu_config_directory),
          menu_hash_to_str(MENU_LABEL_RGUI_CONFIG_DIRECTORY),
          menu_hash_to_str(MENU_LABEL_VALUE_RGUI_CONFIG_DIRECTORY),
          "",
@@ -6936,8 +7232,8 @@ static bool setting_append_list_directory_options(
 
    CONFIG_DIR(
          list, list_info,
-         settings->libretro_directory,
-         sizeof(settings->libretro_directory),
+         menu_setting_vars.libretro_directory,
+         sizeof(menu_setting_vars.libretro_directory),
          menu_hash_to_str(MENU_LABEL_LIBRETRO_DIR_PATH),
          menu_hash_to_str(MENU_LABEL_VALUE_LIBRETRO_DIR_PATH),
          g_defaults.dir.core,
@@ -6955,8 +7251,8 @@ static bool setting_append_list_directory_options(
 
    CONFIG_DIR(
          list, list_info,
-         settings->libretro_info_path,
-         sizeof(settings->libretro_info_path),
+         menu_setting_vars.libretro_info_path,
+         sizeof(menu_setting_vars.libretro_info_path),
          menu_hash_to_str(MENU_LABEL_LIBRETRO_INFO_PATH),
          menu_hash_to_str(MENU_LABEL_VALUE_LIBRETRO_INFO_PATH),
          g_defaults.dir.core_info,
@@ -6975,8 +7271,8 @@ static bool setting_append_list_directory_options(
 #ifdef HAVE_LIBRETRODB
    CONFIG_DIR(
          list, list_info,
-         settings->content_database,
-         sizeof(settings->content_database),
+         menu_setting_vars.content_database,
+         sizeof(menu_setting_vars.content_database),
          menu_hash_to_str(MENU_LABEL_CONTENT_DATABASE_DIRECTORY),
          menu_hash_to_str(MENU_LABEL_VALUE_CONTENT_DATABASE_DIRECTORY),
          "",
@@ -6993,8 +7289,8 @@ static bool setting_append_list_directory_options(
 
    CONFIG_DIR(
          list, list_info,
-         settings->cursor_directory,
-         sizeof(settings->cursor_directory),
+         menu_setting_vars.cursor_directory,
+         sizeof(menu_setting_vars.cursor_directory),
          menu_hash_to_str(MENU_LABEL_CURSOR_DIRECTORY),
          menu_hash_to_str(MENU_LABEL_VALUE_CURSOR_DIRECTORY),
          "",
@@ -7012,8 +7308,8 @@ static bool setting_append_list_directory_options(
 
    CONFIG_DIR(
          list, list_info,
-         settings->cheat_database,
-         sizeof(settings->cheat_database),
+         menu_setting_vars.cheat_database,
+         sizeof(menu_setting_vars.cheat_database),
          menu_hash_to_str(MENU_LABEL_CHEAT_DATABASE_PATH),
          menu_hash_to_str(MENU_LABEL_VALUE_CHEAT_DATABASE_PATH),
          "",
@@ -7030,8 +7326,8 @@ static bool setting_append_list_directory_options(
 
    CONFIG_DIR(
          list, list_info,
-         settings->video.filter_dir,
-         sizeof(settings->video.filter_dir),
+         menu_setting_vars.video.filter_dir,
+         sizeof(menu_setting_vars.video.filter_dir),
          menu_hash_to_str(MENU_LABEL_VIDEO_FILTER_DIR),
          menu_hash_to_str(MENU_LABEL_VALUE_VIDEO_FILTER_DIR),
          "",
@@ -7048,8 +7344,8 @@ static bool setting_append_list_directory_options(
 
    CONFIG_DIR(
          list, list_info,
-         settings->audio.filter_dir,
-         sizeof(settings->audio.filter_dir),
+         menu_setting_vars.audio.filter_dir,
+         sizeof(menu_setting_vars.audio.filter_dir),
          menu_hash_to_str(MENU_LABEL_AUDIO_FILTER_DIR),
          menu_hash_to_str(MENU_LABEL_VALUE_AUDIO_FILTER_DIR),
          "",
@@ -7066,8 +7362,8 @@ static bool setting_append_list_directory_options(
 
    CONFIG_DIR(
          list, list_info,
-         settings->video.shader_dir,
-         sizeof(settings->video.shader_dir),
+         menu_setting_vars.video.shader_dir,
+         sizeof(menu_setting_vars.video.shader_dir),
          menu_hash_to_str(MENU_LABEL_VIDEO_SHADER_DIR),
          menu_hash_to_str(MENU_LABEL_VALUE_VIDEO_SHADER_DIR),
          g_defaults.dir.shader,
@@ -7123,8 +7419,8 @@ static bool setting_append_list_directory_options(
 #ifdef HAVE_OVERLAY
    CONFIG_DIR(
          list, list_info,
-         settings->overlay_directory,
-         sizeof(settings->overlay_directory),
+         menu_setting_vars.overlay_directory,
+         sizeof(menu_setting_vars.overlay_directory),
          menu_hash_to_str(MENU_LABEL_OVERLAY_DIRECTORY),
          menu_hash_to_str(MENU_LABEL_VALUE_OVERLAY_DIRECTORY),
          g_defaults.dir.overlay,
@@ -7160,8 +7456,8 @@ static bool setting_append_list_directory_options(
 
    CONFIG_DIR(
          list, list_info,
-         settings->screenshot_directory,
-         sizeof(settings->screenshot_directory),
+         menu_setting_vars.screenshot_directory,
+         sizeof(menu_setting_vars.screenshot_directory),
          menu_hash_to_str(MENU_LABEL_SCREENSHOT_DIRECTORY),
          menu_hash_to_str(MENU_LABEL_VALUE_SCREENSHOT_DIRECTORY),
          "",
@@ -7178,8 +7474,8 @@ static bool setting_append_list_directory_options(
 
    CONFIG_DIR(
          list, list_info,
-         settings->input.autoconfig_dir,
-         sizeof(settings->input.autoconfig_dir),
+         menu_setting_vars.input.autoconfig_dir,
+         sizeof(menu_setting_vars.input.autoconfig_dir),
          menu_hash_to_str(MENU_LABEL_JOYPAD_AUTOCONFIG_DIR),
          menu_hash_to_str(MENU_LABEL_VALUE_JOYPAD_AUTOCONFIG_DIR),
          "",
@@ -7196,8 +7492,8 @@ static bool setting_append_list_directory_options(
 
    CONFIG_DIR(
          list, list_info,
-         settings->input_remapping_directory,
-         sizeof(settings->input_remapping_directory),
+         menu_setting_vars.input_remapping_directory,
+         sizeof(menu_setting_vars.input_remapping_directory),
          menu_hash_to_str(MENU_LABEL_INPUT_REMAPPING_DIRECTORY),
          menu_hash_to_str(MENU_LABEL_VALUE_INPUT_REMAPPING_DIRECTORY),
          "",
@@ -7214,8 +7510,8 @@ static bool setting_append_list_directory_options(
 
    CONFIG_DIR(
          list, list_info,
-         settings->playlist_directory,
-         sizeof(settings->playlist_directory),
+         menu_setting_vars.playlist_directory,
+         sizeof(menu_setting_vars.playlist_directory),
          menu_hash_to_str(MENU_LABEL_PLAYLIST_DIRECTORY),
          menu_hash_to_str(MENU_LABEL_VALUE_PLAYLIST_DIRECTORY),
          "",
@@ -7268,8 +7564,8 @@ static bool setting_append_list_directory_options(
 
    CONFIG_DIR(
          list, list_info,
-         settings->cache_directory,
-         sizeof(settings->cache_directory),
+         menu_setting_vars.cache_directory,
+         sizeof(menu_setting_vars.cache_directory),
          menu_hash_to_str(MENU_LABEL_CACHE_DIRECTORY),
          menu_hash_to_str(MENU_LABEL_VALUE_CACHE_DIRECTORY),
          "",

pkg/android/phoenix/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.retroarch"
-    android:versionCode="44"
-    android:versionName="1.3.1"
+    android:versionCode="45"
+    android:versionName="1.3.2"
     android:installLocation="preferExternal">
     <uses-feature android:glEsVersion="0x00020000" />
     <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>

pkg/wii/meta.xml

@@ -2,8 +2,8 @@
 <app version="1">
   <name>RetroArch</name>
   <coder>Libretro</coder>
-  <version>1.3.0</version>
-  <release_date>2012-2015</release_date>
+  <version>1.3.2</version>
+  <release_date>2012-2016</release_date>
   <short_description>The cross-platform entertainment system</short_description> 
   <long_description>A port of RetroArch to the GameCube/Wii.</long_description> 
   <no_ios_reload/>