Add some slides about using Icecast

diff --git a/Makefile b/Makefile
index a67cb663ee2cd8c49836e7a35b803304b61ebe96..e71a314cb3c5403c7dee7cb9a475227ed3c8b171 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-all: s5-checksums.txt dvswitch-simple.dia.svg screenshot-1-annotated.xcf.png dvswitch-internal.dia.svg
+all: s5-checksums.txt dvswitch-simple.dia.svg screenshot-1-annotated.xcf.png dvswitch-internal.dia.svg streaming-network.dia.svg
 
 clean:
        rm -r s5-checksums.txt s5-blank *.dia.svg *.xcf.png

diff --git a/index.html b/index.html
index 880e691f7b23b5ac508faf7fdd9424123dae1a72..bcaa6b11719ebe9cc473187e4f9e656a54331cc7 100644 (file)
--- a/index.html
+++ b/index.html
@@ -287,5 +287,39 @@
   </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>
+
 </body>
 </html>

diff --git a/streaming-network.dia b/streaming-network.dia
new file mode 100644 (file)
index 0000000..5c2aebc
Binary files /dev/null and b/streaming-network.dia differ