From da3e1d974ee0bf9f27cb9f9611d0c94908bfcdf5 Mon Sep 17 00:00:00 2001
From: jp9000 <obs.jim@gmail.com>
Date: Sat, 5 Aug 2017 21:28:07 -0700
Subject: [PATCH] rtmp-services: Update Switchboard ingests

---
 plugins/rtmp-services/data/package.json  |  4 +-
 plugins/rtmp-services/data/services.json | 78 ++++++++++--------------
 2 files changed, 35 insertions(+), 47 deletions(-)

diff --git a/plugins/rtmp-services/data/package.json b/plugins/rtmp-services/data/package.json
index f012bd8ec..32c946483 100644
--- a/plugins/rtmp-services/data/package.json
+++ b/plugins/rtmp-services/data/package.json
@@ -1,10 +1,10 @@
 {
 	"url": "https://obsproject.com/obs2_update/rtmp-services",
-	"version": 67,
+	"version": 68,
 	"files": [
 		{
 			"name": "services.json",
-			"version": 67
+			"version": 68
 		}
 	]
 }
diff --git a/plugins/rtmp-services/data/services.json b/plugins/rtmp-services/data/services.json
index 8b42ab658..861c46dd5 100644
--- a/plugins/rtmp-services/data/services.json
+++ b/plugins/rtmp-services/data/services.json
@@ -492,51 +492,6 @@
                 "max audio bitrate": 160
             }
         },
-        {
-            "name": "Switchboard Live (Joicaster)",
-            "servers": [
-                {
-                    "name": "Default - Performance Global",
-                    "url": "rtmp://ingest-global-a.switchboard.zone/live"
-                },
-                {
-                    "name": "U.S. - Dallas, TX",
-                    "url": "rtmp://ingest-us-dal.switchboard.zone/live"
-                },
-                {
-                    "name": "U.S. - Seattle, WA",
-                    "url": "rtmp://ingest-us-sea.switchboard.zone/live"
-                },
-                {
-                    "name": "U.S. - Washington, DC",
-                    "url": "rtmp://ingest-us-wdc.switchboard.zone/live"
-                },
-                {
-                    "name": "C.A. - Toronto, Canada",
-                    "url": "rtmp://ingest-cn-tor.switchboard.zone/live"
-                },
-                {
-                    "name": "E.U. - London, England",
-                    "url": "rtmp://ingest-eu-lon.switchboard.zone/live"
-                },
-                {
-                    "name": "E.U. - Amsterdam, Netherlands",
-                    "url": "rtmp://ingest-as-tok.switchboard.zone/live"
-                },
-                {
-                    "name": "A.S. - Tokyo, Japan",
-                    "url": "rtmp://ingest-as-tok.switchboard.zone/live"
-                },
-                {
-                    "name": "A.U. - Melbourne, Australia",
-                    "url": "rtmp://ingest-au-mel.switchboard.zone/live"
-                },
-                {
-                    "name": "S.A - São Paulo, Brazil",
-                    "url": "rtmp://ingest-sa-sao.switchboard.zone/live"
-                }
-            ]
-        },
         {
             "name": "GoodGame.ru",
             "servers": [
@@ -1044,6 +999,39 @@
                 "max video bitrate": 800,
                 "max audio bitrate": 96
             }
+        },
+        {
+            "name": "Switchboard Live (Joicaster)",
+            "servers": [
+                {
+                    "name": "Default - Performance Global",
+                    "url": "rtmp://ingest-global-a.switchboard.zone/live"
+                },
+                {
+                    "name": "US West",
+                    "url": "rtmp://ingest-us-west.a.switchboard.zone/live"
+                },
+                {
+                    "name": "US East",
+                    "url": "rtmp://ingest-us-east.a.switchboard.zone/live"
+                },
+                {
+                    "name": "Europe West",
+                    "url": "rtmp://ingest-eu-west.a.switchboard.zone/live"
+                },
+                {
+                    "name": "Europe Central",
+                    "url": "rtmp://ingest-us-east.a.switchboard.zone/live"
+                },
+                {
+                    "name": "Australia East",
+                    "url": "rtmp://ingest-au-east.a.switchboard.zone/live"
+                },
+                {
+                    "name": "Asia Central",
+                    "url": "rtmp://ingest-as-central.a.switchboard.zone/live"
+                }
+            ]
         }
     ]
 }
-- 
GitLab