From 1c803543843421560951db0e52f6cd762601e90c Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Thu, 20 Jan 2011 20:37:27 +0000
Subject: [PATCH] Add some slides about using Icecast

---
 Makefile              |   2 +-
 index.html            |  34 ++++++++++++++++++++++++++++++++++
 streaming-network.dia | Bin 0 -> 2344 bytes
 3 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 streaming-network.dia

diff --git a/Makefile b/Makefile
index a67cb66..e71a314 100644
--- 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 880e691..bcaa6b1 100644
--- 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
index 0000000000000000000000000000000000000000..5c2aebc29bff3fbeca1db62899cc05318f41f5af
GIT binary patch
literal 2344
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
Od-XrPvJh;_c>n;TO_$05

literal 0
HcmV?d00001

-- 
2.39.2