mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-06 18:40:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Clean vs reset configuration matching"

Browse Source
This commit is contained in:
Autechre 2020-10-17 19:02:28 +02:00 committed by GitHub
parent 2f5ae397c2
commit 4fd92ec667
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
config.def.h
View File

@ -542,12 +542,12 @@ static const bool menu_show_core_updater = false;
static const bool menu_show_core_updater = true; static const bool menu_show_core_updater = true;
#endif #endif
static const bool menu_show_legacy_thumbnail_updater = false; static const bool menu_show_legacy_thumbnail_updater = false;
static const bool menu_show_sublabels = true; static const bool menu_show_sublabels = true;
static const bool menu_dynamic_wallpaper_enable = true;
static const bool menu_scroll_fast = false;
#define DEFAULT_MENU_TICKER_TYPE (TICKER_TYPE_LOOP) static const bool menu_scroll_fast = false;
static const float menu_ticker_speed = 2.0f;
#define DEFAULT_MENU_TICKER_TYPE (TICKER_TYPE_LOOP)
static const float menu_ticker_speed = 2.0f;
#define DEFAULT_MENU_TICKER_SMOOTH true #define DEFAULT_MENU_TICKER_SMOOTH true
@ -601,7 +601,6 @@ static const unsigned xmb_menu_layout = 0;
#endif #endif
static const unsigned xmb_icon_theme = XMB_ICON_THEME_MONOCHROME; static const unsigned xmb_icon_theme = XMB_ICON_THEME_MONOCHROME;
static const unsigned xmb_theme = XMB_THEME_ELECTRIC_BLUE; static const unsigned xmb_theme = XMB_THEME_ELECTRIC_BLUE;
static const unsigned xmb_animation = 0;
#if defined(HAVE_LAKKA) || defined(__arm__) || defined(__PPC64__) || defined(__ppc64__) || defined(__powerpc64__) || defined(__powerpc__) || defined(__ppc__) || defined(__POWERPC__) #if defined(HAVE_LAKKA) || defined(__arm__) || defined(__PPC64__) || defined(__ppc64__) || defined(__powerpc64__) || defined(__powerpc__) || defined(__ppc__) || defined(__POWERPC__)
#define DEFAULT_XMB_SHADOWS_ENABLE false #define DEFAULT_XMB_SHADOWS_ENABLE false

23
configuration.c
View File

@ -1542,7 +1542,7 @@ static struct config_bool_setting *populate_settings_bool(
SETTING_BOOL("menu_battery_level_enable", &settings->bools.menu_battery_level_enable, true, true, false); SETTING_BOOL("menu_battery_level_enable", &settings->bools.menu_battery_level_enable, true, true, false);
SETTING_BOOL("menu_core_enable", &settings->bools.menu_core_enable, true, true, false); SETTING_BOOL("menu_core_enable", &settings->bools.menu_core_enable, true, true, false);
SETTING_BOOL("menu_show_sublabels", &settings->bools.menu_show_sublabels, true, menu_show_sublabels, false); SETTING_BOOL("menu_show_sublabels", &settings->bools.menu_show_sublabels, true, menu_show_sublabels, false);
SETTING_BOOL("menu_dynamic_wallpaper_enable", &settings->bools.menu_dynamic_wallpaper_enable, true, menu_dynamic_wallpaper_enable, false); SETTING_BOOL("menu_dynamic_wallpaper_enable", &settings->bools.menu_dynamic_wallpaper_enable, true, false, false);
SETTING_BOOL("menu_ticker_smooth", &settings->bools.menu_ticker_smooth, true, DEFAULT_MENU_TICKER_SMOOTH, false); SETTING_BOOL("menu_ticker_smooth", &settings->bools.menu_ticker_smooth, true, DEFAULT_MENU_TICKER_SMOOTH, false);
SETTING_BOOL("menu_scroll_fast", &settings->bools.menu_scroll_fast, true, false, false); SETTING_BOOL("menu_scroll_fast", &settings->bools.menu_scroll_fast, true, false, false);
@ -1924,9 +1924,9 @@ static struct config_uint_setting *populate_settings_uint(
SETTING_UINT("split_joycon_p8", &settings->uints.input_split_joycon[7], true, 0, false); SETTING_UINT("split_joycon_p8", &settings->uints.input_split_joycon[7], true, 0, false);
#endif #endif
#ifdef HAVE_XMB #ifdef HAVE_XMB
SETTING_UINT("menu_xmb_animation_opening_main_menu", &settings->uints.menu_xmb_animation_opening_main_menu, true, xmb_animation, false); SETTING_UINT("menu_xmb_animation_opening_main_menu", &settings->uints.menu_xmb_animation_opening_main_menu, true, 0 /* TODO/FIXME - implement */, false);
SETTING_UINT("menu_xmb_animation_horizontal_highlight", &settings->uints.menu_xmb_animation_horizontal_highlight, true, xmb_animation, false); SETTING_UINT("menu_xmb_animation_horizontal_highlight", &settings->uints.menu_xmb_animation_horizontal_highlight, true, 0 /* TODO/FIXME - implement */, false);
SETTING_UINT("menu_xmb_animation_move_up_down", &settings->uints.menu_xmb_animation_move_up_down, true, xmb_animation, false); SETTING_UINT("menu_xmb_animation_move_up_down", &settings->uints.menu_xmb_animation_move_up_down, true, 0 /* TODO/FIXME - implement */, false);
SETTING_UINT("xmb_alpha_factor", &settings->uints.menu_xmb_alpha_factor, true, xmb_alpha_factor, false); SETTING_UINT("xmb_alpha_factor", &settings->uints.menu_xmb_alpha_factor, true, xmb_alpha_factor, false);
SETTING_UINT("xmb_layout", &settings->uints.menu_xmb_layout, true, xmb_menu_layout, false); SETTING_UINT("xmb_layout", &settings->uints.menu_xmb_layout, true, xmb_menu_layout, false);
SETTING_UINT("xmb_theme", &settings->uints.menu_xmb_theme, true, xmb_icon_theme, false); SETTING_UINT("xmb_theme", &settings->uints.menu_xmb_theme, true, xmb_icon_theme, false);
@ -1991,8 +1991,8 @@ static struct config_uint_setting *populate_settings_uint(
SETTING_UINT("midi_volume", &settings->uints.midi_volume, true, midi_volume, false); SETTING_UINT("midi_volume", &settings->uints.midi_volume, true, midi_volume, false);
SETTING_UINT("video_stream_port", &settings->uints.video_stream_port, true, RARCH_STREAM_DEFAULT_PORT, false); SETTING_UINT("video_stream_port", &settings->uints.video_stream_port, true, RARCH_STREAM_DEFAULT_PORT, false);
SETTING_UINT("video_record_quality", &settings->uints.video_record_quality, true, RECORD_CONFIG_TYPE_RECORDING_MED_QUALITY, false); SETTING_UINT("video_record_quality", &settings->uints.video_record_quality, true, RECORD_CONFIG_TYPE_RECORDING_LOSSLESS_QUALITY, false);
SETTING_UINT("video_stream_quality", &settings->uints.video_stream_quality, true, RECORD_CONFIG_TYPE_STREAMING_MED_QUALITY, false); SETTING_UINT("video_stream_quality", &settings->uints.video_stream_quality, true, RECORD_CONFIG_TYPE_STREAMING_LOW_QUALITY, false);
SETTING_UINT("video_record_scale_factor", &settings->uints.video_record_scale_factor, true, 1, false); SETTING_UINT("video_record_scale_factor", &settings->uints.video_record_scale_factor, true, 1, false);
SETTING_UINT("video_stream_scale_factor", &settings->uints.video_stream_scale_factor, true, 1, false); SETTING_UINT("video_stream_scale_factor", &settings->uints.video_stream_scale_factor, true, 1, false);
SETTING_UINT("video_windowed_position_x", &settings->uints.window_position_x, true, 0, false); SETTING_UINT("video_windowed_position_x", &settings->uints.window_position_x, true, 0, false);
@ -2421,7 +2421,7 @@ void config_set_defaults(void *data)
#endif #endif
*settings->paths.path_record_config = '\0'; *settings->paths.path_record_config = '\0';
*settings->paths.path_stream_config = '\0'; *settings->paths.path_stream_config = '\0';
*settings->paths.path_stream_url = '\0'; *settings->paths.path_stream_url = '\0';
*settings->paths.path_softfilter_plugin = '\0'; *settings->paths.path_softfilter_plugin = '\0';
*settings->paths.directory_content_history = '\0'; *settings->paths.directory_content_history = '\0';
@ -2581,15 +2581,6 @@ void config_set_defaults(void *data)
settings->paths.log_dir, settings->paths.log_dir,
g_defaults.dirs[DEFAULT_DIR_LOGS]); g_defaults.dirs[DEFAULT_DIR_LOGS]);
if (!string_is_empty(g_defaults.dirs[DEFAULT_DIR_RECORD_OUTPUT]))
fill_pathname_expand_special(global->record.output_dir,
g_defaults.dirs[DEFAULT_DIR_RECORD_OUTPUT],
sizeof(global->record.output_dir));
if (!string_is_empty(g_defaults.dirs[DEFAULT_DIR_RECORD_CONFIG]))
fill_pathname_expand_special(global->record.config_dir,
g_defaults.dirs[DEFAULT_DIR_RECORD_CONFIG],
sizeof(global->record.config_dir));
if (!string_is_empty(g_defaults.path_config)) if (!string_is_empty(g_defaults.path_config))
{ {
char temp_str[PATH_MAX_LENGTH]; char temp_str[PATH_MAX_LENGTH];

5
frontend/drivers/platform_win32.c
View File

@ -568,11 +568,6 @@ static int frontend_win32_parse_drive_list(void *data, bool load_content)
static void frontend_win32_environment_get(int *argc, char *argv[], static void frontend_win32_environment_get(int *argc, char *argv[],
void *args, void *params_data) void *args, void *params_data)
{ {
const char *tmp_dir = getenv("TMP");
if (!string_is_empty(tmp_dir))
fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_CACHE],
tmp_dir, sizeof(g_defaults.dirs[DEFAULT_DIR_CACHE]));
gfx_set_dwm(); gfx_set_dwm();
fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_ASSETS], fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_ASSETS],

10
menu/menu_setting.c
View File

@ -12277,7 +12277,7 @@ static bool setting_append_list(
&settings->uints.video_stream_port, &settings->uints.video_stream_port,
MENU_ENUM_LABEL_UDP_STREAM_PORT, MENU_ENUM_LABEL_UDP_STREAM_PORT,
MENU_ENUM_LABEL_VALUE_UDP_STREAM_PORT, MENU_ENUM_LABEL_VALUE_UDP_STREAM_PORT,
RARCH_STREAM_DEFAULT_PORT, 1,
&group_info, &group_info,
&subgroup_info, &subgroup_info,
parent_group, parent_group,
@ -13704,7 +13704,7 @@ static bool setting_append_list(
&settings->bools.menu_dynamic_wallpaper_enable, &settings->bools.menu_dynamic_wallpaper_enable,
MENU_ENUM_LABEL_DYNAMIC_WALLPAPER, MENU_ENUM_LABEL_DYNAMIC_WALLPAPER,
MENU_ENUM_LABEL_VALUE_DYNAMIC_WALLPAPER, MENU_ENUM_LABEL_VALUE_DYNAMIC_WALLPAPER,
menu_dynamic_wallpaper_enable, true,
MENU_ENUM_LABEL_VALUE_OFF, MENU_ENUM_LABEL_VALUE_OFF,
MENU_ENUM_LABEL_VALUE_ON, MENU_ENUM_LABEL_VALUE_ON,
&group_info, &group_info,
@ -14082,7 +14082,7 @@ static bool setting_append_list(
&settings->uints.menu_xmb_animation_horizontal_highlight, &settings->uints.menu_xmb_animation_horizontal_highlight,
MENU_ENUM_LABEL_MENU_XMB_ANIMATION_HORIZONTAL_HIGHLIGHT, MENU_ENUM_LABEL_MENU_XMB_ANIMATION_HORIZONTAL_HIGHLIGHT,
MENU_ENUM_LABEL_VALUE_MENU_XMB_ANIMATION_HORIZONTAL_HIGHLIGHT, MENU_ENUM_LABEL_VALUE_MENU_XMB_ANIMATION_HORIZONTAL_HIGHLIGHT,
xmb_animation, DEFAULT_MENU_TICKER_TYPE,
&group_info, &group_info,
&subgroup_info, &subgroup_info,
parent_group, parent_group,
@ -14099,7 +14099,7 @@ static bool setting_append_list(
&settings->uints.menu_xmb_animation_move_up_down, &settings->uints.menu_xmb_animation_move_up_down,
MENU_ENUM_LABEL_MENU_XMB_ANIMATION_MOVE_UP_DOWN, MENU_ENUM_LABEL_MENU_XMB_ANIMATION_MOVE_UP_DOWN,
MENU_ENUM_LABEL_VALUE_MENU_XMB_ANIMATION_MOVE_UP_DOWN, MENU_ENUM_LABEL_VALUE_MENU_XMB_ANIMATION_MOVE_UP_DOWN,
xmb_animation, DEFAULT_MENU_TICKER_TYPE, /* TODO/FIXME - is this correct? */
&group_info, &group_info,
&subgroup_info, &subgroup_info,
parent_group, parent_group,
@ -14116,7 +14116,7 @@ static bool setting_append_list(
&settings->uints.menu_xmb_animation_opening_main_menu, &settings->uints.menu_xmb_animation_opening_main_menu,
MENU_ENUM_LABEL_MENU_XMB_ANIMATION_OPENING_MAIN_MENU, MENU_ENUM_LABEL_MENU_XMB_ANIMATION_OPENING_MAIN_MENU,
MENU_ENUM_LABEL_VALUE_MENU_XMB_ANIMATION_OPENING_MAIN_MENU, MENU_ENUM_LABEL_VALUE_MENU_XMB_ANIMATION_OPENING_MAIN_MENU,
xmb_animation, DEFAULT_MENU_TICKER_TYPE,
&group_info, &group_info,
&subgroup_info, &subgroup_info,
parent_group, parent_group,

4
retroarch.c
View File

@ -22259,10 +22259,6 @@ static bool recording_init(
else else
{ {
const char *game_name = path_basename(path_get(RARCH_PATH_BASENAME)); const char *game_name = path_basename(path_get(RARCH_PATH_BASENAME));
/* Fallback to core name if started without content */
if (string_is_empty(game_name))
game_name = p_rarch->runloop_system.info.library_name;
if (video_record_quality < RECORD_CONFIG_TYPE_RECORDING_WEBM_FAST) if (video_record_quality < RECORD_CONFIG_TYPE_RECORDING_WEBM_FAST)
{ {
fill_str_dated_filename(buf, game_name, fill_str_dated_filename(buf, game_name,