From 5125437d3fe913eb1a57f84cde5bdac2fd14c813 Mon Sep 17 00:00:00 2001
From: moritz <moritz@0101bb08-14d6-0310-b084-bc0e0c8e3800>
Date: Sat, 10 Mar 2007 20:13:56 +0000
Subject: [PATCH] Move conf/ to examples/. Add ezstream_metadata.xml and two
 minimalistic example scripts.

git-svn-id: https://svn.xiph.org/trunk/ezstream@12710 0101bb08-14d6-0310-b084-bc0e0c8e3800
---
 Makefile.am                                   |  2 +-
 configure.in                                  |  2 +-
 {conf => examples}/Makefile.am                |  4 +-
 examples/ezstream_metadata.xml                | 38 +++++++++++++++++++
 {conf => examples}/ezstream_mp3.xml           |  0
 .../ezstream_reencoding_example_mp3.xml       |  0
 .../ezstream_reencoding_example_theora.xml    |  0
 .../ezstream_reencoding_example_vorbis.xml    |  0
 {conf => examples}/ezstream_vorbis.xml        |  0
 examples/meta.sh                              |  7 ++++
 examples/play.sh                              |  5 +++
 win32/README.win32                            |  9 ++++-
 12 files changed, 62 insertions(+), 5 deletions(-)
 rename {conf => examples}/Makefile.am (62%)
 create mode 100644 examples/ezstream_metadata.xml
 rename {conf => examples}/ezstream_mp3.xml (100%)
 rename {conf => examples}/ezstream_reencoding_example_mp3.xml (100%)
 rename {conf => examples}/ezstream_reencoding_example_theora.xml (100%)
 rename {conf => examples}/ezstream_reencoding_example_vorbis.xml (100%)
 rename {conf => examples}/ezstream_vorbis.xml (100%)
 create mode 100755 examples/meta.sh
 create mode 100755 examples/play.sh

diff --git a/Makefile.am b/Makefile.am
index d771dbd..b0811d2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = 1.9 foreign
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS =	conf doc m4 src win32
+SUBDIRS =	doc examples m4 src win32
 
 dist_doc_DATA = COPYING NEWS README
 
diff --git a/configure.in b/configure.in
index 9874adb..e657978 100644
--- a/configure.in
+++ b/configure.in
@@ -201,8 +201,8 @@ XIPH_VAR_PREPEND([XIPH_LIBS], [$XML_LIBS])
 dnl OUTPUT
 
 AC_CONFIG_FILES(Makefile \
-		conf/Makefile \
 		doc/Makefile \
+		examples/Makefile \
 		m4/Makefile \
 		src/Makefile \
 		win32/Makefile)
diff --git a/conf/Makefile.am b/examples/Makefile.am
similarity index 62%
rename from conf/Makefile.am
rename to examples/Makefile.am
index 57c31d1..52f80c2 100644
--- a/conf/Makefile.am
+++ b/examples/Makefile.am
@@ -3,6 +3,8 @@ 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
+		ezstream_reencoding_example_vorbis.xml ezstream_vorbis.xml \
+		ezstream_metadata.xml
+dist_examples_SCRIPTS = meta.sh play.sh
 
 CLEANFILES =	core *.core *~ .*~
diff --git a/examples/ezstream_metadata.xml b/examples/ezstream_metadata.xml
new file mode 100644
index 0000000..ae388b6
--- /dev/null
+++ b/examples/ezstream_metadata.xml
@@ -0,0 +1,38 @@
+<!--
+   EXAMPLE: Ogg Vorbis stream WITHOUT reencoding, using an external playlist
+            program and an external metadata program, with a custom format
+            string.
+
+   This example streams (only) Ogg Vorbis files that are provided by an
+   external playlist script. The script must not return filenames of non-.ogg
+   files. Metadata for this stream is not acquired from the media file itself
+   but from another external program 'meta.sh'.
+ -->
+<ezstream>
+    <url>http://localhost:8000/vorbis.ogg</url>
+    <sourcepassword>hackme</sourcepassword>
+    <format>VORBIS</format>
+    <!-- The playlist program name is provided here: -->
+    <filename>play.sh</filename>
+    <!-- Tell ezstream that <filename/> is a playlist program: -->
+    <playlist_program>1</playlist_program>
+    <!-- Use the meta.sh script to get metadata -->
+    <metadata_progname>meta.sh</metadata_progname>
+    <!-- Set the metadata string according to this format: -->
+    <metadata_format>@s@: @a@ - @t@</metadata_format>
+    <!--
+      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>
diff --git a/conf/ezstream_mp3.xml b/examples/ezstream_mp3.xml
similarity index 100%
rename from conf/ezstream_mp3.xml
rename to examples/ezstream_mp3.xml
diff --git a/conf/ezstream_reencoding_example_mp3.xml b/examples/ezstream_reencoding_example_mp3.xml
similarity index 100%
rename from conf/ezstream_reencoding_example_mp3.xml
rename to examples/ezstream_reencoding_example_mp3.xml
diff --git a/conf/ezstream_reencoding_example_theora.xml b/examples/ezstream_reencoding_example_theora.xml
similarity index 100%
rename from conf/ezstream_reencoding_example_theora.xml
rename to examples/ezstream_reencoding_example_theora.xml
diff --git a/conf/ezstream_reencoding_example_vorbis.xml b/examples/ezstream_reencoding_example_vorbis.xml
similarity index 100%
rename from conf/ezstream_reencoding_example_vorbis.xml
rename to examples/ezstream_reencoding_example_vorbis.xml
diff --git a/conf/ezstream_vorbis.xml b/examples/ezstream_vorbis.xml
similarity index 100%
rename from conf/ezstream_vorbis.xml
rename to examples/ezstream_vorbis.xml
diff --git a/examples/meta.sh b/examples/meta.sh
new file mode 100755
index 0000000..b022dff
--- /dev/null
+++ b/examples/meta.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# Example metadata script that has the behavior required by ezstream.
+
+test -z "${1}" && echo "Ezstream presents"
+test x"${1}" = "xartist" && echo "Great Artist"
+test x"${1}" = "xtitle" && echo "Great Song"
diff --git a/examples/play.sh b/examples/play.sh
new file mode 100755
index 0000000..077d391
--- /dev/null
+++ b/examples/play.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+# Example playlist script that has the behavior required by ezstream.
+
+echo "Great_Artist_-_Great_Song.ogg"
diff --git a/win32/README.win32 b/win32/README.win32
index 120d256..ae125f3 100644
--- a/win32/README.win32
+++ b/win32/README.win32
@@ -15,9 +15,14 @@ README.win32 - Information about the binary Ezstream distribution for Windows
 +-----------------------+----------------------------------------------+
 | \ezstream.exe         | The ezstream executable file.                |
 +-----------------------+----------------------------------------------+
-| \ezstream-X.Y.Z.zip   | The ezstream source distribution.            |
+| \ezstream-X.Y.Z.zip   | The ezstream source distribution, from which |
+|                       | ezstream.exe was built.                      |
 +-----------------------+----------------------------------------------+
-| \conf\*.xml           | Ezstream example configuration files.        |
+| \examples\*.xml       | Ezstream example configuration files.        |
++-----------------------+----------------------------------------------+
+| \examples\*.sh        | Example playlist and metadata scripts, for   |
+|                       | demonstrational purposes (these are shell    |
+|                       | scripts.)                                    |
 +-----------------------+----------------------------------------------+