X-Git-Url: https://git.decadent.org.uk/gitweb/?p=lca-dvswitch.git;a=blobdiff_plain;f=index.html;h=596114cb2864b6f4c34050ad606c92b2c3ca3490;hp=880e691f7b23b5ac508faf7fdd9424123dae1a72;hb=1d7f8908beb4ce2ee765cd308e951aa9a37b43b1;hpb=b9bdbeaace6942eb89fa3c5400fe91f8e7bbb771

diff --git a/index.html b/index.html
index 880e691..596114c 100644
--- a/index.html
+++ b/index.html
@@ -45,7 +45,7 @@
 <div class="presentation">
 
 <div class="slide">
-<h1>Making great conference videos on a budget</h1>
+<h1>Making great conference videos<br />on a budget</h1>
 <h3>Ben Hutchings</h3>
 </div>
 
@@ -287,5 +287,56 @@
   </div>
 </div>
 
+<div class="slide">
+  <h1>Icecast streaming server</h1>
+  <ul class="incremental">
+    <li>
+      Simple HTTP streaming server supporting MP3, Ogg Vorbis and
+      Ogg Theora streams
+    </li>
+    <li>
+      Each stream is provided by an authenticated source client or
+      relayed from another server
+    </li>
+    <li>
+      Relaying allows you to build a distribution network serving
+      viewers inside and outside the conference
+    </li>
+  </ul>
+</div>
+
+<div class="slide">
+  <h1>Icecast distribution network</h1>
+  <object data="streaming-network.dia.svg" width="50%"></object>
+  <ul>
+    <li>
+      Internal master serves internal viewers and external master
+    </li>
+    <li>
+      Public servers serve viewers anywhere
+    </li>
+    <li>
+      Relaying restricted by password and/or firewall
+    </li>
+  </ul>
+</div>
+
+<div class="slide">
+  <h1>Further information</h1>
+  <ul>
+    <li>
+      DVswitch
+      <ul>
+	<li>Web: <a href="http://dvswitch.alioth.debian.org">http://dvswitch.alioth.debian.org</a></li>
+	<li>Mail: <a href="mailto:dvswitch-devel@lists.alioth.debian.org">dvswitch-devel@lists.alioth.debian.org</a></li>
+	<li>IRC: #dvswitch on OFTC</li>
+      </ul>
+    </li>
+    <li>
+      Icecast: <a href="http://www.icecast.org/">http://www.icecast.org/</a>
+    </li>
+  </ul>
+</div>
+
 </body>
 </html>