diff --git a/audio/audio_driver.c b/audio/audio_driver.c index 1f64f28725..4ef6fc8bc9 100644 --- a/audio/audio_driver.c +++ b/audio/audio_driver.c @@ -352,7 +352,8 @@ static bool audio_driver_init_internal(bool audio_cb_inited) if (!audio_init_thread( ¤t_audio, &audio_driver_context_audio_data, - *settings->audio.device ? settings->audio.device : NULL, + *settings->arrays.audio_device + ? settings->arrays.audio_device : NULL, settings->uints.audio_out_rate, &new_rate, settings->uints.audio_latency, settings->uints.audio_block_frames, @@ -366,8 +367,8 @@ static bool audio_driver_init_internal(bool audio_cb_inited) #endif { audio_driver_context_audio_data = - current_audio->init(*settings->audio.device ? - settings->audio.device : NULL, + current_audio->init(*settings->arrays.audio_device ? + settings->arrays.audio_device : NULL, settings->uints.audio_out_rate, settings->uints.audio_latency, settings->uints.audio_block_frames, @@ -410,11 +411,11 @@ static bool audio_driver_init_internal(bool audio_cb_inited) if (!retro_resampler_realloc( &audio_driver_resampler_data, &audio_driver_resampler, - settings->audio.resampler, + settings->arrays.audio_resampler, audio_source_ratio_original)) { RARCH_ERR("Failed to initialize resampler \"%s\".\n", - settings->audio.resampler); + settings->arrays.audio_resampler); audio_driver_active = false; } @@ -795,7 +796,7 @@ bool audio_driver_find_driver(void) settings_t *settings = config_get_ptr(); drv.label = "audio_driver"; - drv.s = settings->audio.driver; + drv.s = settings->arrays.audio_driver; driver_ctl(RARCH_DRIVER_CTL_FIND_INDEX, &drv); @@ -807,7 +808,7 @@ bool audio_driver_find_driver(void) { unsigned d; RARCH_ERR("Couldn't find any audio driver named \"%s\"\n", - settings->audio.driver); + settings->arrays.audio_driver); RARCH_LOG_OUTPUT("Available audio drivers are:\n"); for (d = 0; audio_driver_find_handle(d); d++) RARCH_LOG_OUTPUT("\t%s\n", audio_driver_find_ident(d)); diff --git a/audio/drivers/jack.c b/audio/drivers/jack.c index a413e34a31..3bfa0c608f 100644 --- a/audio/drivers/jack.c +++ b/audio/drivers/jack.c @@ -106,7 +106,7 @@ static int parse_ports(char **dest_ports, const char **jports) char *save = NULL; int parsed = 0; settings_t *settings = config_get_ptr(); - char *audio_device_cpy = strdup(settings->audio.device); + char *audio_device_cpy = strdup(settings->arrays.audio_device); const char *con = strtok_r(audio_device_cpy, ",", &save); if (con) diff --git a/camera/camera_driver.c b/camera/camera_driver.c index f7f9644502..32f0e3441f 100644 --- a/camera/camera_driver.c +++ b/camera/camera_driver.c @@ -136,7 +136,7 @@ bool camera_driver_ctl(enum rarch_camera_ctl_state state, void *data) driver_ctx_info_t drv; drv.label = "camera_driver"; - drv.s = settings->camera.driver; + drv.s = settings->arrays.camera_driver; driver_ctl(RARCH_DRIVER_CTL_FIND_INDEX, &drv); @@ -148,7 +148,7 @@ bool camera_driver_ctl(enum rarch_camera_ctl_state state, void *data) { unsigned d; RARCH_ERR("Couldn't find any camera driver named \"%s\"\n", - settings->camera.driver); + settings->arrays.camera_driver); RARCH_LOG_OUTPUT("Available camera drivers are:\n"); for (d = 0; camera_driver_find_handle(d); d++) RARCH_LOG_OUTPUT("\t%s\n", camera_driver_find_ident(d)); @@ -222,7 +222,7 @@ bool camera_driver_ctl(enum rarch_camera_ctl_state state, void *data) return false; camera_data = camera_driver->init( - *settings->camera.device ? settings->camera.device : NULL, + *settings->arrays.camera_device ? settings->arrays.camera_device : NULL, camera_cb.caps, settings->uints.camera_width ? settings->uints.camera_width : camera_cb.width, diff --git a/cheevos/cheevos.c b/cheevos/cheevos.c index a7d717a55e..c623a1bbce 100644 --- a/cheevos/cheevos.c +++ b/cheevos/cheevos.c @@ -2092,8 +2092,8 @@ static int cheevos_login(retro_time_t *timeout) urle_pwd[0] = '\0'; request[0] = '\0'; - username = settings->cheevos.username; - password = settings->cheevos.password; + username = settings->arrays.cheevos_username; + password = settings->arrays.cheevos_password; if (!username || !*username || !password || !*password) { @@ -2142,7 +2142,9 @@ static void cheevos_make_unlock_url(const cheevo_t *cheevo, char* url, size_t ur snprintf( url, url_size, "http://retroachievements.org/dorequest.php?r=awardachievement&u=%s&t=%s&a=%u&h=%d", - settings->cheevos.username, cheevos_locals.token, cheevo->id, + settings->arrays.cheevos_username, + cheevos_locals.token, + cheevo->id, settings->bools.cheevos_hardcore_mode_enable ? 1 : 0 ); @@ -2272,7 +2274,8 @@ static void cheevos_make_lboard_url(const cheevos_leaderboard_t *lboard, hash[0] = '\0'; snprintf(signature, sizeof(signature), "%u%s%u", lboard->id, - settings->cheevos.username, lboard->id); + settings->arrays.cheevos_username, + lboard->id); MD5_Init(&ctx); MD5_Update(&ctx, (void*)signature, strlen(signature)); @@ -2282,7 +2285,9 @@ static void cheevos_make_lboard_url(const cheevos_leaderboard_t *lboard, url, url_size, "http://retroachievements.org/dorequest.php?r=submitlbentry&u=%s&t=%s&i=%u&s=%d" "&v=%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", - settings->cheevos.username, cheevos_locals.token, lboard->id, + settings->arrays.cheevos_username, + cheevos_locals.token, + lboard->id, lboard->last_value, hash[ 0], hash[ 1], hash[ 2], hash[ 3], hash[ 4], hash[ 5], hash[ 6], hash[ 7], @@ -2423,7 +2428,8 @@ static int cheevos_get_by_game_id(const char **json, snprintf( request, sizeof(request), "http://retroachievements.org/dorequest.php?r=patch&u=%s&g=%u&f=3&l=1&t=%s", - settings->cheevos.username, game_id, cheevos_locals.token + settings->arrays.cheevos_username, + game_id, cheevos_locals.token ); request[sizeof(request) - 1] = 0; @@ -2502,7 +2508,8 @@ static void cheevos_make_playing_url(unsigned game_id, char* url, size_t url_siz snprintf( url, url_size, "http://retroachievements.org/dorequest.php?r=postactivity&u=%s&t=%s&a=3&m=%u", - settings->cheevos.username, cheevos_locals.token, game_id + settings->arrays.cheevos_username, + cheevos_locals.token, game_id ); url[url_size - 1] = 0; @@ -2629,7 +2636,8 @@ static int cheevos_deactivate_unlocks(unsigned game_id, retro_time_t *timeout) snprintf( request, sizeof(request), "http://retroachievements.org/dorequest.php?r=unlocks&u=%s&t=%s&g=%u&h=0", - settings->cheevos.username, cheevos_locals.token, game_id + settings->arrays.cheevos_username, + cheevos_locals.token, game_id ); request[sizeof(request) - 1] = 0; @@ -2658,7 +2666,8 @@ static int cheevos_deactivate_unlocks(unsigned game_id, retro_time_t *timeout) snprintf( request, sizeof(request), "http://retroachievements.org/dorequest.php?r=unlocks&u=%s&t=%s&g=%u&h=1", - settings->cheevos.username, cheevos_locals.token, game_id + settings->arrays.cheevos_username, + cheevos_locals.token, game_id ); request[sizeof(request) - 1] = 0; diff --git a/configuration.c b/configuration.c index 07dada8349..0689ebdaf4 100644 --- a/configuration.c +++ b/configuration.c @@ -605,31 +605,31 @@ static struct config_array_setting *populate_settings_array(settings_t *settings struct config_array_setting *tmp = NULL; /* Arrays */ - SETTING_ARRAY("playlist_names", settings->playlist_names, false, NULL, true); - SETTING_ARRAY("playlist_cores", settings->playlist_cores, false, NULL, true); - SETTING_ARRAY("video_driver", settings->video.driver, false, NULL, true); - SETTING_ARRAY("record_driver", settings->record.driver, false, NULL, true); - SETTING_ARRAY("camera_driver", settings->camera.driver, false, NULL, true); - SETTING_ARRAY("wifi_driver", settings->wifi.driver, false, NULL, true); - SETTING_ARRAY("location_driver", settings->location.driver,false, NULL, true); + SETTING_ARRAY("playlist_names", settings->arrays.playlist_names, false, NULL, true); + SETTING_ARRAY("playlist_cores", settings->arrays.playlist_cores, false, NULL, true); + SETTING_ARRAY("video_driver", settings->arrays.video_driver, false, NULL, true); + SETTING_ARRAY("record_driver", settings->arrays.record_driver, false, NULL, true); + SETTING_ARRAY("camera_driver", settings->arrays.camera_driver, false, NULL, true); + SETTING_ARRAY("wifi_driver", settings->arrays.wifi_driver, false, NULL, true); + SETTING_ARRAY("location_driver", settings->arrays.location_driver,false, NULL, true); #ifdef HAVE_MENU - SETTING_ARRAY("menu_driver", settings->menu.driver, false, NULL, true); + SETTING_ARRAY("menu_driver", settings->arrays.menu_driver, false, NULL, true); #endif - SETTING_ARRAY("audio_device", settings->audio.device, false, NULL, true); - SETTING_ARRAY("camera_device", settings->camera.device, false, NULL, true); + SETTING_ARRAY("audio_device", settings->arrays.audio_device, false, NULL, true); + SETTING_ARRAY("camera_device", settings->arrays.camera_device, false, NULL, true); #ifdef HAVE_CHEEVOS - SETTING_ARRAY("cheevos_username", settings->cheevos.username, false, NULL, true); - SETTING_ARRAY("cheevos_password", settings->cheevos.password, false, NULL, true); + SETTING_ARRAY("cheevos_username", settings->arrays.cheevos_username, false, NULL, true); + SETTING_ARRAY("cheevos_password", settings->arrays.cheevos_password, false, NULL, true); #endif - SETTING_ARRAY("video_context_driver", settings->video.context_driver, false, NULL, true); - SETTING_ARRAY("audio_driver", settings->audio.driver, false, NULL, true); - SETTING_ARRAY("audio_resampler", settings->audio.resampler, false, NULL, true); - SETTING_ARRAY("input_driver", settings->input.driver, false, NULL, true); - SETTING_ARRAY("input_joypad_driver", settings->input.joypad_driver, false, NULL, true); - SETTING_ARRAY("input_keyboard_layout", settings->input.keyboard_layout, false, NULL, true); - SETTING_ARRAY("bundle_assets_src_path", settings->path.bundle_assets_src, false, NULL, true); - SETTING_ARRAY("bundle_assets_dst_path", settings->path.bundle_assets_dst, false, NULL, true); - SETTING_ARRAY("bundle_assets_dst_path_subdir", settings->path.bundle_assets_dst_subdir, false, NULL, true); + SETTING_ARRAY("video_context_driver", settings->arrays.video_context_driver, false, NULL, true); + SETTING_ARRAY("audio_driver", settings->arrays.audio_driver, false, NULL, true); + SETTING_ARRAY("audio_resampler", settings->arrays.audio_resampler, false, NULL, true); + SETTING_ARRAY("input_driver", settings->arrays.input_driver, false, NULL, true); + SETTING_ARRAY("input_joypad_driver", settings->arrays.input_joypad_driver, false, NULL, true); + SETTING_ARRAY("input_keyboard_layout", settings->arrays.input_keyboard_layout, false, NULL, true); + SETTING_ARRAY("bundle_assets_src_path", settings->arrays.bundle_assets_src, false, NULL, true); + SETTING_ARRAY("bundle_assets_dst_path", settings->arrays.bundle_assets_dst, false, NULL, true); + SETTING_ARRAY("bundle_assets_dst_path_subdir", settings->arrays.bundle_assets_dst_subdir, false, NULL, true); *size = count; @@ -1119,36 +1119,36 @@ static void config_set_defaults(void) } if (def_camera) - strlcpy(settings->camera.driver, - def_camera, sizeof(settings->camera.driver)); + strlcpy(settings->arrays.camera_driver, + def_camera, sizeof(settings->arrays.camera_driver)); if (def_wifi) - strlcpy(settings->wifi.driver, - def_wifi, sizeof(settings->wifi.driver)); + strlcpy(settings->arrays.wifi_driver, + def_wifi, sizeof(settings->arrays.wifi_driver)); if (def_location) - strlcpy(settings->location.driver, - def_location, sizeof(settings->location.driver)); + strlcpy(settings->arrays.location_driver, + def_location, sizeof(settings->arrays.location_driver)); if (def_video) - strlcpy(settings->video.driver, - def_video, sizeof(settings->video.driver)); + strlcpy(settings->arrays.video_driver, + def_video, sizeof(settings->arrays.video_driver)); if (def_audio) - strlcpy(settings->audio.driver, - def_audio, sizeof(settings->audio.driver)); + strlcpy(settings->arrays.audio_driver, + def_audio, sizeof(settings->arrays.audio_driver)); if (def_audio_resampler) - strlcpy(settings->audio.resampler, - def_audio_resampler, sizeof(settings->audio.resampler)); + strlcpy(settings->arrays.audio_resampler, + def_audio_resampler, sizeof(settings->arrays.audio_resampler)); if (def_input) - strlcpy(settings->input.driver, - def_input, sizeof(settings->input.driver)); + strlcpy(settings->arrays.input_driver, + def_input, sizeof(settings->arrays.input_driver)); if (def_joypad) - strlcpy(settings->input.joypad_driver, - def_joypad, sizeof(settings->input.joypad_driver)); + strlcpy(settings->arrays.input_joypad_driver, + def_joypad, sizeof(settings->arrays.input_joypad_driver)); if (def_record) - strlcpy(settings->record.driver, - def_record, sizeof(settings->record.driver)); + strlcpy(settings->arrays.record_driver, + def_record, sizeof(settings->arrays.record_driver)); #ifdef HAVE_MENU if (def_menu) - strlcpy(settings->menu.driver, - def_menu, sizeof(settings->menu.driver)); + strlcpy(settings->arrays.menu_driver, + def_menu, sizeof(settings->arrays.menu_driver)); #ifdef HAVE_XMB *settings->menu.xmb_font = '\0'; #endif @@ -1183,8 +1183,8 @@ static void config_set_defaults(void) settings->floats.video_refresh_rate = g_defaults.settings.video_refresh_rate; if (audio_device) - strlcpy(settings->audio.device, - audio_device, sizeof(settings->audio.device)); + strlcpy(settings->arrays.audio_device, + audio_device, sizeof(settings->arrays.audio_device)); if (!g_defaults.settings.out_latency) g_defaults.settings.out_latency = out_latency; @@ -1210,8 +1210,8 @@ static void config_set_defaults(void) #endif #ifdef HAVE_CHEEVOS - *settings->cheevos.username = '\0'; - *settings->cheevos.password = '\0'; + *settings->arrays.cheevos_username = '\0'; + *settings->arrays.cheevos_password = '\0'; #endif input_config_reset(); @@ -1234,7 +1234,7 @@ static void config_set_defaults(void) strlcpy(settings->network.buildbot_assets_url, buildbot_assets_server_url, sizeof(settings->network.buildbot_assets_url)); - *settings->input.keyboard_layout = '\0'; + *settings->arrays.input_keyboard_layout = '\0'; for (i = 0; i < MAX_USERS; i++) { @@ -1301,9 +1301,9 @@ static void config_set_defaults(void) *settings->path.cheat_settings = '\0'; *settings->path.shader = '\0'; #ifndef IOS - *settings->path.bundle_assets_src = '\0'; - *settings->path.bundle_assets_dst = '\0'; - *settings->path.bundle_assets_dst_subdir = '\0'; + *settings->arrays.bundle_assets_src = '\0'; + *settings->arrays.bundle_assets_dst = '\0'; + *settings->arrays.bundle_assets_dst_subdir = '\0'; #endif *settings->path.cheat_database = '\0'; *settings->path.menu_wallpaper = '\0'; @@ -1311,8 +1311,8 @@ static void config_set_defaults(void) *settings->path.overlay = '\0'; *settings->path.softfilter_plugin = '\0'; - *settings->playlist_names = '\0'; - *settings->playlist_cores = '\0'; + *settings->arrays.playlist_names = '\0'; + *settings->arrays.playlist_cores = '\0'; *settings->directory.content_history = '\0'; *settings->path.audio_dsp_plugin = '\0'; @@ -1726,15 +1726,15 @@ static bool check_shader_compatibility(enum file_path_enum enum_idx) { settings_t *settings = config_get_ptr(); - if (memcmp(settings->video.driver, "vulkan", 6) == 0) + if (memcmp(settings->arrays.video_driver, "vulkan", 6) == 0) { if (enum_idx != FILE_PATH_SLANGP_EXTENSION) return false; return true; } - if ((memcmp(settings->video.driver, "gl", 2) == 0) || - (memcmp(settings->video.driver, "d3d", 3) == 0) + if ((memcmp(settings->arrays.video_driver, "gl", 2) == 0) || + (memcmp(settings->arrays.video_driver, "d3d", 3) == 0) ) { if (enum_idx == FILE_PATH_SLANGP_EXTENSION) @@ -2297,7 +2297,7 @@ static bool config_load_file(const char *path, bool set_defaults, continue; RARCH_LOG("Incompatible shader for backend %s, clearing...\n", - settings->video.driver); + settings->arrays.video_driver); settings->path.shader[0] = '\0'; break; } @@ -2943,7 +2943,7 @@ bool config_save_autoconf_profile(const char *path, unsigned user) config_file_t *conf = NULL; settings_t *settings = config_get_ptr(); const char *autoconf_dir = settings->directory.autoconfig; - const char *joypad_ident = settings->input.joypad_driver; + const char *joypad_ident = settings->arrays.input_joypad_driver; buf[0] = autoconf_file[0] = '\0'; diff --git a/configuration.h b/configuration.h index 3b80fdece5..b80491e25c 100644 --- a/configuration.h +++ b/configuration.h @@ -326,79 +326,56 @@ typedef struct settings #endif } uints; + struct + { + char playlist_names[PATH_MAX_LENGTH]; + char playlist_cores[PATH_MAX_LENGTH]; + char video_driver[32]; + char record_driver[32]; + char camera_driver[32]; + char wifi_driver[32]; + char location_driver[32]; +#ifdef HAVE_MENU + char menu_driver[32]; +#endif + char audio_device[255]; + char camera_device[255]; +#ifdef HAVE_CHEEVOS + char cheevos_username[32]; + char cheevos_password[32]; +#endif + char video_context_driver[32]; + char audio_driver[32]; + char audio_resampler[32]; + char input_driver[32]; + char input_joypad_driver[32]; + char input_keyboard_layout[64]; + char bundle_assets_src[PATH_MAX_LENGTH]; + char bundle_assets_dst[PATH_MAX_LENGTH]; + char bundle_assets_dst_subdir[PATH_MAX_LENGTH]; + } arrays; + bool modified; video_viewport_t video_viewport_custom; size_t rewind_buffer_size; - char playlist_names[PATH_MAX_LENGTH]; - char playlist_cores[PATH_MAX_LENGTH]; - struct - { - char driver[32]; - char context_driver[32]; - } video; - - struct - { - char driver[32]; - } record; #ifdef HAVE_MENU struct { - char driver[32]; char xmb_font[PATH_MAX_LENGTH]; } menu; #endif - struct - { - char driver[32]; - char device[255]; - } camera; - - struct - { - char driver[32]; - } wifi; - - struct - { - char driver[32]; - } location; - - struct - { - char driver[32]; - char resampler[32]; - char device[255]; - } audio; - - struct - { - char driver[32]; - char joypad_driver[32]; - char keyboard_layout[64]; - - } input; - struct { char buildbot_url[255]; char buildbot_assets_url[255]; } network; -#ifdef HAVE_CHEEVOS - struct - { - char username[32]; - char password[32]; - } cheevos; -#endif - char browse_url[4096]; struct @@ -416,9 +393,6 @@ typedef struct settings char content_video_history[PATH_MAX_LENGTH]; char libretro_info[PATH_MAX_LENGTH]; char cheat_settings[PATH_MAX_LENGTH]; - char bundle_assets_src[PATH_MAX_LENGTH]; - char bundle_assets_dst[PATH_MAX_LENGTH]; - char bundle_assets_dst_subdir[PATH_MAX_LENGTH]; char shader[PATH_MAX_LENGTH]; char font[PATH_MAX_LENGTH]; } path; @@ -456,7 +430,6 @@ typedef struct settings } netplay; #endif - char username[32]; } settings_t; diff --git a/file_path_special.c b/file_path_special.c index 3c5276d032..cc1b3cd3b4 100644 --- a/file_path_special.c +++ b/file_path_special.c @@ -297,7 +297,7 @@ void fill_pathname_application_special(char *s, size_t len, enum application_spe settings_t *settings = config_get_ptr(); fill_pathname_join(s, settings->directory.autoconfig, - settings->input.joypad_driver, + settings->arrays.input_joypad_driver, len); } break; diff --git a/gfx/drivers/d3d.cpp b/gfx/drivers/d3d.cpp index d11183b8a2..11dc6200ba 100644 --- a/gfx/drivers/d3d.cpp +++ b/gfx/drivers/d3d.cpp @@ -1118,7 +1118,7 @@ static const gfx_ctx_driver_t *d3d_get_context(void *data) enum gfx_ctx_api api = GFX_CTX_DIRECT3D9_API; #endif return video_context_driver_init_first(data, - settings->video.context_driver, + settings->arrays.video_context_driver, api, major, minor, false); } diff --git a/gfx/drivers/gdi_gfx.c b/gfx/drivers/gdi_gfx.c index afa1a825c1..8b3f4e54ab 100644 --- a/gfx/drivers/gdi_gfx.c +++ b/gfx/drivers/gdi_gfx.c @@ -81,7 +81,7 @@ static void *gdi_gfx_init(const video_info_t *video, gdi_gfx_create(); ctx_driver = video_context_driver_init_first(gdi, - settings->video.context_driver, + settings->arrays.video_context_driver, GFX_CTX_GDI_API, 1, 0, false); if (!ctx_driver) goto error; diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c index c03cd224ab..71855b5d96 100644 --- a/gfx/drivers/gl.c +++ b/gfx/drivers/gl.c @@ -1685,7 +1685,7 @@ static const gfx_ctx_driver_t *gl_get_context(gl_t *gl) gl_shared_context_use = settings->bools.video_shared_context && hwr->context_type != RETRO_HW_CONTEXT_NONE; - return video_context_driver_init_first(gl, settings->video.context_driver, + return video_context_driver_init_first(gl, settings->arrays.video_context_driver, api, major, minor, gl_shared_context_use); } diff --git a/gfx/drivers/vg.c b/gfx/drivers/vg.c index 25b929ca54..b60817cada 100644 --- a/gfx/drivers/vg.c +++ b/gfx/drivers/vg.c @@ -105,7 +105,7 @@ static void *vg_init(const video_info_t *video, settings_t *settings = config_get_ptr(); vg_t *vg = (vg_t*)calloc(1, sizeof(vg_t)); const gfx_ctx_driver_t *ctx = video_context_driver_init_first( - vg, settings->video.context_driver, + vg, settings->arrays.video_context_driver, GFX_CTX_OPENVG_API, 0, 0, false); if (!vg || !ctx) diff --git a/gfx/drivers/vulkan.c b/gfx/drivers/vulkan.c index bca30b4f0f..528a441491 100644 --- a/gfx/drivers/vulkan.c +++ b/gfx/drivers/vulkan.c @@ -67,7 +67,7 @@ static const gfx_ctx_driver_t *vulkan_get_context(vk_t *vk) enum gfx_ctx_api api = GFX_CTX_VULKAN_API; return video_context_driver_init_first( - vk, settings->video.context_driver, + vk, settings->arrays.video_context_driver, api, major, minor, false); } diff --git a/gfx/drivers/xvideo.c b/gfx/drivers/xvideo.c index c4edd04cad..9a1d936a83 100644 --- a/gfx/drivers/xvideo.c +++ b/gfx/drivers/xvideo.c @@ -594,7 +594,7 @@ static void *xv_init(const video_info_t *video, if (input && input_data) { - xinput = input_x.init(settings->input.joypad_driver); + xinput = input_x.init(settings->arrays.input_joypad_driver); if (xinput) { *input = &input_x; diff --git a/gfx/video_context_driver.c b/gfx/video_context_driver.c index 1d4eef161b..a25bcedeb2 100644 --- a/gfx/video_context_driver.c +++ b/gfx/video_context_driver.c @@ -127,13 +127,13 @@ bool video_context_driver_find_prev_driver(void) { settings_t *settings = config_get_ptr(); int i = find_video_context_driver_index( - settings->video.context_driver); + settings->arrays.video_context_driver); if (i > 0) { - strlcpy(settings->video.context_driver, + strlcpy(settings->arrays.video_context_driver, gfx_ctx_drivers[i - 1]->ident, - sizeof(settings->video.context_driver)); + sizeof(settings->arrays.video_context_driver)); return true; } @@ -149,13 +149,13 @@ bool video_context_driver_find_prev_driver(void) bool video_context_driver_find_next_driver(void) { settings_t *settings = config_get_ptr(); - int i = find_video_context_driver_index(settings->video.context_driver); + int i = find_video_context_driver_index(settings->arrays.video_context_driver); if (i >= 0 && gfx_ctx_drivers[i + 1]) { - strlcpy(settings->video.context_driver, + strlcpy(settings->arrays.video_context_driver, gfx_ctx_drivers[i + 1]->ident, - sizeof(settings->video.context_driver)); + sizeof(settings->arrays.video_context_driver)); return true; } @@ -419,7 +419,7 @@ bool video_context_driver_get_metrics(gfx_ctx_metrics_t *metrics) bool video_context_driver_input_driver(gfx_ctx_input_t *inp) { settings_t *settings = config_get_ptr(); - const char *joypad_name = settings ? settings->input.joypad_driver : NULL; + const char *joypad_name = settings ? settings->arrays.input_joypad_driver : NULL; if (!current_video_context || !current_video_context->input_driver) return false; diff --git a/gfx/video_driver.c b/gfx/video_driver.c index 43febf98a3..37dbdfc362 100644 --- a/gfx/video_driver.c +++ b/gfx/video_driver.c @@ -1607,7 +1607,7 @@ bool video_driver_find_driver(void) } drv.label = "video_driver"; - drv.s = settings->video.driver; + drv.s = settings->arrays.video_driver; driver_ctl(RARCH_DRIVER_CTL_FIND_INDEX, &drv); @@ -1619,7 +1619,7 @@ bool video_driver_find_driver(void) { unsigned d; RARCH_ERR("Couldn't find any video driver named \"%s\"\n", - settings->video.driver); + settings->arrays.video_driver); RARCH_LOG_OUTPUT("Available video drivers are:\n"); for (d = 0; video_driver_find_handle(d); d++) RARCH_LOG_OUTPUT("\t%s\n", video_driver_find_ident(d)); diff --git a/input/drivers_keyboard/keyboard_event_xkb.c b/input/drivers_keyboard/keyboard_event_xkb.c index 5a8fb5988d..b74357e7a7 100644 --- a/input/drivers_keyboard/keyboard_event_xkb.c +++ b/input/drivers_keyboard/keyboard_event_xkb.c @@ -88,9 +88,9 @@ int init_xkb(int fd, size_t size) rule.rules = "evdev"; - if (*settings->input.keyboard_layout) + if (*settings->arrays.input_keyboard_layout) { - list = string_split(settings->input.keyboard_layout, ":"); + list = string_split(settings->arrays.input_keyboard_layout, ":"); if (list && list->size >= 2) rule.variant = list->elems[1].data; if (list && list->size >= 1) diff --git a/input/input_driver.c b/input/input_driver.c index ed52085188..1a796e9800 100644 --- a/input/input_driver.c +++ b/input/input_driver.c @@ -1015,7 +1015,7 @@ bool input_driver_init(void) settings_t *settings = config_get_ptr(); if (current_input) - current_input_data = current_input->init(settings->input.joypad_driver); + current_input_data = current_input->init(settings->arrays.input_joypad_driver); if (!current_input_data) return false; @@ -1066,7 +1066,7 @@ bool input_driver_find_driver(void) settings_t *settings = config_get_ptr(); drv.label = "input_driver"; - drv.s = settings->input.driver; + drv.s = settings->arrays.input_driver; driver_ctl(RARCH_DRIVER_CTL_FIND_INDEX, &drv); @@ -1079,7 +1079,7 @@ bool input_driver_find_driver(void) { unsigned d; RARCH_ERR("Couldn't find any input driver named \"%s\"\n", - settings->input.driver); + settings->arrays.input_driver); RARCH_LOG_OUTPUT("Available input drivers are:\n"); for (d = 0; input_driver_find_handle(d); d++) RARCH_LOG_OUTPUT("\t%s\n", input_driver_find_ident(d)); diff --git a/intl/msg_hash_chs.c b/intl/msg_hash_chs.c index 227965a229..89607373a6 100644 --- a/intl/msg_hash_chs.c +++ b/intl/msg_hash_chs.c @@ -674,7 +674,7 @@ int menu_hash_get_help_chs_enum(enum msg_hash_enums msg, char *s, size_t len) break; case MENU_ENUM_LABEL_INPUT_DRIVER: if (settings) - driver_hash = msg_hash_calculate(settings->input.driver); + driver_hash = msg_hash_calculate(settings->arrays.input_driver); switch (driver_hash) { @@ -753,7 +753,7 @@ int menu_hash_get_help_chs_enum(enum msg_hash_enums msg, char *s, size_t len) snprintf(s, len, "当前视频驱动."); - if (memcmp(settings->video.driver, "gl", 2) == 0) + if (memcmp(settings->arrays.video_driver, "gl", 2) == 0) { snprintf(s, len, "OpenGL视频驱动. \n" @@ -767,7 +767,7 @@ int menu_hash_get_help_chs_enum(enum msg_hash_enums msg, char *s, size_t len) "dependent on your graphics card's \n" "underlying GL driver)."); } - else if (memcmp(settings->video.driver, "sdl2", 4) == 0) + else if (memcmp(settings->arrays.video_driver, "sdl2", 4) == 0) { snprintf(s, len, "SDL 2 视频驱动.\n" @@ -779,7 +779,7 @@ int menu_hash_get_help_chs_enum(enum msg_hash_enums msg, char *s, size_t len) "core implementations is dependent \n" "on your platform SDL implementation."); } - else if (memcmp(settings->video.driver, "sdl1", 4) == 0) + else if (memcmp(settings->arrays.video_driver, "sdl1", 4) == 0) { snprintf(s, len, "SDL 视频驱动.\n" @@ -790,7 +790,7 @@ int menu_hash_get_help_chs_enum(enum msg_hash_enums msg, char *s, size_t len) "Performance is considered to be suboptimal. \n" "Consider using it only as a last resort."); } - else if (memcmp(settings->video.driver, "d3d", 3) == 0) + else if (memcmp(settings->arrays.video_driver, "d3d", 3) == 0) { snprintf(s, len, "Direct3D 视频驱动. \n" @@ -799,7 +799,7 @@ int menu_hash_get_help_chs_enum(enum msg_hash_enums msg, char *s, size_t len) "is dependent on your graphic card's \n" "underlying D3D driver)."); } - else if (memcmp(settings->video.driver, "exynos", 6) == 0) + else if (memcmp(settings->arrays.video_driver, "exynos", 6) == 0) { snprintf(s, len, "Exynos-G2D 视频驱动. \n" @@ -811,7 +811,7 @@ int menu_hash_get_help_chs_enum(enum msg_hash_enums msg, char *s, size_t len) "Performance for software rendered cores \n" "should be optimal."); } - else if (memcmp(settings->video.driver, "drm", 3) == 0) + else if (memcmp(settings->arrays.video_driver, "drm", 3) == 0) { snprintf(s, len, "Plain DRM 视频驱动. \n" @@ -820,7 +820,7 @@ int menu_hash_get_help_chs_enum(enum msg_hash_enums msg, char *s, size_t len) "libdrm for hardware scaling using \n" "GPU overlays."); } - else if (memcmp(settings->video.driver, "sunxi", 5) == 0) + else if (memcmp(settings->arrays.video_driver, "sunxi", 5) == 0) { snprintf(s, len, "Sunxi-G2D 视频驱动. \n" @@ -838,7 +838,7 @@ int menu_hash_get_help_chs_enum(enum msg_hash_enums msg, char *s, size_t len) break; case MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER: if (settings) - driver_hash = msg_hash_calculate(settings->audio.resampler); + driver_hash = msg_hash_calculate(settings->arrays.audio_resampler); switch (driver_hash) { diff --git a/intl/msg_hash_de.c b/intl/msg_hash_de.c index 7b175e4a15..efb1a8366a 100644 --- a/intl/msg_hash_de.c +++ b/intl/msg_hash_de.c @@ -691,7 +691,7 @@ int menu_hash_get_help_de_enum(enum msg_hash_enums msg, char *s, size_t len) break; case MENU_ENUM_LABEL_INPUT_DRIVER: if (settings) - driver_hash = msg_hash_calculate(settings->input.driver); + driver_hash = msg_hash_calculate(settings->arrays.input_driver); switch (driver_hash) { @@ -771,7 +771,7 @@ int menu_hash_get_help_de_enum(enum msg_hash_enums msg, char *s, size_t len) snprintf(s, len, "Aktueller Grafiktreiber"); - if (memcmp(settings->video.driver, "gl", 2) == 0) + if (memcmp(settings->arrays.video_driver, "gl", 2) == 0) { snprintf(s, len, "OpenGL-Grafiktreiber. \n" @@ -784,7 +784,7 @@ int menu_hash_get_help_de_enum(enum msg_hash_enums msg, char *s, size_t len) "als auch bei libretro-GL-Cores, hängt von dem \n" "GL-Treiber deiner Grafikkarte ab."); } - else if (memcmp(settings->video.driver, "sdl2", 4) == 0) + else if (memcmp(settings->arrays.video_driver, "sdl2", 4) == 0) { snprintf(s, len, "SDL2-Grafiktreiber.\n" @@ -795,7 +795,7 @@ int menu_hash_get_help_de_enum(enum msg_hash_enums msg, char *s, size_t len) "Die Leistung hängt von der SDL- \n" "Implementierung deiner Plattform ab."); } - else if (memcmp(settings->video.driver, "sdl1", 4) == 0) + else if (memcmp(settings->arrays.video_driver, "sdl1", 4) == 0) { snprintf(s, len, "SDL-Grafiktreiber.\n" @@ -807,7 +807,7 @@ int menu_hash_get_help_de_enum(enum msg_hash_enums msg, char *s, size_t len) "solltest diesen Treiber nur als letzte \n" "Möglichkeit verwenden."); } - else if (memcmp(settings->video.driver, "d3d", 3) == 0) + else if (memcmp(settings->arrays.video_driver, "d3d", 3) == 0) { snprintf(s, len, "Direct3D-Grafiktreiber. \n" @@ -816,7 +816,7 @@ int menu_hash_get_help_de_enum(enum msg_hash_enums msg, char *s, size_t len) "Cores hängt von dem D3D-Treiber deiner \n" "Grafikkarte ab."); } - else if (memcmp(settings->video.driver, "exynos", 6) == 0) + else if (memcmp(settings->arrays.video_driver, "exynos", 6) == 0) { snprintf(s, len, "Exynos-G2D-Grafiktreiber. \n" @@ -828,7 +828,7 @@ int menu_hash_get_help_de_enum(enum msg_hash_enums msg, char *s, size_t len) "Die Leistung bei software-gerendeten Cores sollte \n" "optimal sein."); } - else if (memcmp(settings->video.driver, "drm", 3) == 0) + else if (memcmp(settings->arrays.video_driver, "drm", 3) == 0) { snprintf(s, len, "DRM-Grafiktreiber \n" @@ -837,7 +837,7 @@ int menu_hash_get_help_de_enum(enum msg_hash_enums msg, char *s, size_t len) "Er verwendet libdrm für Hardware-Skalierung und \n" "GPU-Overlays."); } - else if (memcmp(settings->video.driver, "sunxi", 5) == 0) + else if (memcmp(settings->arrays.video_driver, "sunxi", 5) == 0) { snprintf(s, len, "Sunxi-G2D-Grafiktreiber\n" @@ -855,7 +855,7 @@ int menu_hash_get_help_de_enum(enum msg_hash_enums msg, char *s, size_t len) break; case MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER: if (settings) - driver_hash = msg_hash_calculate(settings->audio.resampler); + driver_hash = msg_hash_calculate(settings->arrays.audio_resampler); switch (driver_hash) { diff --git a/intl/msg_hash_es.c b/intl/msg_hash_es.c index 7a1ac0d3c1..9bb64c2609 100644 --- a/intl/msg_hash_es.c +++ b/intl/msg_hash_es.c @@ -132,7 +132,7 @@ int menu_hash_get_help_es_enum(enum msg_hash_enums msg, char *s, size_t len) break; case MENU_ENUM_LABEL_INPUT_DRIVER: if (settings) - driver_hash = msg_hash_calculate(settings->input.driver); + driver_hash = msg_hash_calculate(settings->arrays.input_driver); switch (driver_hash) { @@ -232,7 +232,7 @@ int menu_hash_get_help_es_enum(enum msg_hash_enums msg, char *s, size_t len) snprintf(s, len, "Controlador de vídeo actual."); - if (memcmp(settings->video.driver, "gl", 2) == 0) + if (memcmp(settings->arrays.video_driver, "gl", 2) == 0) { snprintf(s, len, "Controlador de vídeo OpenGL. \n" @@ -247,7 +247,7 @@ int menu_hash_get_help_es_enum(enum msg_hash_enums msg, char *s, size_t len) "del controlador GL que tenga tu \n" "tarjeta gráfica."); } - else if (memcmp(settings->video.driver, "sdl2", 4) == 0) + else if (memcmp(settings->arrays.video_driver, "sdl2", 4) == 0) { snprintf(s, len, "Controlador de vídeo SDL 2.\n" @@ -259,7 +259,7 @@ int menu_hash_get_help_es_enum(enum msg_hash_enums msg, char *s, size_t len) "libretro por software depende de la \n" "implementación SDL de tu plataforma."); } - else if (memcmp(settings->video.driver, "sdl1", 4) == 0) + else if (memcmp(settings->arrays.video_driver, "sdl1", 4) == 0) { snprintf(s, len, "Controlador de vídeo SDL.\n" @@ -271,7 +271,7 @@ int menu_hash_get_help_es_enum(enum msg_hash_enums msg, char *s, size_t len) "a lo óptimo. Utilízalo únicamente como \n" "último recurso."); } - else if (memcmp(settings->video.driver, "d3d", 3) == 0) + else if (memcmp(settings->arrays.video_driver, "d3d", 3) == 0) { snprintf(s, len, "Controlador de vídeo Direct3D. \n" @@ -281,7 +281,7 @@ int menu_hash_get_help_es_enum(enum msg_hash_enums msg, char *s, size_t len) "del controlador D3D de tu tarjeta \n" "gráfica."); } - else if (memcmp(settings->video.driver, "exynos", 6) == 0) + else if (memcmp(settings->arrays.video_driver, "exynos", 6) == 0) { snprintf(s, len, "Controlador de vídeo Exynos-G2D. \n" @@ -295,7 +295,7 @@ int menu_hash_get_help_es_enum(enum msg_hash_enums msg, char *s, size_t len) "renderizados por software debería \n" "ser óptimo."); } - else if (memcmp(settings->video.driver, "drm", 3) == 0) + else if (memcmp(settings->arrays.video_driver, "drm", 3) == 0) { snprintf(s, len, "Controlador de vídeo de DRM simple. \n" @@ -306,7 +306,7 @@ int menu_hash_get_help_es_enum(enum msg_hash_enums msg, char *s, size_t len) " \n" "El blitting se hace por software."); } - else if (memcmp(settings->video.driver, "sunxi", 5) == 0) + else if (memcmp(settings->arrays.video_driver, "sunxi", 5) == 0) { snprintf(s, len, "Controlador de vídeo Sunxi-G2D. \n" @@ -325,7 +325,7 @@ int menu_hash_get_help_es_enum(enum msg_hash_enums msg, char *s, size_t len) break; case MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER: if (settings) - driver_hash = msg_hash_calculate(settings->audio.resampler); + driver_hash = msg_hash_calculate(settings->arrays.audio_resampler); switch (driver_hash) { diff --git a/intl/msg_hash_it.c b/intl/msg_hash_it.c index 689f87dd56..79fb438f02 100644 --- a/intl/msg_hash_it.c +++ b/intl/msg_hash_it.c @@ -121,7 +121,7 @@ int menu_hash_get_help_it_enum(enum msg_hash_enums msg, char *s, size_t len) break; case MENU_ENUM_LABEL_INPUT_DRIVER: if (settings) - driver_hash = msg_hash_calculate(settings->input.driver); + driver_hash = msg_hash_calculate(settings->arrays.input_driver); switch (driver_hash) { @@ -207,7 +207,7 @@ int menu_hash_get_help_it_enum(enum msg_hash_enums msg, char *s, size_t len) snprintf(s, len, "Driver video attuale."); - if (memcmp(settings->video.driver, "gl", 2) == 0) + if (memcmp(settings->arrays.video_driver, "gl", 2) == 0) { snprintf(s, len, "Diver video OpenGL. \n" @@ -221,7 +221,7 @@ int menu_hash_get_help_it_enum(enum msg_hash_enums msg, char *s, size_t len) "dalla tua scheda grafica \n" "sottostante driver GL)."); } - else if (memcmp(settings->video.driver, "sdl2", 4) == 0) + else if (memcmp(settings->arrays.video_driver, "sdl2", 4) == 0) { snprintf(s, len, "Driver video SDL 2.\n" @@ -233,7 +233,7 @@ int menu_hash_get_help_it_enum(enum msg_hash_enums msg, char *s, size_t len) "renderizzati via software dipende \n" "dall'implementazzione sulla tua piattaforma SDL."); } - else if (memcmp(settings->video.driver, "sdl1", 4) == 0) + else if (memcmp(settings->arrays.video_driver, "sdl1", 4) == 0) { snprintf(s, len, "Driver video SDL.\n" @@ -244,7 +244,7 @@ int menu_hash_get_help_it_enum(enum msg_hash_enums msg, char *s, size_t len) "Le performance sono considerate quasi ottimali. \n" "Considera di usare questo soltanto come ultima scelta."); } - else if (memcmp(settings->video.driver, "d3d", 3) == 0) + else if (memcmp(settings->arrays.video_driver, "d3d", 3) == 0) { snprintf(s, len, "Driver video Direct3D. \n" @@ -253,7 +253,7 @@ int menu_hash_get_help_it_enum(enum msg_hash_enums msg, char *s, size_t len) "software dipende dal driver D3D inerente \n" "alla tua scheda video)."); } - else if (memcmp(settings->video.driver, "exynos", 6) == 0) + else if (memcmp(settings->arrays.video_driver, "exynos", 6) == 0) { snprintf(s, len, "Exynos-G2D Video Driver. \n" @@ -265,7 +265,7 @@ int menu_hash_get_help_it_enum(enum msg_hash_enums msg, char *s, size_t len) "Le performance per i core renderizzati via software \n" "dovrebbero essere ottimali."); } - else if (memcmp(settings->video.driver, "sunxi", 5) == 0) + else if (memcmp(settings->arrays.video_driver, "sunxi", 5) == 0) { snprintf(s, len, "Driver video Sunxi-G2D. \n" @@ -283,7 +283,7 @@ int menu_hash_get_help_it_enum(enum msg_hash_enums msg, char *s, size_t len) break; case MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER: if (settings) - driver_hash = msg_hash_calculate(settings->audio.resampler); + driver_hash = msg_hash_calculate(settings->arrays.audio_resampler); switch (driver_hash) { diff --git a/intl/msg_hash_ja.c b/intl/msg_hash_ja.c index f1ec2ff140..58afba031e 100644 --- a/intl/msg_hash_ja.c +++ b/intl/msg_hash_ja.c @@ -699,7 +699,7 @@ int menu_hash_get_help_jp_enum(enum msg_hash_enums msg, char *s, size_t len) break; case MENU_ENUM_LABEL_INPUT_DRIVER: if (settings) - driver_hash = msg_hash_calculate(settings->input.driver); + driver_hash = msg_hash_calculate(settings->arrays.input_driver); switch (driver_hash) { @@ -780,7 +780,7 @@ int menu_hash_get_help_jp_enum(enum msg_hash_enums msg, char *s, size_t len) snprintf(s, len, "Current Video driver."); - if (memcmp(settings->video.driver, "gl", 2) == 0) + if (memcmp(settings->arrays.video_driver, "gl", 2) == 0) { snprintf(s, len, "OpenGL Video driver. \n" @@ -794,7 +794,7 @@ int menu_hash_get_help_jp_enum(enum msg_hash_enums msg, char *s, size_t len) "dependent on your graphics card's \n" "underlying GL driver)."); } - else if (memcmp(settings->video.driver, "sdl2", 4) == 0) + else if (memcmp(settings->arrays.video_driver, "sdl2", 4) == 0) { snprintf(s, len, "SDL 2 Video driver.\n" @@ -806,7 +806,7 @@ int menu_hash_get_help_jp_enum(enum msg_hash_enums msg, char *s, size_t len) "core implementations is dependent \n" "on your platform SDL implementation."); } - else if (memcmp(settings->video.driver, "sdl1", 4) == 0) + else if (memcmp(settings->arrays.video_driver, "sdl1", 4) == 0) { snprintf(s, len, "SDL Video driver.\n" @@ -817,7 +817,7 @@ int menu_hash_get_help_jp_enum(enum msg_hash_enums msg, char *s, size_t len) "Performance is considered to be suboptimal. \n" "Consider using it only as a last resort."); } - else if (memcmp(settings->video.driver, "d3d", 3) == 0) + else if (memcmp(settings->arrays.video_driver, "d3d", 3) == 0) { snprintf(s, len, "Direct3D Video driver. \n" @@ -826,7 +826,7 @@ int menu_hash_get_help_jp_enum(enum msg_hash_enums msg, char *s, size_t len) "is dependent on your graphic card's \n" "underlying D3D driver)."); } - else if (memcmp(settings->video.driver, "exynos", 6) == 0) + else if (memcmp(settings->arrays.video_driver, "exynos", 6) == 0) { snprintf(s, len, "Exynos-G2D Video Driver. \n" @@ -838,7 +838,7 @@ int menu_hash_get_help_jp_enum(enum msg_hash_enums msg, char *s, size_t len) "Performance for software rendered cores \n" "should be optimal."); } - else if (memcmp(settings->video.driver, "drm", 3) == 0) + else if (memcmp(settings->arrays.video_driver, "drm", 3) == 0) { snprintf(s, len, "Plain DRM Video Driver. \n" @@ -847,7 +847,7 @@ int menu_hash_get_help_jp_enum(enum msg_hash_enums msg, char *s, size_t len) "libdrm for hardware scaling using \n" "GPU overlays."); } - else if (memcmp(settings->video.driver, "sunxi", 5) == 0) + else if (memcmp(settings->arrays.video_driver, "sunxi", 5) == 0) { snprintf(s, len, "Sunxi-G2D Video Driver. \n" @@ -865,7 +865,7 @@ int menu_hash_get_help_jp_enum(enum msg_hash_enums msg, char *s, size_t len) break; case MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER: if (settings) - driver_hash = msg_hash_calculate(settings->audio.resampler); + driver_hash = msg_hash_calculate(settings->arrays.audio_resampler); switch (driver_hash) { diff --git a/intl/msg_hash_ko.c b/intl/msg_hash_ko.c index 42028d3b1e..73b5ed6e17 100644 --- a/intl/msg_hash_ko.c +++ b/intl/msg_hash_ko.c @@ -692,7 +692,7 @@ int menu_hash_get_help_ko_enum(enum msg_hash_enums msg, char *s, size_t len) { break; case MENU_ENUM_LABEL_INPUT_DRIVER: if (settings) - driver_hash = msg_hash_calculate(settings->input.driver); + driver_hash = msg_hash_calculate(settings->arrays.input_driver); switch (driver_hash) { case MENU_LABEL_INPUT_DRIVER_UDEV: @@ -769,7 +769,7 @@ int menu_hash_get_help_ko_enum(enum msg_hash_enums msg, char *s, size_t len) { snprintf(s, len, "Current Video driver."); - if (memcmp(settings->video.driver, "gl", 2) == 0) + if (memcmp(settings->arrays.video_driver, "gl", 2) == 0) { snprintf(s, len, "OpenGL Video driver. \n" @@ -783,7 +783,7 @@ int menu_hash_get_help_ko_enum(enum msg_hash_enums msg, char *s, size_t len) { "dependent on your graphics card's \n" "underlying GL driver)."); } - else if (memcmp(settings->video.driver, "sdl2", 4) == 0) + else if (memcmp(settings->arrays.video_driver, "sdl2", 4) == 0) { snprintf(s, len, "SDL 2 Video driver.\n" @@ -795,7 +795,7 @@ int menu_hash_get_help_ko_enum(enum msg_hash_enums msg, char *s, size_t len) { "core implementations is dependent \n" "on your platform SDL implementation."); } - else if (memcmp(settings->video.driver, "sdl1", 4) == 0) + else if (memcmp(settings->arrays.video_driver, "sdl1", 4) == 0) { snprintf(s, len, "SDL Video driver.\n" @@ -806,7 +806,7 @@ int menu_hash_get_help_ko_enum(enum msg_hash_enums msg, char *s, size_t len) { "Performance is considered to be suboptimal. \n" "Consider using it only as a last resort."); } - else if (memcmp(settings->video.driver, "d3d", 3) == 0) + else if (memcmp(settings->arrays.video_driver, "d3d", 3) == 0) { snprintf(s, len, "Direct3D Video driver. \n" @@ -815,7 +815,7 @@ int menu_hash_get_help_ko_enum(enum msg_hash_enums msg, char *s, size_t len) { "is dependent on your graphic card's \n" "underlying D3D driver)."); } - else if (memcmp(settings->video.driver, "exynos", 6) == 0) + else if (memcmp(settings->arrays.video_driver, "exynos", 6) == 0) { snprintf(s, len, "Exynos-G2D Video Driver. \n" @@ -826,7 +826,7 @@ int menu_hash_get_help_ko_enum(enum msg_hash_enums msg, char *s, size_t len) { " \n" "Performance for software rendered cores \n" "should be optimal."); - } else if (memcmp(settings->video.driver, "drm", 3) == 0) + } else if (memcmp(settings->arrays.video_driver, "drm", 3) == 0) { snprintf(s, len, "Plain DRM Video Driver. \n" @@ -835,7 +835,7 @@ int menu_hash_get_help_ko_enum(enum msg_hash_enums msg, char *s, size_t len) { "libdrm for hardware scaling using \n" "GPU overlays."); } - else if (memcmp(settings->video.driver, "sunxi", 5) == 0) + else if (memcmp(settings->arrays.video_driver, "sunxi", 5) == 0) { snprintf(s, len, "Sunxi-G2D Video Driver. \n" @@ -853,7 +853,7 @@ int menu_hash_get_help_ko_enum(enum msg_hash_enums msg, char *s, size_t len) { break; case MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER: if (settings) - driver_hash = msg_hash_calculate(settings->audio.resampler); + driver_hash = msg_hash_calculate(settings->arrays.audio_resampler); switch (driver_hash) { case MENU_LABEL_AUDIO_RESAMPLER_DRIVER_SINC: diff --git a/intl/msg_hash_pt_br.c b/intl/msg_hash_pt_br.c index 3ab57c5bf6..38034858aa 100644 --- a/intl/msg_hash_pt_br.c +++ b/intl/msg_hash_pt_br.c @@ -46,7 +46,7 @@ int menu_hash_get_help_pt_br_enum(enum msg_hash_enums msg, char *s, size_t len) break; case MENU_ENUM_LABEL_INPUT_DRIVER: if (settings) - driver_hash = msg_hash_calculate(settings->input.driver); + driver_hash = msg_hash_calculate(settings->arrays.input_driver); switch (driver_hash) { @@ -108,7 +108,7 @@ int menu_hash_get_help_pt_br_enum(enum msg_hash_enums msg, char *s, size_t len) snprintf(s, len, "Driver de Vídeo em uso."); - if (memcmp(settings->video.driver, "gl", 2) == 0) + if (memcmp(settings->arrays.video_driver, "gl", 2) == 0) { snprintf(s, len, "Driver de Vídeo OpenGL. \n" @@ -122,7 +122,7 @@ int menu_hash_get_help_pt_br_enum(enum msg_hash_enums msg, char *s, size_t len) "depende do driver GL instalado em sua \n" "placa de vídeo."); } - else if (memcmp(settings->video.driver, "sdl2", 4) == 0) + else if (memcmp(settings->arrays.video_driver, "sdl2", 4) == 0) { snprintf(s, len, "Driver de Vídeo SDL 2.\n" @@ -134,7 +134,7 @@ int menu_hash_get_help_pt_br_enum(enum msg_hash_enums msg, char *s, size_t len) "renderização por software depende da \n" "implementação SDL de sua plataforma."); } - else if (memcmp(settings->video.driver, "sdl1", 4) == 0) + else if (memcmp(settings->arrays.video_driver, "sdl1", 4) == 0) { snprintf(s, len, "Driver de Vídeo SDL.\n" @@ -145,7 +145,7 @@ int menu_hash_get_help_pt_br_enum(enum msg_hash_enums msg, char *s, size_t len) "O desemprenho é considerado subótimo. \n" "Considere seu uso apenas em último caso."); } - else if (memcmp(settings->video.driver, "d3d", 3) == 0) + else if (memcmp(settings->arrays.video_driver, "d3d", 3) == 0) { snprintf(s, len, "Driver de Vídeo Direct3D. \n" @@ -154,7 +154,7 @@ int menu_hash_get_help_pt_br_enum(enum msg_hash_enums msg, char *s, size_t len) "renderização por software depende do driver \n" "D3D instalado em sua placa de vídeo."); } - else if (memcmp(settings->video.driver, "exynos", 6) == 0) + else if (memcmp(settings->arrays.video_driver, "exynos", 6) == 0) { snprintf(s, len, "Driver de Vídeo Exynos-G2D. \n" @@ -166,7 +166,7 @@ int menu_hash_get_help_pt_br_enum(enum msg_hash_enums msg, char *s, size_t len) "O desempenho para cores de renderização por \n" "software deve ser ótimo."); } - else if (memcmp(settings->video.driver, "sunxi", 5) == 0) + else if (memcmp(settings->arrays.video_driver, "sunxi", 5) == 0) { snprintf(s, len, "Driver de Vídeo Sunxi-G2D. \n" @@ -184,7 +184,7 @@ int menu_hash_get_help_pt_br_enum(enum msg_hash_enums msg, char *s, size_t len) break; case MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER: if (settings) - driver_hash = msg_hash_calculate(settings->audio.resampler); + driver_hash = msg_hash_calculate(settings->arrays.audio_resampler); switch (driver_hash) { diff --git a/intl/msg_hash_pt_pt.c b/intl/msg_hash_pt_pt.c index f107022700..7606203f8c 100644 --- a/intl/msg_hash_pt_pt.c +++ b/intl/msg_hash_pt_pt.c @@ -46,7 +46,7 @@ int menu_hash_get_help_pt_pt_enum(enum msg_hash_enums msg, char *s, size_t len) break; case MENU_ENUM_LABEL_INPUT_DRIVER: if (settings) - driver_hash = msg_hash_calculate(settings->input.driver); + driver_hash = msg_hash_calculate(settings->arrays.input_driver); switch (driver_hash) { @@ -108,7 +108,7 @@ int menu_hash_get_help_pt_pt_enum(enum msg_hash_enums msg, char *s, size_t len) snprintf(s, len, "Driver de Vídeo em uso."); - if (memcmp(settings->video.driver, "gl", 2) == 0) + if (memcmp(settings->arrays.video_driver, "gl", 2) == 0) { snprintf(s, len, "Driver de Vídeo OpenGL. \n" @@ -122,7 +122,7 @@ int menu_hash_get_help_pt_pt_enum(enum msg_hash_enums msg, char *s, size_t len) "depende do driver GL instalado em sua \n" "placa de vídeo."); } - else if (memcmp(settings->video.driver, "sdl2", 4) == 0) + else if (memcmp(settings->arrays.video_driver, "sdl2", 4) == 0) { snprintf(s, len, "Driver de Vídeo SDL 2.\n" @@ -134,7 +134,7 @@ int menu_hash_get_help_pt_pt_enum(enum msg_hash_enums msg, char *s, size_t len) "renderização por software depende da \n" "implementação SDL de sua plataforma."); } - else if (memcmp(settings->video.driver, "sdl1", 4) == 0) + else if (memcmp(settings->arrays.video_driver, "sdl1", 4) == 0) { snprintf(s, len, "Driver de Vídeo SDL.\n" @@ -145,7 +145,7 @@ int menu_hash_get_help_pt_pt_enum(enum msg_hash_enums msg, char *s, size_t len) "O desemprenho é considerado subótimo. \n" "Considere seu uso apenas em último caso."); } - else if (memcmp(settings->video.driver, "d3d", 3) == 0) + else if (memcmp(settings->arrays.video_driver, "d3d", 3) == 0) { snprintf(s, len, "Driver de Vídeo Direct3D. \n" @@ -154,7 +154,7 @@ int menu_hash_get_help_pt_pt_enum(enum msg_hash_enums msg, char *s, size_t len) "renderização por software depende do driver \n" "D3D instalado em sua placa de vídeo."); } - else if (memcmp(settings->video.driver, "exynos", 6) == 0) + else if (memcmp(settings->arrays.video_driver, "exynos", 6) == 0) { snprintf(s, len, "Driver de Vídeo Exynos-G2D. \n" @@ -166,7 +166,7 @@ int menu_hash_get_help_pt_pt_enum(enum msg_hash_enums msg, char *s, size_t len) "O desempenho para cores de renderização por \n" "software deve ser ótimo."); } - else if (memcmp(settings->video.driver, "sunxi", 5) == 0) + else if (memcmp(settings->arrays.video_driver, "sunxi", 5) == 0) { snprintf(s, len, "Driver de Vídeo Sunxi-G2D. \n" @@ -184,7 +184,7 @@ int menu_hash_get_help_pt_pt_enum(enum msg_hash_enums msg, char *s, size_t len) break; case MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER: if (settings) - driver_hash = msg_hash_calculate(settings->audio.resampler); + driver_hash = msg_hash_calculate(settings->arrays.audio_resampler); switch (driver_hash) { diff --git a/intl/msg_hash_us.c b/intl/msg_hash_us.c index 4d138101ed..0e0586a845 100644 --- a/intl/msg_hash_us.c +++ b/intl/msg_hash_us.c @@ -692,7 +692,7 @@ int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len) { break; case MENU_ENUM_LABEL_INPUT_DRIVER: if (settings) - driver_hash = msg_hash_calculate(settings->input.driver); + driver_hash = msg_hash_calculate(settings->arrays.input_driver); switch (driver_hash) { case MENU_LABEL_INPUT_DRIVER_UDEV: @@ -769,7 +769,7 @@ int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len) { snprintf(s, len, "Current Video driver."); - if (memcmp(settings->video.driver, "gl", 2) == 0) + if (memcmp(settings->arrays.video_driver, "gl", 2) == 0) { snprintf(s, len, "OpenGL Video driver. \n" @@ -783,7 +783,7 @@ int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len) { "dependent on your graphics card's \n" "underlying GL driver)."); } - else if (memcmp(settings->video.driver, "sdl2", 4) == 0) + else if (memcmp(settings->arrays.video_driver, "sdl2", 4) == 0) { snprintf(s, len, "SDL 2 Video driver.\n" @@ -795,7 +795,7 @@ int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len) { "core implementations is dependent \n" "on your platform SDL implementation."); } - else if (memcmp(settings->video.driver, "sdl1", 4) == 0) + else if (memcmp(settings->arrays.video_driver, "sdl1", 4) == 0) { snprintf(s, len, "SDL Video driver.\n" @@ -806,7 +806,7 @@ int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len) { "Performance is considered to be suboptimal. \n" "Consider using it only as a last resort."); } - else if (memcmp(settings->video.driver, "d3d", 3) == 0) + else if (memcmp(settings->arrays.video_driver, "d3d", 3) == 0) { snprintf(s, len, "Direct3D Video driver. \n" @@ -815,7 +815,7 @@ int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len) { "is dependent on your graphic card's \n" "underlying D3D driver)."); } - else if (memcmp(settings->video.driver, "exynos", 6) == 0) + else if (memcmp(settings->arrays.video_driver, "exynos", 6) == 0) { snprintf(s, len, "Exynos-G2D Video Driver. \n" @@ -827,7 +827,7 @@ int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len) { "Performance for software rendered cores \n" "should be optimal."); } - else if (memcmp(settings->video.driver, "drm", 3) == 0) + else if (memcmp(settings->arrays.video_driver, "drm", 3) == 0) { snprintf(s, len, "Plain DRM Video Driver. \n" @@ -836,7 +836,7 @@ int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len) { "libdrm for hardware scaling using \n" "GPU overlays."); } - else if (memcmp(settings->video.driver, "sunxi", 5) == 0) + else if (memcmp(settings->arrays.video_driver, "sunxi", 5) == 0) { snprintf(s, len, "Sunxi-G2D Video Driver. \n" @@ -854,7 +854,7 @@ int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len) { break; case MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER: if (settings) - driver_hash = msg_hash_calculate(settings->audio.resampler); + driver_hash = msg_hash_calculate(settings->arrays.audio_resampler); switch (driver_hash) { case MENU_LABEL_AUDIO_RESAMPLER_DRIVER_SINC: diff --git a/intl/msg_hash_vn.c b/intl/msg_hash_vn.c index 908e496bf4..bdb77b2679 100644 --- a/intl/msg_hash_vn.c +++ b/intl/msg_hash_vn.c @@ -699,7 +699,7 @@ int menu_hash_get_help_vn_enum(enum msg_hash_enums msg, char *s, size_t len) break; case MENU_ENUM_LABEL_INPUT_DRIVER: if (settings) - driver_hash = msg_hash_calculate(settings->input.driver); + driver_hash = msg_hash_calculate(settings->arrays.input_driver); switch (driver_hash) { @@ -780,7 +780,7 @@ int menu_hash_get_help_vn_enum(enum msg_hash_enums msg, char *s, size_t len) snprintf(s, len, "Current Video driver."); - if (memcmp(settings->video.driver, "gl", 2) == 0) + if (memcmp(settings->arrays.video_driver, "gl", 2) == 0) { snprintf(s, len, "OpenGL Video driver. \n" @@ -794,7 +794,7 @@ int menu_hash_get_help_vn_enum(enum msg_hash_enums msg, char *s, size_t len) "dependent on your graphics card's \n" "underlying GL driver)."); } - else if (memcmp(settings->video.driver, "sdl2", 4) == 0) + else if (memcmp(settings->arrays.video_driver, "sdl2", 4) == 0) { snprintf(s, len, "SDL 2 Video driver.\n" @@ -806,7 +806,7 @@ int menu_hash_get_help_vn_enum(enum msg_hash_enums msg, char *s, size_t len) "core implementations is dependent \n" "on your platform SDL implementation."); } - else if (memcmp(settings->video.driver, "sdl1", 4) == 0) + else if (memcmp(settings->arrays.video_driver, "sdl1", 4) == 0) { snprintf(s, len, "SDL Video driver.\n" @@ -817,7 +817,7 @@ int menu_hash_get_help_vn_enum(enum msg_hash_enums msg, char *s, size_t len) "Performance is considered to be suboptimal. \n" "Consider using it only as a last resort."); } - else if (memcmp(settings->video.driver, "d3d", 3) == 0) + else if (memcmp(settings->arrays.video_driver, "d3d", 3) == 0) { snprintf(s, len, "Direct3D Video driver. \n" @@ -826,7 +826,7 @@ int menu_hash_get_help_vn_enum(enum msg_hash_enums msg, char *s, size_t len) "is dependent on your graphic card's \n" "underlying D3D driver)."); } - else if (memcmp(settings->video.driver, "exynos", 6) == 0) + else if (memcmp(settings->arrays.video_driver, "exynos", 6) == 0) { snprintf(s, len, "Exynos-G2D Video Driver. \n" @@ -838,7 +838,7 @@ int menu_hash_get_help_vn_enum(enum msg_hash_enums msg, char *s, size_t len) "Performance for software rendered cores \n" "should be optimal."); } - else if (memcmp(settings->video.driver, "drm", 3) == 0) + else if (memcmp(settings->arrays.video_driver, "drm", 3) == 0) { snprintf(s, len, "Plain DRM Video Driver. \n" @@ -847,7 +847,7 @@ int menu_hash_get_help_vn_enum(enum msg_hash_enums msg, char *s, size_t len) "libdrm for hardware scaling using \n" "GPU overlays."); } - else if (memcmp(settings->video.driver, "sunxi", 5) == 0) + else if (memcmp(settings->arrays.video_driver, "sunxi", 5) == 0) { snprintf(s, len, "Sunxi-G2D Video Driver. \n" @@ -865,7 +865,7 @@ int menu_hash_get_help_vn_enum(enum msg_hash_enums msg, char *s, size_t len) break; case MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER: if (settings) - driver_hash = msg_hash_calculate(settings->audio.resampler); + driver_hash = msg_hash_calculate(settings->arrays.audio_resampler); switch (driver_hash) { diff --git a/location/location_driver.c b/location/location_driver.c index 1acad4862f..d1dd32d782 100644 --- a/location/location_driver.c +++ b/location/location_driver.c @@ -97,7 +97,7 @@ void find_location_driver(void) settings_t *settings = config_get_ptr(); drv.label = "location_driver"; - drv.s = settings->location.driver; + drv.s = settings->arrays.location_driver; driver_ctl(RARCH_DRIVER_CTL_FIND_INDEX, &drv); @@ -109,7 +109,7 @@ void find_location_driver(void) { unsigned d; RARCH_ERR("Couldn't find any location driver named \"%s\"\n", - settings->location.driver); + settings->arrays.location_driver); RARCH_LOG_OUTPUT("Available location drivers are:\n"); for (d = 0; location_driver_find_handle(d); d++) RARCH_LOG_OUTPUT("\t%s\n", location_driver_find_ident(d)); diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c index e22e9a1e48..62596047a4 100644 --- a/menu/cbs/menu_cbs_get_value.c +++ b/menu/cbs/menu_cbs_get_value.c @@ -1395,8 +1395,8 @@ static void menu_action_setting_disp_set_label_playlist_associations(file_list_t char playlist_name_with_ext[255]; bool found_matching_core_association = false; settings_t *settings = config_get_ptr(); - struct string_list *str_list = string_split(settings->playlist_names, ";"); - struct string_list *str_list2 = string_split(settings->playlist_cores, ";"); + struct string_list *str_list = string_split(settings->arrays.playlist_names, ";"); + struct string_list *str_list2 = string_split(settings->arrays.playlist_cores, ";"); strlcpy(s2, path, len2); diff --git a/menu/cbs/menu_cbs_left.c b/menu/cbs/menu_cbs_left.c index ace6cbd240..3f7210ad67 100644 --- a/menu/cbs/menu_cbs_left.c +++ b/menu/cbs/menu_cbs_left.c @@ -323,8 +323,8 @@ static int playlist_association_left(unsigned type, const char *label, core_path[0] = new_playlist_cores[0] = '\0'; - stnames = string_split(settings->playlist_names, ";"); - stcores = string_split(settings->playlist_cores, ";"); + stnames = string_split(settings->arrays.playlist_names, ";"); + stcores = string_split(settings->arrays.playlist_cores, ";"); if (!menu_content_playlist_find_associated_core(path, core_path, sizeof(core_path))) @@ -356,8 +356,8 @@ static int playlist_association_left(unsigned type, const char *label, string_list_join_concat(new_playlist_cores, sizeof(new_playlist_cores), stcores, ";"); - strlcpy(settings->playlist_cores, - new_playlist_cores, sizeof(settings->playlist_cores)); + strlcpy(settings->arrays.playlist_cores, + new_playlist_cores, sizeof(settings->arrays.playlist_cores)); string_list_free(stnames); string_list_free(stcores); diff --git a/menu/cbs/menu_cbs_right.c b/menu/cbs/menu_cbs_right.c index 1ddc17733e..1f2b05a302 100644 --- a/menu/cbs/menu_cbs_right.c +++ b/menu/cbs/menu_cbs_right.c @@ -322,8 +322,8 @@ static int playlist_association_right(unsigned type, const char *label, core_path[0] = new_playlist_cores[0] = '\0'; - stnames = string_split(settings->playlist_names, ";"); - stcores = string_split(settings->playlist_cores, ";"); + stnames = string_split(settings->arrays.playlist_names, ";"); + stcores = string_split(settings->arrays.playlist_cores, ";"); if (!menu_content_playlist_find_associated_core(path, core_path, sizeof(core_path))) strlcpy(core_path, @@ -351,9 +351,11 @@ static int playlist_association_right(unsigned type, const char *label, if (found && info) string_list_set(stcores, (unsigned)(found-1), info->path); - string_list_join_concat(new_playlist_cores, sizeof(new_playlist_cores), stcores, ";"); + string_list_join_concat(new_playlist_cores, + sizeof(new_playlist_cores), stcores, ";"); - strlcpy(settings->playlist_cores, new_playlist_cores, sizeof(settings->playlist_cores)); + strlcpy(settings->arrays.playlist_cores, + new_playlist_cores, sizeof(settings->arrays.playlist_cores)); string_list_free(stnames); string_list_free(stcores); diff --git a/menu/cbs/menu_cbs_start.c b/menu/cbs/menu_cbs_start.c index 468632a765..c636f09e8d 100644 --- a/menu/cbs/menu_cbs_start.c +++ b/menu/cbs/menu_cbs_start.c @@ -219,8 +219,8 @@ static int action_start_playlist_association(unsigned type, const char *label) new_playlist_cores[0] = '\0'; - stnames = string_split(settings->playlist_names, ";"); - stcores = string_split(settings->playlist_cores, ";"); + stnames = string_split(settings->arrays.playlist_names, ";"); + stcores = string_split(settings->arrays.playlist_cores, ";"); found = string_list_find_elem(stnames, path); if (found) @@ -230,8 +230,8 @@ static int action_start_playlist_association(unsigned type, const char *label) string_list_join_concat(new_playlist_cores, sizeof(new_playlist_cores), stcores, ";"); - strlcpy(settings->playlist_cores, - new_playlist_cores, sizeof(settings->playlist_cores)); + strlcpy(settings->arrays.playlist_cores, + new_playlist_cores, sizeof(settings->arrays.playlist_cores)); string_list_free(stcores); string_list_free(stnames); diff --git a/menu/menu_content.c b/menu/menu_content.c index 3de778c7d0..bcb3a195b9 100644 --- a/menu/menu_content.c +++ b/menu/menu_content.c @@ -93,9 +93,9 @@ bool menu_content_playlist_find_associated_core(const char *path, char *s, size_ bool ret = false; settings_t *settings = config_get_ptr(); struct string_list *existing_core_names = - string_split(settings->playlist_names, ";"); + string_split(settings->arrays.playlist_names, ";"); struct string_list *existing_core_paths = - string_split(settings->playlist_cores, ";"); + string_split(settings->arrays.playlist_cores, ";"); for (j = 0; j < existing_core_names->size; j++) { diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 82f078e575..86e650886a 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -250,7 +250,7 @@ static int menu_displaylist_parse_netplay( msg_hash_to_str(MENU_ENUM_LABEL_NETPLAY_LAN_SCAN_SETTINGS), MENU_ENUM_LABEL_NETPLAY_LAN_SCAN_SETTINGS, MENU_SETTING_GROUP, 0, 0); - if (memcmp(settings->menu.driver, "xmb", 3) != 0) + if (memcmp(settings->arrays.menu_driver, "xmb", 3) != 0) menu_entries_append_enum(info->list, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_TAB), msg_hash_to_str(MENU_ENUM_LABEL_NETPLAY_TAB), @@ -3604,8 +3604,8 @@ static void menu_displaylist_parse_playlist_associations( unsigned i; char new_playlist_names[PATH_MAX_LENGTH]; char new_playlist_cores[PATH_MAX_LENGTH]; - struct string_list *stnames = string_split(settings->playlist_names, ";"); - struct string_list *stcores = string_split(settings->playlist_cores, ";"); + struct string_list *stnames = string_split(settings->arrays.playlist_names, ";"); + struct string_list *stcores = string_split(settings->arrays.playlist_cores, ";"); new_playlist_names[0] = new_playlist_cores[0] = '\0'; @@ -3651,10 +3651,10 @@ static void menu_displaylist_parse_playlist_associations( string_list_join_concat(new_playlist_cores, sizeof(new_playlist_cores), stcores, ";"); - strlcpy(settings->playlist_names, - new_playlist_names, sizeof(settings->playlist_names)); - strlcpy(settings->playlist_cores, - new_playlist_cores, sizeof(settings->playlist_cores)); + strlcpy(settings->arrays.playlist_names, + new_playlist_names, sizeof(settings->arrays.playlist_names)); + strlcpy(settings->arrays.playlist_cores, + new_playlist_cores, sizeof(settings->arrays.playlist_cores)); string_list_free(stnames); string_list_free(stcores); @@ -4793,7 +4793,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) info->need_push = true; break; case DISPLAYLIST_WIFI_SETTINGS_LIST: - if (memcmp(settings->wifi.driver, "null", 4) == 0) + if (memcmp(settings->arrays.wifi_driver, "null", 4) == 0) menu_entries_append_enum(info->list, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_NETWORKS_FOUND), msg_hash_to_str(MENU_ENUM_LABEL_NO_NETWORKS_FOUND), @@ -5389,7 +5389,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) MENU_ENUM_LABEL_LOGGING_SETTINGS, PARSE_ACTION, false); ret = menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_FRAME_THROTTLE_SETTINGS, PARSE_ACTION, false); - if (memcmp(settings->record.driver, "null", 4) != 0) + if (memcmp(settings->arrays.record_driver, "null", 4) != 0) ret = menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_RECORDING_SETTINGS, PARSE_ACTION, false); ret = menu_displaylist_parse_settings_enum(menu, info, diff --git a/menu/menu_driver.c b/menu/menu_driver.c index 30906cb698..eafbc338e9 100644 --- a/menu/menu_driver.c +++ b/menu/menu_driver.c @@ -196,8 +196,8 @@ static bool menu_init(menu_handle_t *menu_data) } if ( settings->bools.bundle_assets_extract_enable - && !string_is_empty(settings->path.bundle_assets_src) - && !string_is_empty(settings->path.bundle_assets_dst) + && !string_is_empty(settings->arrays.bundle_assets_src) + && !string_is_empty(settings->arrays.bundle_assets_dst) #ifdef IOS && menu_dialog_is_push_pending() #else @@ -208,9 +208,9 @@ static bool menu_init(menu_handle_t *menu_data) { menu_dialog_push_pending(true, MENU_DIALOG_HELP_EXTRACT); #ifdef HAVE_COMPRESSION - task_push_decompress(settings->path.bundle_assets_src, - settings->path.bundle_assets_dst, - NULL, settings->path.bundle_assets_dst_subdir, + task_push_decompress(settings->arrays.bundle_assets_src, + settings->arrays.bundle_assets_dst, + NULL, settings->arrays.bundle_assets_dst_subdir, NULL, bundle_decompressed, NULL); #endif } @@ -502,7 +502,7 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data) settings_t *settings = config_get_ptr(); drv.label = "menu_driver"; - drv.s = settings->menu.driver; + drv.s = settings->arrays.menu_driver; driver_ctl(RARCH_DRIVER_CTL_FIND_INDEX, &drv); @@ -515,7 +515,7 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data) { unsigned d; RARCH_WARN("Couldn't find any menu driver named \"%s\"\n", - settings->menu.driver); + settings->arrays.menu_driver); RARCH_LOG_OUTPUT("Available menu drivers are:\n"); for (d = 0; menu_driver_find_handle(d); d++) RARCH_LOG_OUTPUT("\t%s\n", menu_driver_find_ident(d)); @@ -638,8 +638,8 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data) return false; } - strlcpy(settings->menu.driver, menu_driver_ctx->ident, - sizeof(settings->menu.driver)); + strlcpy(settings->arrays.menu_driver, menu_driver_ctx->ident, + sizeof(settings->arrays.menu_driver)); if (menu_driver_ctx->lists_init) { diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 71b73f58fa..9fe84f0c35 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -2232,7 +2232,7 @@ static bool setting_append_list( parent_group); } - if (memcmp(settings->menu.driver, "xmb", 3) != 0) + if (memcmp(settings->arrays.menu_driver, "xmb", 3) != 0) { CONFIG_ACTION( list, list_info, @@ -2553,7 +2553,7 @@ static bool setting_append_list( parent_group); settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED); - if (memcmp(settings->wifi.driver, "null", 4) != 0) + if (memcmp(settings->arrays.wifi_driver, "null", 4) != 0) { CONFIG_ACTION( list, list_info, @@ -2636,71 +2636,71 @@ static bool setting_append_list( START_SUB_GROUP(list, list_info, "State", &group_info, &subgroup_info, parent_group); - string_options_entries[0].target = settings->input.driver; - string_options_entries[0].len = sizeof(settings->input.driver); + string_options_entries[0].target = settings->arrays.input_driver; + string_options_entries[0].len = sizeof(settings->arrays.input_driver); string_options_entries[0].name_enum_idx = MENU_ENUM_LABEL_INPUT_DRIVER; string_options_entries[0].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_INPUT_DRIVER; string_options_entries[0].default_value = config_get_default_input(); string_options_entries[0].values = config_get_input_driver_options(); - string_options_entries[1].target = settings->input.joypad_driver; - string_options_entries[1].len = sizeof(settings->input.joypad_driver); + string_options_entries[1].target = settings->arrays.input_joypad_driver; + string_options_entries[1].len = sizeof(settings->arrays.input_joypad_driver); string_options_entries[1].name_enum_idx = MENU_ENUM_LABEL_JOYPAD_DRIVER; string_options_entries[1].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_JOYPAD_DRIVER; string_options_entries[1].default_value = config_get_default_joypad(); string_options_entries[1].values = config_get_joypad_driver_options(); - string_options_entries[2].target = settings->video.driver; - string_options_entries[2].len = sizeof(settings->video.driver); + string_options_entries[2].target = settings->arrays.video_driver; + string_options_entries[2].len = sizeof(settings->arrays.video_driver); string_options_entries[2].name_enum_idx = MENU_ENUM_LABEL_VIDEO_DRIVER; string_options_entries[2].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_VIDEO_DRIVER; string_options_entries[2].default_value = config_get_default_video(); string_options_entries[2].values = config_get_video_driver_options(); - string_options_entries[3].target = settings->audio.driver; - string_options_entries[3].len = sizeof(settings->audio.driver); + string_options_entries[3].target = settings->arrays.audio_driver; + string_options_entries[3].len = sizeof(settings->arrays.audio_driver); string_options_entries[3].name_enum_idx = MENU_ENUM_LABEL_AUDIO_DRIVER; string_options_entries[3].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_AUDIO_DRIVER; string_options_entries[3].default_value = config_get_default_audio(); string_options_entries[3].values = config_get_audio_driver_options(); - string_options_entries[4].target = settings->audio.resampler; - string_options_entries[4].len = sizeof(settings->audio.resampler); + string_options_entries[4].target = settings->arrays.audio_resampler; + string_options_entries[4].len = sizeof(settings->arrays.audio_resampler); string_options_entries[4].name_enum_idx = MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER; string_options_entries[4].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_AUDIO_RESAMPLER_DRIVER; string_options_entries[4].default_value = config_get_default_audio_resampler(); string_options_entries[4].values = config_get_audio_resampler_driver_options(); - string_options_entries[5].target = settings->camera.driver; - string_options_entries[5].len = sizeof(settings->camera.driver); + string_options_entries[5].target = settings->arrays.camera_driver; + string_options_entries[5].len = sizeof(settings->arrays.camera_driver); string_options_entries[5].name_enum_idx = MENU_ENUM_LABEL_CAMERA_DRIVER; string_options_entries[5].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_CAMERA_DRIVER; string_options_entries[5].default_value = config_get_default_camera(); string_options_entries[5].values = config_get_camera_driver_options(); - string_options_entries[6].target = settings->wifi.driver; - string_options_entries[6].len = sizeof(settings->wifi.driver); + string_options_entries[6].target = settings->arrays.wifi_driver; + string_options_entries[6].len = sizeof(settings->arrays.wifi_driver); string_options_entries[6].name_enum_idx = MENU_ENUM_LABEL_WIFI_DRIVER; string_options_entries[6].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_WIFI_DRIVER; string_options_entries[6].default_value = config_get_default_wifi(); string_options_entries[6].values = config_get_wifi_driver_options(); - string_options_entries[7].target = settings->location.driver; - string_options_entries[7].len = sizeof(settings->location.driver); + string_options_entries[7].target = settings->arrays.location_driver; + string_options_entries[7].len = sizeof(settings->arrays.location_driver); string_options_entries[7].name_enum_idx = MENU_ENUM_LABEL_LOCATION_DRIVER; string_options_entries[7].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_LOCATION_DRIVER; string_options_entries[7].default_value = config_get_default_location(); string_options_entries[7].values = config_get_location_driver_options(); - string_options_entries[8].target = settings->menu.driver; - string_options_entries[8].len = sizeof(settings->menu.driver); + string_options_entries[8].target = settings->arrays.menu_driver; + string_options_entries[8].len = sizeof(settings->arrays.menu_driver); string_options_entries[8].name_enum_idx = MENU_ENUM_LABEL_MENU_DRIVER; string_options_entries[8].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_MENU_DRIVER; string_options_entries[8].default_value = config_get_default_menu(); string_options_entries[8].values = config_get_menu_driver_options(); - string_options_entries[9].target = settings->record.driver; - string_options_entries[9].len = sizeof(settings->record.driver); + string_options_entries[9].target = settings->arrays.record_driver; + string_options_entries[9].len = sizeof(settings->arrays.record_driver); string_options_entries[9].name_enum_idx = MENU_ENUM_LABEL_RECORD_DRIVER; string_options_entries[9].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_RECORD_DRIVER; string_options_entries[9].default_value = config_get_default_record(); @@ -3221,7 +3221,7 @@ static bool setting_append_list( &setting_get_string_representation_st_float_video_refresh_rate_auto; settings_data_list_current_add_flags(list, list_info, SD_FLAG_LAKKA_ADVANCED); - if (memcmp(settings->video.driver, "gl", 2) == 0) + if (memcmp(settings->arrays.video_driver, "gl", 2) == 0) { CONFIG_BOOL( list, list_info, @@ -3556,7 +3556,7 @@ static bool setting_append_list( settings_data_list_current_add_flags(list, list_info, SD_FLAG_CMD_APPLY_AUTO); settings_data_list_current_add_flags(list, list_info, SD_FLAG_LAKKA_ADVANCED); - if (memcmp(settings->video.driver, "gl", 2) == 0) + if (memcmp(settings->arrays.video_driver, "gl", 2) == 0) { CONFIG_BOOL( list, list_info, @@ -3875,8 +3875,8 @@ static bool setting_append_list( #if !defined(RARCH_CONSOLE) CONFIG_STRING( list, list_info, - settings->audio.device, - sizeof(settings->audio.device), + settings->arrays.audio_device, + sizeof(settings->arrays.audio_device), MENU_ENUM_LABEL_AUDIO_DEVICE, MENU_ENUM_LABEL_VALUE_AUDIO_DEVICE, "", @@ -4690,7 +4690,7 @@ static bool setting_append_list( START_SUB_GROUP(list, list_info, "State", &group_info, &subgroup_info, parent_group); - if (memcmp(settings->menu.driver, "rgui", 4) != 0) + if (memcmp(settings->arrays.menu_driver, "rgui", 4) != 0) { CONFIG_PATH( list, list_info, @@ -4722,7 +4722,7 @@ static bool setting_append_list( settings_data_list_current_add_flags(list, list_info, SD_FLAG_LAKKA_ADVANCED); } - if (memcmp(settings->menu.driver, "xmb", 3) == 0) + if (memcmp(settings->arrays.menu_driver, "xmb", 3) == 0) { CONFIG_BOOL( list, list_info, @@ -4922,7 +4922,7 @@ static bool setting_append_list( START_SUB_GROUP(list, list_info, "Display", &group_info, &subgroup_info, parent_group); /* only GLUI uses these values, don't show them on other drivers */ - if (memcmp(settings->menu.driver, "glui", 4) == 0) + if (memcmp(settings->arrays.menu_driver, "glui", 4) == 0) { CONFIG_BOOL( list, list_info, @@ -4955,7 +4955,7 @@ static bool setting_append_list( #ifdef HAVE_XMB /* only XMB uses these values, don't show them on other drivers */ - if (memcmp(settings->menu.driver, "xmb", 3) == 0) + if (memcmp(settings->arrays.menu_driver, "xmb", 3) == 0) { CONFIG_UINT( list, list_info, @@ -5176,7 +5176,7 @@ static bool setting_append_list( #ifdef HAVE_MATERIALUI /* only MaterialUI uses these values, don't show them on other drivers */ - if (memcmp(settings->menu.driver, "glui", 4) == 0) + if (memcmp(settings->arrays.menu_driver, "glui", 4) == 0) { CONFIG_UINT( list, list_info, @@ -5236,7 +5236,7 @@ static bool setting_append_list( general_read_handler, SD_FLAG_ADVANCED); - if (memcmp(settings->menu.driver, "xmb", 3) == 0) + if (memcmp(settings->arrays.menu_driver, "xmb", 3) == 0) { CONFIG_UINT( list, list_info, @@ -5336,7 +5336,7 @@ static bool setting_append_list( START_SUB_GROUP(list, list_info, "State", &group_info, &subgroup_info, parent_group); - if (memcmp(settings->record.driver, "null", 4) != 0) + if (memcmp(settings->arrays.record_driver, "null", 4) != 0) { CONFIG_BOOL( list, list_info, @@ -6175,8 +6175,8 @@ static bool setting_append_list( #ifdef HAVE_CHEEVOS CONFIG_STRING( list, list_info, - settings->cheevos.username, - sizeof(settings->cheevos.username), + settings->arrays.cheevos_username, + sizeof(settings->arrays.cheevos_username), MENU_ENUM_LABEL_CHEEVOS_USERNAME, MENU_ENUM_LABEL_VALUE_ACCOUNTS_CHEEVOS_USERNAME, "", @@ -6189,8 +6189,8 @@ static bool setting_append_list( CONFIG_STRING( list, list_info, - settings->cheevos.password, - sizeof(settings->cheevos.password), + settings->arrays.cheevos_password, + sizeof(settings->arrays.cheevos_password), MENU_ENUM_LABEL_CHEEVOS_PASSWORD, MENU_ENUM_LABEL_VALUE_ACCOUNTS_CHEEVOS_PASSWORD, "", @@ -6432,7 +6432,7 @@ static bool setting_append_list( general_write_handler, general_read_handler); - if (memcmp(settings->record.driver, "null", 4) != 0) + if (memcmp(settings->arrays.record_driver, "null", 4) != 0) { CONFIG_DIR( list, list_info, @@ -6588,7 +6588,7 @@ static bool setting_append_list( START_SUB_GROUP(list, list_info, "State", &group_info, &subgroup_info, parent_group); - if (memcmp(settings->camera.driver, "null", 4) != 0) + if (memcmp(settings->arrays.camera_driver, "null", 4) != 0) { CONFIG_BOOL( list, list_info, @@ -6606,7 +6606,7 @@ static bool setting_append_list( SD_FLAG_NONE); } - if (memcmp(settings->location.driver, "null", 4) != 0) + if (memcmp(settings->arrays.location_driver, "null", 4) != 0) { CONFIG_BOOL( list, list_info, diff --git a/record/drivers/record_ffmpeg.c b/record/drivers/record_ffmpeg.c index 778466dde4..b74875f293 100644 --- a/record/drivers/record_ffmpeg.c +++ b/record/drivers/record_ffmpeg.c @@ -336,7 +336,7 @@ static bool ffmpeg_init_audio(ffmpeg_t *handle) retro_resampler_realloc(&audio->resampler_data, &audio->resampler, - settings->audio.resampler, + settings->arrays.audio_resampler, audio->ratio); } else diff --git a/record/record_driver.c b/record/record_driver.c index 59d4db5d87..232d44c918 100644 --- a/record/record_driver.c +++ b/record/record_driver.c @@ -103,7 +103,7 @@ void find_record_driver(void) settings_t *settings = config_get_ptr(); drv.label = "record_driver"; - drv.s = settings->record.driver; + drv.s = settings->arrays.record_driver; driver_ctl(RARCH_DRIVER_CTL_FIND_INDEX, &drv); @@ -116,7 +116,7 @@ void find_record_driver(void) unsigned d; RARCH_ERR("Couldn't find any record driver named \"%s\"\n", - settings->audio.driver); + settings->arrays.record_driver); RARCH_LOG_OUTPUT("Available record drivers are:\n"); for (d = 0; record_driver_find_handle(d); d++) RARCH_LOG_OUTPUT("\t%s\n", record_driver_find_ident(d)); diff --git a/wifi/wifi_driver.c b/wifi/wifi_driver.c index 466bc8c3f7..7f60d0ac8e 100644 --- a/wifi/wifi_driver.c +++ b/wifi/wifi_driver.c @@ -145,7 +145,7 @@ bool wifi_driver_ctl(enum rarch_wifi_ctl_state state, void *data) driver_ctx_info_t drv; drv.label = "wifi_driver"; - drv.s = settings->wifi.driver; + drv.s = settings->arrays.wifi_driver; driver_ctl(RARCH_DRIVER_CTL_FIND_INDEX, &drv); @@ -157,7 +157,7 @@ bool wifi_driver_ctl(enum rarch_wifi_ctl_state state, void *data) { unsigned d; RARCH_ERR("Couldn't find any wifi driver named \"%s\"\n", - settings->wifi.driver); + settings->arrays.wifi_driver); RARCH_LOG_OUTPUT("Available wifi drivers are:\n"); for (d = 0; wifi_driver_find_handle(d); d++) RARCH_LOG_OUTPUT("\t%s\n", wifi_driver_find_ident(d));