4aiman/obs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "UI: Add support for Twitch "Auto" server in auto-config"

Browse source 
This reverts commit 2604db6e40.

The API to get the closest server can be down occasionally, so instead
just revert to its previous behavior.
This commit is contained in:
jp9000 2017-08-02 13:36:33 -07:00
commit 72d20de8e7
2 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
UI/window-basic-auto-config.cpp
View file

@ -365,7 +365,8 @@ void AutoConfigStreamPage::ServiceChanged()
return;
std::string service = QT_TO_UTF8(ui->service->currentText());
bool regionBased = service == "hitbox.tv";
bool regionBased = service == "Twitch" ||
service == "hitbox.tv";
bool testBandwidth = ui->doBandwidthTest->isChecked();
bool custom = ui->streamType->currentIndex() == 1;
@ -658,7 +659,19 @@ bool AutoConfig::CanTestServer(const char *server)
if (!testRegions || (regionUS && regionEU && regionAsia && regionOther))
return true;
if (service == Service::Hitbox) {
if (service == Service::Twitch) {
if (astrcmp_n(server, "US West:", 8) == 0 ||
astrcmp_n(server, "US East:", 8) == 0 ||
astrcmp_n(server, "US Central:", 11) == 0) {
return regionUS;
} else if (astrcmp_n(server, "EU:", 3) == 0) {
return regionEU;
} else if (astrcmp_n(server, "Asia:", 5) == 0) {
return regionAsia;
} else if (regionOther) {
return true;
}
} else if (service == Service::Hitbox) {
if (strcmp(server, "Default") == 0) {
return true;
} else if (astrcmp_n(server, "US-West:", 8) == 0 ||