[xiph-commits] r12710 - in trunk/ezstream: . examples win32

Sat Mar 10 12:14:05 PST 2007

Author: moritz
Date: 2007-03-10 12:13:56 -0800 (Sat, 10 Mar 2007)
New Revision: 12710

Added:
   trunk/ezstream/examples/
   trunk/ezstream/examples/Makefile.am
   trunk/ezstream/examples/ezstream_metadata.xml
   trunk/ezstream/examples/ezstream_mp3.xml
   trunk/ezstream/examples/ezstream_reencoding_example_mp3.xml
   trunk/ezstream/examples/ezstream_reencoding_example_theora.xml
   trunk/ezstream/examples/ezstream_reencoding_example_vorbis.xml
   trunk/ezstream/examples/ezstream_vorbis.xml
   trunk/ezstream/examples/meta.sh
   trunk/ezstream/examples/play.sh
Removed:
   trunk/ezstream/conf/
Modified:
   trunk/ezstream/Makefile.am
   trunk/ezstream/configure.in
   trunk/ezstream/win32/README.win32
Log:
Move conf/ to examples/. Add ezstream_metadata.xml and two minimalistic example
scripts.


Modified: trunk/ezstream/Makefile.am
===================================================================

--- trunk/ezstream/Makefile.am	2007-03-10 19:54:33 UTC (rev 12709)
+++ trunk/ezstream/Makefile.am	2007-03-10 20:13:56 UTC (rev 12710)
@@ -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
 

Modified: trunk/ezstream/configure.in
===================================================================
--- trunk/ezstream/configure.in	2007-03-10 19:54:33 UTC (rev 12709)
+++ trunk/ezstream/configure.in	2007-03-10 20:13:56 UTC (rev 12710)
@@ -201,8 +201,8 @@
 dnl OUTPUT
 
 AC_CONFIG_FILES(Makefile \
-		conf/Makefile \
 		doc/Makefile \
+		examples/Makefile \
 		m4/Makefile \
 		src/Makefile \
 		win32/Makefile)


Property changes on: trunk/ezstream/examples
___________________________________________________________________
Name: svn:ignore
   + Makefile.in


Copied: trunk/ezstream/examples/Makefile.am (from rev 12666, trunk/ezstream/conf/Makefile.am)
===================================================================
--- trunk/ezstream/conf/Makefile.am	2007-03-06 14:11:53 UTC (rev 12666)
+++ trunk/ezstream/examples/Makefile.am	2007-03-10 20:13:56 UTC (rev 12710)
@@ -0,0 +1,10 @@
+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_metadata.xml
+dist_examples_SCRIPTS = meta.sh play.sh
+
+CLEANFILES =	core *.core *~ .*~

Added: trunk/ezstream/examples/ezstream_metadata.xml
===================================================================
--- trunk/ezstream/examples/ezstream_metadata.xml	2007-03-10 19:54:33 UTC (rev 12709)
+++ trunk/ezstream/examples/ezstream_metadata.xml	2007-03-10 20:13:56 UTC (rev 12710)
@@ -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>

Copied: trunk/ezstream/examples/ezstream_mp3.xml (from rev 12666, trunk/ezstream/conf/ezstream_mp3.xml)

Copied: trunk/ezstream/examples/ezstream_reencoding_example_mp3.xml (from rev 12666, trunk/ezstream/conf/ezstream_reencoding_example_mp3.xml)

Copied: trunk/ezstream/examples/ezstream_reencoding_example_theora.xml (from rev 12666, trunk/ezstream/conf/ezstream_reencoding_example_theora.xml)

Copied: trunk/ezstream/examples/ezstream_reencoding_example_vorbis.xml (from rev 12666, trunk/ezstream/conf/ezstream_reencoding_example_vorbis.xml)

Copied: trunk/ezstream/examples/ezstream_vorbis.xml (from rev 12666, trunk/ezstream/conf/ezstream_vorbis.xml)

Added: trunk/ezstream/examples/meta.sh
===================================================================
--- trunk/ezstream/examples/meta.sh	2007-03-10 19:54:33 UTC (rev 12709)
+++ trunk/ezstream/examples/meta.sh	2007-03-10 20:13:56 UTC (rev 12710)
@@ -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"


Property changes on: trunk/ezstream/examples/meta.sh
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/ezstream/examples/play.sh
===================================================================
--- trunk/ezstream/examples/play.sh	2007-03-10 19:54:33 UTC (rev 12709)
+++ trunk/ezstream/examples/play.sh	2007-03-10 20:13:56 UTC (rev 12710)
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+# Example playlist script that has the behavior required by ezstream.
+
+echo "Great_Artist_-_Great_Song.ogg"


Property changes on: trunk/ezstream/examples/play.sh
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/ezstream/win32/README.win32
===================================================================
--- trunk/ezstream/win32/README.win32	2007-03-10 19:54:33 UTC (rev 12709)
+++ trunk/ezstream/win32/README.win32	2007-03-10 20:13:56 UTC (rev 12710)
@@ -15,10 +15,15 @@
 +-----------------------+----------------------------------------------+
 | \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.)                                    |
++-----------------------+----------------------------------------------+
 
 
 

