jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1615 from restreamio/restream_auto_config

Browse Source 
UI: Add support for Restream "Auto" server in auto-config
This commit is contained in:
Colin Edwards 2019-02-01 18:12:19 -06:00 committed by GitHub
commit b5e656828f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
UI/window-basic-auto-config-test.cpp
View File

@ -219,6 +219,10 @@ void AutoConfigTestPage::TestBandwidthThread()
string_depad_key(key);
key += "?bandwidthtest";
}
else if(wiz->serviceName == "Restream.io" || wiz->serviceName == "Restream.io - RTMP") {
string_depad_key(key);
key += "?test=true";
}
obs_data_set_string(service_settings, "service",
wiz->serviceName.c_str());
@ -246,8 +250,9 @@ void AutoConfigTestPage::TestBandwidthThread()
GetServers(servers);
/* just use the first server if it only has one alternate server,
* or if using Mixer due to its "auto" server */
if (servers.size() < 3 || wiz->serviceName == "Mixer.com - FTL") {
* or if using Mixer or Restream due to their "auto" servers */
if (servers.size() < 3 || wiz->serviceName == "Mixer.com - FTL" ||
wiz->serviceName.substr(0, 11)=="Restream.io") {
servers.resize(1);
} else if (wiz->service == AutoConfig::Service::Twitch &&