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

diff --git a/index.html b/index.html
index 880e691..48d3612 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>
 
@@ -96,8 +96,8 @@
       Now used more widely, often without streaming
     </li>
     <li>
-      Mixing is <em>live</em> - required for streaming, and avoids the
-      need for extensive editing after the event
+      Mixing is <em>live</em> - required for streaming, and avoids
+      extensive editing after the event
     </li>
     <li>
       Mixing is <em>interactive</em> - required for good coverage of
@@ -180,7 +180,7 @@
 
 <div class="slide">
   <h1>Overview of the system</h1>
-  <object data="dvswitch-simple.dia.svg" width="75%"></object>
+  <object data="dvswitch-simple.dia.svg" width="90%"></object>
   <div class="handout">
     <p>
       This is a simplified view of the typical components.  The system
@@ -257,17 +257,17 @@
 
 <div class="slide">
   <h1>Mixer UI</h1>
-  <object data="screenshot-1.png" width="50%"></object>
+  <object data="screenshot-1.png" width="70%"></object>
 </div>
 
 <div class="slide">
   <h1>Mixer UI, annotated</h1>
-  <object data="screenshot-1-annotated.xcf.png" width="50%"></object>
+  <object data="screenshot-1-annotated.xcf.png" width="70%"></object>
 </div>
 
 <div class="slide">
   <h1>Mixer internals</h1>
-  <object data="dvswitch-internal.dia.svg" width="90%" height="90%"></object>
+  <object data="dvswitch-internal.dia.svg" width="95%"></object>
   <div class="handout">
     <p>
       To simplify the diagram, I omitted connection setup, tally light
@@ -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="70%"></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>