Add buildbot URL setting

This commit is contained in:
twinaphex 2015-01-19 04:09:28 +01:00
parent 3a83c77c33
commit 384e27a0b1
5 changed files with 33 additions and 7 deletions

View File

@ -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];

View File

@ -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 */

View File

@ -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

View File

@ -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);

View File

@ -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",