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 @@ + + + http://localhost:8000/vorbis.ogg + hackme + VORBIS + + play.sh + + 1 + + meta.sh + + @s@: @a@ - @t@ + + My Stream + http://www.oddsock.org + RockNRoll + This is a stream description + 96 + 2.0 + 2 + 44100 + + 1 + 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.) | +-----------------------+----------------------------------------------+