X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=index.html;h=f36896afb1b6c87a9b8c0da3022ed3d2ce34b6f7;hb=719859d5e7a3fe2510a7c4ca3c2ceda18ef3754a;hp=17831b4cb964eaade905218e42f2ad79d8ca7bcc;hpb=49e76ea761521123edfc75179275356531dfea4d;p=lca-dvswitch.git

diff --git a/index.html b/index.html
index 17831b4..f36896a 100644
--- a/index.html
+++ b/index.html
@@ -4,7 +4,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 
 <head>
-<title>DVswitch - Ben Hutchings - LCA2011</title>
+<title>Making great conference videos on a budget - Ben Hutchings - LCA2011</title>
 <!-- metadata -->
 <meta name="generator" content="S5" />
 <meta name="version" content="S5 1.1" />
@@ -36,7 +36,7 @@
 </div>
 <div id="footer">
 <h1>LCA2011</h1>
-<h2>DVswitch</h2>
+<h2>Making great conference videos on a budget</h2>
 </div>
 
 </div>
@@ -45,7 +45,7 @@
 <div class="presentation">
 
 <div class="slide">
-<h1>DVswitch</h1>
+<h1>Making great conference videos 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>
