Fix names

diff --git a/2020/assets/js/stream.js b/2020/assets/js/stream.js
index 606b80b56aed2a1d88e2bc8726e57d7bde2ce408..dfe12f8dd0759574572ff380e8c31ef3a6df099a 100644 (file)
--- a/2020/assets/js/stream.js
+++ b/2020/assets/js/stream.js
@@ -129,23 +129,23 @@ app.withVideo = function(id, callback) {
 
 app.streams = [
   {
-    name: "Room 123",
-    speakerMount: "/stream-123.webm",
-    desktopMount: "/slides-123.webm",
-    speakerSmallMount: "/stream-123-480p.webm",
-    ircChannel: "#libreplanet_room123"
+    name: "Back Bay Grand Room",
+    speakerMount: "/stream-room-grand.webm",
+    desktopMount: "/slides-room-grand.webm",
+    speakerSmallMount: "/stream-room-grand-480p.webm",
+    ircChannel: "#libreplanet_room_grand"
   }, {
-    name: "Room 144",
-    speakerMount: "/stream-144.webm",
-    desktopMount: "/slides-144.webm",
-    speakerSmallMount: "/stream-144-480p.webm",
-    ircChannel: "#libreplanet_room144"
+    name: "Freedom Room",
+    speakerMount: "/stream-room-freedom.webm",
+    desktopMount: "/slides-room-freedom.webm",
+    speakerSmallMount: "/stream-room-freedom-480p.webm",
+    ircChannel: "#libreplanet_room_freedom"
   }, {
-    name: "Room 155",
-    speakerMount: "/stream-155.webm",
-    desktopMount: "/slides-155.webm",
-    speakerSmallMount: "/stream-155-480p.webm",
-    ircChannel: "#libreplanet_room155"
+    name: "Patriot Room",
+    speakerMount: "/stream-room-patriot.webm",
+    desktopMount: "/slides-room-patriot.webm",
+    speakerSmallMount: "/stream-room-patriot-480p.webm",
+    ircChannel: "#libreplanet_room_patriot"
   }
 ];
 

diff --git a/2020/live/index.html b/2020/live/index.html
index 8edf16fc08c84f026d6bf3928a448055b55bb0e9..9afb3f879be3516c49bf2ce35f2e7f8babf252de 100755 (executable)
--- a/2020/live/index.html
+++ b/2020/live/index.html
@@ -24,7 +24,6 @@
 
     <!-- The Conference is not running at this time -->
 
-<!--
     <noscript>
       <p>
         Our conference streaming web interface requires JavaScript, but
@@ -50,7 +49,6 @@ ffplay https://live.fsf.org/stream-room-patriot.webm
 </pre>
       </p>
     </noscript>
--->
 
     <div id="stream"></div>