From 22884e3fbb2a610ea78b203cb4f196afcd5037d9 Mon Sep 17 00:00:00 2001
From: moritz <moritz@0101bb08-14d6-0310-b084-bc0e0c8e3800>
Date: Sun, 4 Nov 2007 13:40:58 +0000
Subject: [PATCH]  * Add new configuration example for streaming from standard
 input.  * Rename reencoding examples to shorter and less redundant filenames.

git-svn-id: https://svn.xiph.org/trunk/ezstream@14094 0101bb08-14d6-0310-b084-bc0e0c8e3800
---
 examples/Makefile.am                          |  6 ++--
 ...mple_mp3.xml => ezstream_reencode_mp3.xml} |  0
 ...heora.xml => ezstream_reencode_theora.xml} |  0
 ...orbis.xml => ezstream_reencode_vorbis.xml} |  0
 examples/ezstream_stdin_vorbis.xml            | 36 +++++++++++++++++++
 5 files changed, 39 insertions(+), 3 deletions(-)
 rename examples/{ezstream_reencoding_example_mp3.xml => ezstream_reencode_mp3.xml} (100%)
 rename examples/{ezstream_reencoding_example_theora.xml => ezstream_reencode_theora.xml} (100%)
 rename examples/{ezstream_reencoding_example_vorbis.xml => ezstream_reencode_vorbis.xml} (100%)
 create mode 100644 examples/ezstream_stdin_vorbis.xml

diff --git a/examples/Makefile.am b/examples/Makefile.am
index 52f80c2..bf3e5c9 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,9 +1,9 @@
 AUTOMAKE_OPTIONS = 1.9 foreign
 
 examplesdir =	@EXAMPLES_DIR@
-dist_examples_DATA = ezstream_mp3.xml ezstream_reencoding_example_mp3.xml \
-		ezstream_reencoding_example_theora.xml \
-		ezstream_reencoding_example_vorbis.xml ezstream_vorbis.xml \
+dist_examples_DATA = ezstream_mp3.xml ezstream_reencode_mp3.xml \
+		ezstream_reencode_theora.xml ezstream_reencode_vorbis.xml \
+		ezstream_stdin_vorbis.xml ezstream_vorbis.xml \
 		ezstream_metadata.xml
 dist_examples_SCRIPTS = meta.sh play.sh
 
diff --git a/examples/ezstream_reencoding_example_mp3.xml b/examples/ezstream_reencode_mp3.xml
similarity index 100%
rename from examples/ezstream_reencoding_example_mp3.xml
rename to examples/ezstream_reencode_mp3.xml
diff --git a/examples/ezstream_reencoding_example_theora.xml b/examples/ezstream_reencode_theora.xml
similarity index 100%
rename from examples/ezstream_reencoding_example_theora.xml
rename to examples/ezstream_reencode_theora.xml
diff --git a/examples/ezstream_reencoding_example_vorbis.xml b/examples/ezstream_reencode_vorbis.xml
similarity index 100%
rename from examples/ezstream_reencoding_example_vorbis.xml
rename to examples/ezstream_reencode_vorbis.xml
diff --git a/examples/ezstream_stdin_vorbis.xml b/examples/ezstream_stdin_vorbis.xml
new file mode 100644
index 0000000..d6cb639
--- /dev/null
+++ b/examples/ezstream_stdin_vorbis.xml
@@ -0,0 +1,36 @@
+<!--
+   EXAMPLE: Ogg Vorbis stream from standard input WITHOUT reencoding
+
+   This example streams an Ogg Vorbis stream from standard input (stdin.)
+   Since ezstream will not be doing any reencoding, the resulting stream
+   format (quality/bitrate, samplerate, channels) will be of the respective
+   input stream.
+ -->
+<ezstream>
+    <url>http://localhost:8000/vorbis.ogg</url>
+    <sourcepassword>hackme</sourcepassword>
+    <format>VORBIS</format>
+    <filename>stdin</filename>
+    <!--
+      Important:
+      For streaming from standard input, the default for continuous streaming
+      is bad. Set <stream_once /> to 1 here to prevent ezstream from spinning
+      endlessly when the input stream stops:
+     -->
+    <stream_once>1</stream_once>
+    <!--
+      The following settings are used to describe your stream to the server.
+      It's up to you to make sure that the bitrate/quality/samplerate/channels
+      information matches up with your input stream files.
+     -->
+    <svrinfoname>My Stream</svrinfoname>
+    <svrinfourl>http://www.oddsock.org</svrinfourl>
+    <svrinfogenre>RockNRoll</svrinfogenre>
+    <svrinfodescription>This is a stream description</svrinfodescription>
+    <svrinfobitrate>96</svrinfobitrate>
+    <svrinfoquality>2.0</svrinfoquality>
+    <svrinfochannels>2</svrinfochannels>
+    <svrinfosamplerate>44100</svrinfosamplerate>
+    <!-- Allow the server to advertise the stream on a public YP directory: -->
+    <svrinfopublic>1</svrinfopublic>
+</ezstream>