From 4581a8164a8eda824f297f1f585c36ca4afd7ccf Mon Sep 17 00:00:00 2001
From: Quinn Damerell <qdamere@microsoft.com>
Date: Mon, 31 Jul 2017 18:33:02 -0700
Subject: [PATCH] UI: Update Mixer (formerly Beam) in auto configuration

Closes jp9000/obs-studio#980
---
 UI/window-basic-auto-config-test.cpp |  5 +++--
 UI/window-basic-auto-config.cpp      | 16 +---------------
 UI/window-basic-auto-config.hpp      |  1 -
 3 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/UI/window-basic-auto-config-test.cpp b/UI/window-basic-auto-config-test.cpp
index f2b0996e2..1bac94c59 100644
--- a/UI/window-basic-auto-config-test.cpp
+++ b/UI/window-basic-auto-config-test.cpp
@@ -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);
 
 	/* -----------------------------------*/
diff --git a/UI/window-basic-auto-config.cpp b/UI/window-basic-auto-config.cpp
index 84113507a..f3d1c4139 100644
--- a/UI/window-basic-auto-config.cpp
+++ b/UI/window-basic-auto-config.cpp
@@ -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;
 	}
diff --git a/UI/window-basic-auto-config.hpp b/UI/window-basic-auto-config.hpp
index 1fbc69259..214305656 100644
--- a/UI/window-basic-auto-config.hpp
+++ b/UI/window-basic-auto-config.hpp
@@ -34,7 +34,6 @@ class AutoConfig : public QWizard {
 	enum class Service {
 		Twitch,
 		Hitbox,
-		Beam,
 		Other
 	};