[xiph-cvs] cvs commit: ices/conf ices-live.xml ices-playlist.xml Makefile.am
Karl Heyes
karl at xiph.org
Fri Jan 9 15:48:43 PST 2004
karl 04/01/09 18:48:43
Modified: conf ices-live.xml ices-playlist.xml Makefile.am
Log:
fix up whitespace in samples, and install where that docs are.
Revision Changes Path
1.9 +74 -63 ices/conf/ices-live.xml
Index: ices-live.xml
===================================================================
RCS file: /usr/local/cvsroot/ices/conf/ices-live.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ices-live.xml 28 Dec 2003 21:49:23 -0000 1.8
+++ ices-live.xml 9 Jan 2004 23:48:42 -0000 1.9
@@ -1,83 +1,94 @@
<?xml version="1.0"?>
<ices>
- <background>0</background> <!-- run in background -->
- <logpath>/tmp</logpath> <!-- where logs, etc go. -->
- <logfile>ices.log</logfile>
- <loglevel>4</loglevel> <!-- 1=error,2=warn,3=info,4=debug -->
- <consolelog>0</consolelog> <!-- logfile is ignored if this is set to 1 -->
+ <!-- run in background -->
+ <background>0</background>
+ <!-- where logs go. -->
+ <logpath>/var/log/ices</logpath>
+ <logfile>ices.log</logfile>
+ <!-- 1=error, 2=warn, 3=infoa ,4=debug -->
+ <loglevel>4</loglevel>
+ <!-- logfile is ignored if this is set to 1 -->
+ <consolelog>0</consolelog>
<!-- optional filename to write process id to -->
<!-- <pidfile>/home/ices/ices.pid</pidfile> -->
- <stream>
- <!-- metadata used for stream listing (not currently used) -->
- <metadata>
- <name>Example stream name</name>
- <genre>Example genre</genre>
- <description>A short description of your stream</description>
- </metadata>
-
- <!-- input module
- This example uses the 'oss' module. It takes input from the
- oss audio device (i.e. line-in), and processes it for live
- encoding.
- -->
- <input>
- <module>oss</module>
- <param name="rate">44100</param> <!-- samplerate -->
- <param name="channels">2</param> <!-- number of channels -->
- <param name="device">/dev/dsp</param> <!-- audio device -->
- <param name="metadata">1</param> <!-- Read metadata (from stdin by default, or filename defined below (if the latter, only on SIGUSR1) -->
- <param name="metadatafilename">test</param>
- </input>
-
- <!-- Stream instance
- You may have one or more instances here. This allows you to
- send the same input data to one or more servers (or to different
- mountpoints on the same server). Each of them can have different
- parameters. This is primarily useful for a) relaying to multiple
- independent servers, and b) encoding/reencoding to multiple
- bitrates.
- If one instance fails (for example, the associated server goes
- down, etc), the others will continue to function correctly.
- This example defines a single instance doing live encoding at
- low bitrate.
- -->
- <instance>
- <!-- Server details:
- You define hostname and port for the server here, along with
- the source password and mountpoint.
- -->
- <hostname>localhost</hostname>
- <port>8000</port>
- <password>hackme</password>
- <mount>/example1.ogg</mount>
+ <stream>
+ <!-- metadata used for stream listing -->
+ <metadata>
+ <name>Example stream name</name>
+ <genre>Example genre</genre>
+ <description>A short description of your stream</description>
+ <url><a href="http://mysite.org</url">http://mysite.org</url</a>>
+ </metadata>
+
+ <!-- Input module.
+
+ This example uses the 'oss' module. It takes input from the
+ OSS audio device (e.g. line-in), and processes it for live
+ encoding. -->
+ <input>
+ <module>oss</module>
+ <param name="rate">44100</param>
+ <param name="channels">2</param>
+ <param name="device">/dev/dsp</param>
+ <!-- Read metadata (from stdin by default, or -->
+ <!-- filename defined below (if the latter, only on SIGUSR1) -->
+ <param name="metadata">1</param>
+ <param name="metadatafilename">test</param>
+ </input>
+
+ <!-- Stream instance.
+
+ You may have one or more instances here. This allows you to
+ send the same input data to one or more servers (or to different
+ mountpoints on the same server). Each of them can have different
+ parameters. This is primarily useful for a) relaying to multiple
+ independent servers, and b) encoding/reencoding to multiple
+ bitrates.
+
+ If one instance fails (for example, the associated server goes
+ down, etc), the others will continue to function correctly.
+ This example defines a single instance doing live encoding at
+ low bitrate. -->
+
+ <instance>
+ <!-- Server details.
+
+ You define hostname and port for the server here, along
+ with the source password and mountpoint. -->
+
+ <hostname>localhost</hostname>
+ <port>8000</port>
+ <password>hackme</password>
+ <mount>/example1.ogg</mount>
<yp>1</yp> <!-- allow stream to be advertised on YP, default 0 -->
- <!-- Live encoding/reencoding:
- channels and samplerate currently MUST match the channels
- and samplerate given in the parameters to the oss input
- module above.
-
- -->
- <encode>
- <quality>0</quality>
- <samplerate>22050</samplerate>
- <channels>1</channels>
- </encode>
+ <!-- Live encoding/reencoding:
+
+ channels and samplerate currently MUST match the channels
+ and samplerate given in the parameters to the oss input
+ module above or the remsaple/downmix section below. -->
+
+ <encode>
+ <quality>0</quality>
+ <samplerate>22050</samplerate>
+ <channels>1</channels>
+ </encode>
<!-- stereo->mono downmixing, enabled by setting this to 1 -->
<downmix>1</downmix>
- <!-- resampling. Set to the frequency (in Hz) you wish to resample
- to, or 0 to disable -->
+ <!-- resampling.
+
+ Set to the frequency (in Hz) you wish to resample to, -->
<resample>
<in-rate>44100</in-rate>
<out-rate>22050</out-rate>
</resample>
- </instance>
+ </instance>
- </stream>
+ </stream>
</ices>
<p><p>1.7 +88 -101 ices/conf/ices-playlist.xml
Index: ices-playlist.xml
===================================================================
RCS file: /usr/local/cvsroot/ices/conf/ices-playlist.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ices-playlist.xml 28 Dec 2003 21:49:23 -0000 1.6
+++ ices-playlist.xml 9 Jan 2004 23:48:42 -0000 1.7
@@ -1,112 +1,99 @@
<?xml version="1.0"?>
<ices>
-
- <background>0</background> <!-- run in background -->
- <logpath>/tmp</logpath> <!-- where logs, etc go. -->
- <logfile>ices.log</logfile>
- <loglevel>4</loglevel> <!-- 1=error,2=warn,3=info,4=debug -->
- <consolelog>0</consolelog> <!-- set this to 1 to log to the console instead
- of to the file above -->
+ <!-- run in background -->
+ <background>0</background>
+ <!-- where logs, etc go. -->
+ <logpath>/var/log/ices</logpath>
+ <logfile>ices.log</logfile>
+ <!-- 1=error,2=warn,3=info,4=debug -->
+ <loglevel>4</loglevel>
+ <!-- set this to 1 to log to the console instead of to the file above -->
+ <consolelog>0</consolelog>
<!-- optional filename to write process id to -->
<!-- <pidfile>/home/ices/ices.pid</pidfile> -->
- <stream>
- <!-- metadata used for stream listing (not currently used) -->
- <metadata>
- <name>Example stream name</name>
- <genre>Example genre</genre>
- <description>A short description of your stream</description>
- </metadata>
-
- <!-- input module
- This defines where the data (raw PCM, vorbis files, etc.) comes
- from. The module used here is the playlist module - it has
- 'submodules' for different types of playlist. The only one
- currently implemented is 'basic', which is a simple file-based
- playlist
- -->
- <input>
- <module>playlist</module>
- <param name="type">basic</param>
- <param name="file">playlist.txt</param> <!-- be sure this exists -->
- <param name="random">0</param> <!-- random play -->
- <param name="once">0</param> <!-- if set to 1 , plays once through,
- then exits. -->
- </input>
+ <stream>
+ <!-- metadata used for stream listing (not currently used) -->
+ <metadata>
+ <name>Example stream name</name>
+ <genre>Example genre</genre>
+ <description>A short description of your stream</description>
+ </metadata>
+
+ <!-- input module
+
+ The module used here is the playlist module - it has
+ 'submodules' for different types of playlist. There are
+ two currently implemented, 'basic', which is a simple
+ file-based playlist, and 'script' which invokes a command
+ to returns a filename to start playing. -->
+
+ <input>
+ <module>playlist</module>
+ <param name="type">basic</param>
+ <param name="file">playlist.txt</param>
+ <!-- random play -->
+ <param name="random">0</param>
+ <!-- if the playlist get updated that start at the beginning -->
+ <param name="restart-after-reread">0</param>
+ <!-- if set to 1 , plays once through, then exits. -->
+ <param name="once">0</param>
+ </input>
<!-- Stream instance
- You may have one or more instances here. This allows you to
- send the same input data to one or more servers (or to different
- mountpoints on the same server). Each of them can have different
- parameters. This is primarily useful for a) relaying to multiple
- independent servers, and b) encoding/reencoding to multiple
- bitrates.
- If one instance fails (for example, the associated server goes
- down, etc), the others will continue to function correctly.
- This example defines two instances as two mountpoints on the
- same server.
- -->
- <instance>
- <!-- Server details:
- You define hostname and port for the server here, along with
- the source password and mountpoint.
- -->
- <hostname>localhost</hostname>
- <port>8000</port>
- <password>hackme</password>
- <mount>/example1.ogg</mount>
-
- <!-- Reconnect parameters:
- When something goes wrong (e.g. the server crashes, or the
- network drops) and ices disconnects from the server, these
- control how often it tries to reconnect, and how many times
- it tries to reconnect. Delay is in seconds.
- If you set reconnectattempts to -1, it will continue
- indefinately. Suggest setting reconnectdelay to a large value
- if you do this.
- -->
- <reconnectdelay>2</reconnectdelay>
- <reconnectattempts>5</reconnectattempts>
-
- <!-- maxqueuelength:
- This describes how long the internal data queues may be. This
- basically lets you control how much data gets buffered before
- ices decides it can't send to the server fast enough, and
- either shuts down or flushes the queue (dropping the data)
- and continues.
- For advanced users only.
- -->
- <maxqueuelength>80</maxqueuelength>
-
- <!-- Live encoding/reencoding:
- Currrently, the parameters given here for encoding MUST
- match the input data for channels and sample rate. That
- restriction will be relaxed in the future.
- -->
- <encode>
- <nominal-bitrate>64000</nominal-bitrate> <!-- bps. e.g. 64000 for 64 kbps -->
- <samplerate>44100</samplerate>
- <channels>2</channels>
- </encode>
- </instance>
-
- <!-- Now, we define a 2nd stream instance.
- Here, we only define the basic server parameters - everything
- else takes the default values.
- No reencoding is done.
- -->
- <instance>
- <hostname>localhost</hostname>
- <port>8000</port>
- <password>hackme</password>
- <mount>/example2.ogg</mount>
- <!-- Stream saving. Save the outgoing stream to the specified file
- This is commented out since we don't want it by default -->
- <!--
- <savefile>streamdump.ogg</savefile>
- -->
- </instance>
+ You may have one or more instances here. This allows you to
+ send the same input data to one or more servers (or to different
+ mountpoints on the same server). Each of them can have different
+ parameters. This is primarily useful for a) relaying to multiple
+ independent servers, and b) encoding/reencoding to multiple
+ bitrates.
+ If one instance fails (for example, the associated server goes
+ down, etc), the others will continue to function correctly.
+ This example defines two instances as two mountpoints on the
+ same server. -->
+ <instance>
+ <!-- Server details:
+ You define hostname and port for the server here, along with
+ the source password and mountpoint. -->
+ <hostname>localhost</hostname>
+ <port>8000</port>
+ <password>hackme</password>
+ <mount>/example1.ogg</mount>
+
+ <!-- Reconnect parameters:
+ When something goes wrong (e.g. the server crashes, or the
+ network drops) and ices disconnects from the server, these
+ control how often it tries to reconnect, and how many times
+ it tries to reconnect. Delay is in seconds.
+ If you set reconnectattempts to -1, it will continue
+ indefinately. Suggest setting reconnectdelay to a large value
+ if you do this.
+ -->
+ <reconnectdelay>2</reconnectdelay>
+ <reconnectattempts>5</reconnectattempts>
+
+ <!-- maxqueuelength:
+ This describes how long the internal data queues may be. This
+ basically lets you control how much data gets buffered before
+ ices decides it can't send to the server fast enough, and
+ either shuts down or flushes the queue (dropping the data)
+ and continues.
+ For advanced users only.
+ -->
+ <maxqueuelength>80</maxqueuelength>
+
+ <!-- Live encoding/reencoding:
+ Currrently, the parameters given here for encoding MUST
+ match the input data for channels and sample rate. That
+ restriction will be relaxed in the future.
+ -->
+ <encode>
+ <nominal-bitrate>64000</nominal-bitrate> <!-- bps. e.g. 64000 for 64 kbps -->
+ <samplerate>44100</samplerate>
+ <channels>2</channels>
+ </encode>
+ </instance>
</stream>
</ices>
<p><p>1.3 +4 -1 ices/conf/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/ices/conf/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.am 22 Mar 2003 03:26:34 -0000 1.2
+++ Makefile.am 9 Jan 2004 23:48:42 -0000 1.3
@@ -2,7 +2,10 @@
AUTOMAKE_OPTIONS = foreign
-EXTRA_DIST = ices-live.xml ices-playlist.xml
+docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
+doc_DATA = ices-live.xml ices-playlist.xml
+
+EXTRA_DIST = $(doc_DATA)
debug:
$(MAKE) all CFLAGS="@DEBUG@"
<p><p>--- >8 ----
List archives: http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body. No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.
More information about the commits
mailing list