updating stream urls

diff --git a/2015/assets/js/stream.js b/2015/assets/js/stream.js
index 14e1e1ca6ca481ef7b8d487993e37b603b350616..b2b611ad09a81b03506e922d668f3e48366c1ddc 100644 (file)
--- a/2015/assets/js/stream.js
+++ b/2015/assets/js/stream.js
@@ -46,9 +46,9 @@ if (!Array.prototype.find) {
 
 var app = {};
 
-app.icecastUrl = "//live.fsf.org";
+app.icecastUrl = "//live2.fsf.org";
 
-app.icecastApiUrl = "//live.fsf.org";
+app.icecastApiUrl = "//live2.fsf.org";
 
 app.scheduleEvery = function(duration, thunk) {
   thunk();
@@ -130,18 +130,18 @@ app.withVideo = function(id, callback) {
 app.streams = [
   {
     name: "Room 123",
-    speakerMount: "/room123.ogv",
-    desktopMount: "/room123-desktop.ogv",
+    speakerMount: "/stream-123.webm",
+    desktopMount: "/slides-123.webm",
     ircChannel: "#libreplanet_room123"
   }, {
     name: "Room 141",
-    speakerMount: "/room141.ogv",
-    desktopMount: "/room141-desktop.ogv",
+    speakerMount: "/stream-141.ogv",
+    desktopMount: "/slides-141.ogv",
     ircChannel: "#libreplanet_room141"
   }, {
     name: "Room 155",
-    speakerMount: "/room155.ogv",
-    desktopMount: "/room155-desktop.ogv",
+    speakerMount: "/stream-155.ogv",
+    desktopMount: "/slides-155.ogv",
     ircChannel: "#libreplanet_room155"
   }
 ];

diff --git a/2016/assets/js/stream.js b/2016/assets/js/stream.js
index 14e1e1ca6ca481ef7b8d487993e37b603b350616..28d3edc6ce8bd5c930dcfed4cfcbcb4b0b6727c8 100644 (file)
--- a/2016/assets/js/stream.js
+++ b/2016/assets/js/stream.js
@@ -46,9 +46,9 @@ if (!Array.prototype.find) {
 
 var app = {};
 
-app.icecastUrl = "//live.fsf.org";
+app.icecastUrl = "//live2.fsf.org";
 
-app.icecastApiUrl = "//live.fsf.org";
+app.icecastApiUrl = "//live2.fsf.org";
 
 app.scheduleEvery = function(duration, thunk) {
   thunk();
@@ -130,18 +130,18 @@ app.withVideo = function(id, callback) {
 app.streams = [
   {
     name: "Room 123",
-    speakerMount: "/room123.ogv",
-    desktopMount: "/room123-desktop.ogv",
+    speakerMount: "/stream-123.webm",
+    desktopMount: "/slides-123.webm",
     ircChannel: "#libreplanet_room123"
   }, {
     name: "Room 141",
-    speakerMount: "/room141.ogv",
-    desktopMount: "/room141-desktop.ogv",
+    speakerMount: "/stream-141.webm",
+    desktopMount: "/slides-141.webm",
     ircChannel: "#libreplanet_room141"
   }, {
     name: "Room 155",
-    speakerMount: "/room155.ogv",
-    desktopMount: "/room155-desktop.ogv",
+    speakerMount: "/stream-155.webm",
+    desktopMount: "/slides-155.webm",
     ircChannel: "#libreplanet_room155"
   }
 ];