diff --git a/examples/Makefile.am b/examples/Makefile.am index 4cc6809..1af6902 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -3,10 +3,8 @@ AUTOMAKE_OPTIONS = 1.10 foreign subdir-objects examplesdir = @EXAMPLES_DIR@ dist_examples_DATA = \ ezstream-file_template.xml \ - 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 + ezstream-full.xml \ + ezstream-minimal.xml dist_examples_SCRIPTS = meta.sh play.sh playlist-logger.sh CLEANFILES = core *.core *~ .*~ diff --git a/examples/ezstream-file_template.xml b/examples/ezstream-file_template.xml index ee794e1..fbfe82b 100644 --- a/examples/ezstream-file_template.xml +++ b/examples/ezstream-file_template.xml @@ -1,58 +1,64 @@ - - This example streams a playlist generated by ezstream-file.sh(1) and - reencodes to Ogg Vorbis. - --> - http://localhost:8000/vorbis.ogg - hackme - - VORBIS - + + + 127.0.0.1 + 8000 + hackme + + + + /stream.ogg + Vorbis + OggEnc-Q1.5 + + + %FILENAME% - - 0 - - My Stream - http://www.oddsock.org - RockNRoll - This is a stream description - 88 - 1.5 - 2 - 44100 - - 1 - - FLAC - .flac - flac -s -d --force-raw-format --sign=signed --endian=little -o - @T@ - - - MP3 - .mp3 - madplay -b 16 -R 44100 -S -o raw:- @T@ - lame --preset cbr 128 -r -s 44.1 --bitwidth 16 - - - - - VORBIS - .ogg - oggdec -R -b 16 -e 0 -s 1 -o - @T@ - oggenc -r -B 16 -C 2 -R 44100 --raw-endianness 0 -q 1.5 -t @M@ - - - + + + + + OggDec + oggdec -R -b 16 -e 1 -s 1 -o - @T@ + .ogg + .oga + + + + MadPlay + madplay -b 16 -R 44100 -S -o raw:- @T@ + .mp3 + + + + Flac + flac -s -d --force-raw-format --sign=signed --endian=little -o - @T@ + .flac + + + + + + OggEnc-Q1.5 + Vorbis + oggenc -r -B 16 -C 2 -R 44100 --raw-endianness 0 -q 1.5 -t @M@ - + + + + Lame-CBR128 + MP3 + lame --preset cbr 128 -r -s 44.1 --bitwidth 16 - - + + + diff --git a/examples/ezstream-minimal.xml b/examples/ezstream-minimal.xml new file mode 100644 index 0000000..3d9c28e --- /dev/null +++ b/examples/ezstream-minimal.xml @@ -0,0 +1,25 @@ + + + + + + + + 127.0.0.1 + hackme + + + + /stream.ogg + Vorbis + + + + playlist.m3u + + + diff --git a/examples/ezstream_metadata.xml b/examples/ezstream_metadata.xml deleted file mode 100644 index 78c7d69..0000000 --- a/examples/ezstream_metadata.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - http://localhost:8000/vorbis.ogg - hackme - VORBIS - - play.sh - - 1 - - meta.sh - - @s@: @a@ - @t@ - - 10 - - My Stream - http://www.oddsock.org - RockNRoll - This is a stream description - 96 - 2.0 - 2 - 44100 - - 1 - diff --git a/examples/ezstream_mp3.xml b/examples/ezstream_mp3.xml deleted file mode 100644 index 2308512..0000000 --- a/examples/ezstream_mp3.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - http://localhost:8000/stream - - - hackme - MP3 - playlist.m3u - - 1 - - My Stream - http://www.oddsock.org - RockNRoll - This is a stream description - 128 - 2 - 44100 - - 0 - diff --git a/examples/ezstream_reencode_mp3.xml b/examples/ezstream_reencode_mp3.xml deleted file mode 100644 index f0a4d68..0000000 --- a/examples/ezstream_reencode_mp3.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - http://localhost:8000/stream - hackme - - MP3 - playlist.pl - - 1 - - My Stream - http://www.oddsock.org - RockNRoll - This is a stream description - 128 - 2 - 44100 - - 0 - - - 1 - - - - FLAC - .flac - flac -s -d --force-raw-format --sign=signed --endian=little -o - @T@ - - - - - MP3 - .mp3 - - madplay -b 16 -R 44100 -S -o raw:- @T@ - lame --preset cbr 128 -r -s 44.1 --bitwidth 16 - - - - - - VORBIS - .ogg - oggdec -R -b 16 -e 0 -s 1 -o - @T@ - oggenc -r -B 16 -C 2 -R 44100 --raw-endianness 0 -q 1.5 -t @M@ - - - - diff --git a/examples/ezstream_reencode_theora.xml b/examples/ezstream_reencode_theora.xml deleted file mode 100644 index eefaebb..0000000 --- a/examples/ezstream_reencode_theora.xml +++ /dev/null @@ -1,78 +0,0 @@ - - - http://localhost:8000/theora.ogg - hackme - - THEORA - playlist.m3u - - - - My Stream - http://www.oddsock.org - Documentary - This is a stream description - 200 - 2 - 44100 - - - - - 1 - - - - THEORA - .avi - ffmpeg2theora -x 192 -y 128 -a 0 -v 4 --title @M@ -o - @T@ - - - THEORA - .mpg - ffmpeg2theora -x 192 -y 128 -a 0 -v 4 --title @M@ -o - @T@ - - - diff --git a/examples/ezstream_reencode_vorbis.xml b/examples/ezstream_reencode_vorbis.xml deleted file mode 100644 index 0b0229c..0000000 --- a/examples/ezstream_reencode_vorbis.xml +++ /dev/null @@ -1,88 +0,0 @@ - - - http://localhost:8000/vorbis.ogg - hackme - - VORBIS - playlist.m3u - - 1 - - 0 - - My Stream - http://www.oddsock.org - RockNRoll - This is a stream description - 88 - 1.5 - 2 - 44100 - - 1 - - - 1 - - - - FLAC - .flac - flac -s -d --force-raw-format --sign=signed --endian=little -o - @T@ - - - - - MP3 - .mp3 - - madplay -b 16 -R 44100 -S -o raw:- @T@ - lame --preset cbr 128 -r -s 44.1 --bitwidth 16 - - - - - - VORBIS - .ogg - oggdec -R -b 16 -e 0 -s 1 -o - @T@ - oggenc -r -B 16 -C 2 -R 44100 --raw-endianness 0 -q 1.5 -t @M@ - - - - diff --git a/examples/ezstream_stdin_vorbis.xml b/examples/ezstream_stdin_vorbis.xml deleted file mode 100644 index d6cb639..0000000 --- a/examples/ezstream_stdin_vorbis.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - http://localhost:8000/vorbis.ogg - hackme - VORBIS - stdin - - 1 - - My Stream - http://www.oddsock.org - RockNRoll - This is a stream description - 96 - 2.0 - 2 - 44100 - - 1 - diff --git a/examples/ezstream_vorbis.xml b/examples/ezstream_vorbis.xml deleted file mode 100644 index 70d6ffe..0000000 --- a/examples/ezstream_vorbis.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - http://localhost:8000/vorbis.ogg - - - hackme - VORBIS - playlist.m3u - - 0 - - My Stream - http://www.oddsock.org - RockNRoll - This is a stream description - 96 - 2.0 - 2 - 44100 - - 1 -