From 384e27a0b1a66b9e567c01fd9a4f80bbad3e7861 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 19 Jan 2015 04:09:28 +0100 Subject: [PATCH] Add buildbot URL setting --- general.h | 5 +++++ http_lib.h | 8 ++------ retroarch.cfg | 5 ++++- settings.c | 5 +++++ settings_data.c | 17 +++++++++++++++++ 5 files changed, 33 insertions(+), 7 deletions(-) diff --git a/general.h b/general.h index f98db47f0a..d9fddab20e 100644 --- a/general.h +++ b/general.h @@ -307,6 +307,11 @@ struct settings unsigned mode; } archive; + struct + { + char buildbot_url[PATH_MAX_LENGTH]; + } network; + int state_slot; char core_options_path[PATH_MAX_LENGTH]; diff --git a/http_lib.h b/http_lib.h index 1221571be4..b5c923cc2c 100644 --- a/http_lib.h +++ b/http_lib.h @@ -12,8 +12,6 @@ #ifndef _HTTP_LIB_H #define _HTTP_LIB_H - /* declarations */ - extern char *http_server; extern int http_port; @@ -22,10 +20,8 @@ extern char *http_proxy_server; extern int http_proxy_port; - -/* return type */ -typedef enum { - +typedef enum +{ /* Client side errors */ ERRHOST=-1, /* No such host */ ERRSOCK=-2, /* Can't create socket */ diff --git a/retroarch.cfg b/retroarch.cfg index 34ed15d074..a5f5ee566f 100644 --- a/retroarch.cfg +++ b/retroarch.cfg @@ -604,7 +604,10 @@ # Override the default privacy permission for cores that want to access location services. Is "false" by default. # location_allow = false -#### Netplay +#### Network + +# URL to core management upgrade buildbot. +# core_management_buildbot_url = "http://buildbot.libretro.com" # When being client over netplay, use keybinds for user 1. # netplay_client_swap_input = false diff --git a/settings.c b/settings.c index b59038299b..2eba29ae2e 100644 --- a/settings.c +++ b/settings.c @@ -567,6 +567,8 @@ static void config_set_defaults(void) g_settings.input.turbo_period = turbo_period; g_settings.input.turbo_duty_cycle = turbo_duty_cycle; + *g_settings.network.buildbot_url = '\0'; + g_settings.input.overlay_enable = true; g_settings.input.overlay_opacity = 0.7f; g_settings.input.overlay_scale = 1.0f; @@ -1221,6 +1223,8 @@ static bool config_load_file(const char *path, bool set_defaults) CONFIG_GET_BOOL(input.autoconfig_descriptor_label_show, "autoconfig_descriptor_label_show"); + CONFIG_GET_PATH(network.buildbot_url, "core_management_buildbot_url"); + for (i = 0; i < MAX_USERS; i++) { char buf[64]; @@ -1848,6 +1852,7 @@ bool config_save_file(const char *path) config_set_string(conf, "audio_device", g_settings.audio.device); config_set_string(conf, "video_filter", g_settings.video.softfilter_plugin); config_set_string(conf, "audio_dsp_plugin", g_settings.audio.dsp_plugin); + config_set_string(conf, "core_management_buildbot_url", g_settings.network.buildbot_url); config_set_string(conf, "camera_device", g_settings.camera.device); config_set_bool(conf, "camera_allow", g_settings.camera.allow); config_set_bool(conf, "audio_rate_control", g_settings.audio.rate_control); diff --git a/settings_data.c b/settings_data.c index d7f7af4712..6c77cd1b76 100644 --- a/settings_data.c +++ b/settings_data.c @@ -5442,6 +5442,22 @@ static bool setting_data_append_list_netplay_options( rarch_setting_group_info_t subgroup_info; START_GROUP(group_info, "Network Options"); + + START_SUB_GROUP(list, list_info, "Buildbot", group_info.name, subgroup_info); + + CONFIG_STRING( + g_settings.network.buildbot_url, + "core_management_buildbot_url", + "Core Management Buildbot URL", + "", + group_info.name, + subgroup_info.name, + general_write_handler, + general_read_handler); + settings_data_list_current_add_flags(list, list_info, SD_FLAG_ALLOW_INPUT); + + END_SUB_GROUP(list, list_info); + START_SUB_GROUP(list, list_info, "Netplay", group_info.name, subgroup_info); CONFIG_BOOL( @@ -5456,6 +5472,7 @@ static bool setting_data_append_list_netplay_options( general_write_handler, general_read_handler); + CONFIG_STRING( g_extern.netplay_server, "netplay_ip_address",