(Menu) Refactor MENU_SETTINGS_DRIVERS

This commit is contained in:
twinaphex 2014-09-04 18:50:03 +02:00
parent 56d59d3bcf
commit 3548a6551b
4 changed files with 14 additions and 14 deletions

View File

@ -29,7 +29,7 @@ static void get_title(const char *label, const char *dir,
strlcpy(title, "PATH OPTIONS", sizeof_title);
else if (menu_type == MENU_SETTINGS_OPTIONS)
strlcpy(title, "SETTINGS", sizeof_title);
else if (menu_type == MENU_SETTINGS_DRIVERS)
else if (!strcmp(label, "Driver Options"))
strlcpy(title, "DRIVER OPTIONS", sizeof_title);
else if (!strcmp(label, "performance_counters"))
strlcpy(title, "PERFORMANCE COUNTERS", sizeof_title);

View File

@ -660,7 +660,7 @@ unsigned menu_common_type_is(const char *label, unsigned type)
!strcmp(label, "User Options") ||
!strcmp(label, "Netplay Options") ||
type == MENU_SETTINGS_OPTIONS ||
type == MENU_SETTINGS_DRIVERS ||
!strcmp(label, "Driver Options") ||
!strcmp(label, "performance_counters") ||
!strcmp(label, "frontend_counters") ||
!strcmp(label, "core_counters") ||

View File

@ -110,7 +110,6 @@ typedef enum
MENU_SETTINGS_CONFIG,
MENU_SETTINGS_PATH_OPTIONS,
MENU_SETTINGS_OPTIONS,
MENU_SETTINGS_DRIVERS,
MENU_SETTINGS_DISK_OPTIONS,
MENU_SETTINGS_DISK_INDEX,
MENU_SETTINGS_DISK_APPEND,

View File

@ -382,6 +382,17 @@ int menu_entries_push_list(menu_handle_t *menu,
input_config_bind_map[i - MENU_SETTINGS_BIND_BEGIN].desc,
"", i, 0);
}
else if (!strcmp(label, "Driver Options"))
{
file_list_clear(list);
add_setting_entry(menu,list,"video_driver", 0, setting_data);
add_setting_entry(menu,list,"audio_driver", 0, setting_data);
add_setting_entry(menu,list,"audio_resampler_driver", 0, setting_data);
add_setting_entry(menu,list,"input_driver", 0, setting_data);
add_setting_entry(menu,list,"camera_driver", 0, setting_data);
add_setting_entry(menu,list,"location_driver", 0, setting_data);
add_setting_entry(menu,list,"menu_driver", 0, setting_data);
}
else
{
switch (menu_type)
@ -485,7 +496,7 @@ int menu_entries_push_list(menu_handle_t *menu,
break;
case MENU_SETTINGS_OPTIONS:
file_list_clear(list);
add_setting_entry(menu,list,"Driver Options", MENU_SETTINGS_DRIVERS, setting_data);
add_setting_entry(menu,list,"Driver Options", MENU_FILE_SWITCH, setting_data);
add_setting_entry(menu,list,"General Options", MENU_SETTINGS_GENERAL_OPTIONS, setting_data);
add_setting_entry(menu,list,"Video Options", MENU_SETTINGS_VIDEO_OPTIONS, setting_data);
add_setting_entry(menu,list,"Shader Options", MENU_SETTINGS_SHADER_OPTIONS, setting_data);
@ -532,16 +543,6 @@ int menu_entries_push_list(menu_handle_t *menu,
add_setting_entry(menu,list,"joypad_autoconfig_dir", 0, setting_data);
add_setting_entry(menu,list,"extraction_directory", 0, setting_data);
break;
case MENU_SETTINGS_DRIVERS:
file_list_clear(list);
add_setting_entry(menu,list,"video_driver", 0, setting_data);
add_setting_entry(menu,list,"audio_driver", 0, setting_data);
add_setting_entry(menu,list,"audio_resampler_driver", 0, setting_data);
add_setting_entry(menu,list,"input_driver", 0, setting_data);
add_setting_entry(menu,list,"camera_driver", 0, setting_data);
add_setting_entry(menu,list,"location_driver", 0, setting_data);
add_setting_entry(menu,list,"menu_driver", 0, setting_data);
break;
}
}