opensource/obs-studio
3
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-19 09:41:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

UI: Update Mixer (formerly Beam) in auto configuration

Browse Source 
Closes jp9000/obs-studio#980
This commit is contained in:
Quinn Damerell
2017-08-01 02:27:34 -07:00
committed by jp9000
parent 535f4a7fcf
commit 4581a8164a
3 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/window-basic-auto-config-test.cpp
+3 -2
View File
@@ -245,8 +245,9 @@ void AutoConfigTestPage::TestBandwidthThread()
else
GetServers(servers);
/* just use the first server if it only has one alternate server */
if (servers.size() < 3)
/* 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")
servers.resize(1);
/* -----------------------------------*/
UI/window-basic-auto-config.cpp
+1 -15
View File
@@ -326,8 +326,6 @@ bool AutoConfigStreamPage::validatePage()
wiz->service = AutoConfig::Service::Twitch;
else if (wiz->serviceName == "hitbox.tv")
wiz->service = AutoConfig::Service::Hitbox;
else if (wiz->serviceName == "beam.pro")
wiz->service = AutoConfig::Service::Beam;
else
wiz->service = AutoConfig::Service::Other;
} else {
@@ -368,8 +366,7 @@ void AutoConfigStreamPage::ServiceChanged()
std::string service = QT_TO_UTF8(ui->service->currentText());
bool regionBased = service == "Twitch" ||
service == "hitbox.tv" ||
service == "beam.pro";
service == "hitbox.tv";
bool testBandwidth = ui->doBandwidthTest->isChecked();
bool custom = ui->streamType->currentIndex() == 1;
@@ -689,17 +686,6 @@ bool AutoConfig::CanTestServer(const char *server)
} else if (regionOther) {
return true;
}
} else if (service == Service::Beam) {
if (astrcmp_n(server, "US:", 3) == 0) {
return regionUS;
} else if (astrcmp_n(server, "EU:", 3) == 0) {
return regionEU;
} else if (astrcmp_n(server, "South Korea:", 12) == 0 ||
astrcmp_n(server, "Asia:", 5) == 0) {
return regionAsia;
} else if (regionOther) {
return true;
}
} else {
return true;
}
UI/window-basic-auto-config.hpp
-1
View File
@@ -34,7 +34,6 @@ class AutoConfig : public QWizard {
enum class Service {
Twitch,
Hitbox,
Beam,
Other
};