fixing stream urls

diff --git a/2016/assets/js/stream.js b/2016/assets/js/stream.js
index 0a6facc1da2dff7e3d2eae16bbe3648be01b20f8..78474c13be2580dd7a32d21fd20098c76e7f55bb 100644 (file)
--- a/2016/assets/js/stream.js
+++ b/2016/assets/js/stream.js
@@ -130,7 +130,7 @@ app.withVideo = function(id, callback) {
 app.streams = [
   {
     name: "Room 123",
-    speakerMount: "/stream-123.webm",
+    speakerMount: "/room123_stream.webm",
     desktopMount: "/slides-123.webm",
     ircChannel: "#libreplanet_room123"
   }, {
@@ -140,7 +140,7 @@ app.streams = [
     ircChannel: "#libreplanet_room141"
   }, {
     name: "Room 155",
-    speakerMount: "/stream-155.webm",
+    speakerMount: "/room155_stream.webm",
     desktopMount: "/slides-155.webm",
     ircChannel: "#libreplanet_room155"
   }

diff --git a/2016/live/index.html b/2016/live/index.html
index c58a324b2cf66125d31e02cd8e8e3f35849465a9..568ea90e9acc0fb222570451be62cec63d20da6f 100755 (executable)
--- a/2016/live/index.html
+++ b/2016/live/index.html
@@ -24,7 +24,7 @@
         To stream the Room 123 sessions, you could run this in your
         terminal:
         <pre>
-          vlc http://live.fsf.org/room123.ogv
+          vlc https://live2.fsf.org//stream-123.webm
         </pre>
       </p>
     </noscript>

diff --git a/2016/streaming/index.html b/2016/streaming/index.html
index 6cf69128987a15b36860d97a5b53ccffa90f8e27..b41750c0d10f9e2d1ee31af91ee2224707e90db8 100755 (executable)
--- a/2016/streaming/index.html
+++ b/2016/streaming/index.html
@@ -5,7 +5,7 @@
 <!--#include virtual="/2016/includes/banner.html"-->
 <!--#include virtual="/2016/includes/sidebar.html"-->
 
-<h2>Streaming starts March 19 at 9:30am Boston time (UTC-04:00)</h2>
+<h2>Streaming starts on March 19 at 9:30am Boston time (UTC-04:00)</h2>
 <h3>Even if you can't make it to LibrePlanet, you'll be able to watch and chat from here.</p><p>You're also invited to make it a social event by <a href="https://www.libreplanet.org/conference/libreluna">organizing a LibreLuna streaming party</a>.</h3>
 
 <img style="display: block; margin: 50px auto 0 auto; width: 30%;" src="//static.fsf.org/nosvn/libreplanet/hypno-tv.svg">