lagertonne/yolobs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

New upstream version 22.0.3+dfsg1

Browse source
This commit is contained in:
Sebastian Ramacher 2018-12-16 17:14:58 +01:00
parent 665f64a933
commit cdc9a9fc87
334 changed files with 14525 additions and 2639 deletions
Download patch file Download diff file Expand all files Collapse all files

37
plugins/rtmp-services/rtmp-common.c
View file

@ -26,6 +26,39 @@ static inline const char *get_string_val(json_t *service, const char *key);
extern void twitch_ingests_refresh(int seconds);
static void ensure_valid_url(struct rtmp_common *service, json_t *json,
obs_data_t *settings)
{
json_t *servers = json_object_get(json, "servers");
const char *top_url = NULL;
json_t *server;
size_t index;
if (!service->server || !servers || !json_is_array(servers))
return;
if (astrstri(service->service, "Facebook") == NULL)
return;
json_array_foreach (servers, index, server) {
const char *url = get_string_val(server, "url");
if (!url)
continue;
if (!top_url)
top_url = url;
if (astrcmpi(service->server, url) == 0)
return;
}
/* server was not found in server list, use first server instead */
if (top_url) {
bfree(service->server);
service->server = bstrdup(top_url);
obs_data_set_string(settings, "server", top_url);
}
}
static void rtmp_common_update(void *data, obs_data_t *settings)
{
struct rtmp_common *service = data;
@ -50,6 +83,8 @@ static void rtmp_common_update(void *data, obs_data_t *settings)
if (out)
service->output = bstrdup(out);
}
ensure_valid_url(service, serv, settings);
}
}
json_decref(root);
@ -295,7 +330,7 @@ static void fill_servers(obs_property_t *servers_prop, json_t *service,
obs_property_list_add_string(servers_prop,
obs_module_text("Server.Auto"), "auto");
}
if (name && strcmp(name, "Twitch") == 0) {
if (strcmp(name, "Twitch") == 0) {
if (fill_twitch_servers(servers_prop))
return;
}