[xiph-cvs] cvs commit: ices/src input.c stream.c
Karl Heyes
karl at xiph.org
Thu Mar 11 09:22:59 PST 2004
karl 04/03/11 12:22:59
Modified: . configure.in
doc config.html faq.html inputs.html
src input.c stream.c
Log:
small updates/cleanups
Revision Changes Path
1.37 +2 -2 ices/configure.in
Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/ices/configure.in,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- a/configure.in 13 Jan 2004 20:36:38 -0000 1.36
+++ b/configure.in 11 Mar 2004 17:22:59 -0000 1.37
@@ -12,10 +12,10 @@
dnl Set some options based on environment
-dnl openbsd headers break when _XOPEN_SOURCE is defined but without it seems
+dnl BSD headers break when _XOPEN_SOURCE is defined but without it seems
dnl to be fine
case "$host" in
- *openbsd*)
+ *bsd*)
;;
*) AC_DEFINE(_XOPEN_SOURCE, 600, [Define if you have POSIX and XPG specifications])
;;
<p><p>1.4 +6 -0 ices/doc/config.html
Index: config.html
===================================================================
RCS file: /usr/local/cvsroot/ices/doc/config.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- a/config.html 9 Jan 2004 23:50:54 -0000 1.3
+++ b/config.html 11 Mar 2004 17:22:59 -0000 1.4
@@ -32,6 +32,7 @@
<background>0<background>
<logpath>/var/log/ices<logpath>
<logfile>ices.log<logfile>
+ <logsize>2048<logsize>
<loglevel>3<loglevel>
<consolelog>0<consolelog>
<pidfile>/var/log/ices/ices.pid<pidfile>
@@ -51,6 +52,11 @@
The name of the logfile created. On log re-opening the existing logfile is
renamed to <logfile>.1
</div>
+ <h4>logsize</h4>
+ <div class=indentedbox>
+ When the log file reaches this size (in kilobytes) then the log file will
+ be cycled (the default is 2Meg)
+ </div>
<h4>loglevel</h4>
<div class=indentedbox>
A number that represents the amount of logging performed.
<p><p>1.3 +21 -0 ices/doc/faq.html
Index: faq.html
===================================================================
RCS file: /usr/local/cvsroot/ices/doc/faq.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- a/faq.html 3 Jan 2004 00:02:25 -0000 1.2
+++ b/faq.html 11 Mar 2004 17:22:59 -0000 1.3
@@ -42,6 +42,27 @@
they only support one samplerate like 48khz. You have to experiment if the
documentation for the device is not specific.
</div>
+ <h4>Can I do crossfading with the playlist</h4>
+ <div class=indentedbox>
+ Ices does not do much in the way manipulating the audio itself, resampling
+ and downmixing are available as that has a direct effect on encoding an
+ outgoing stream. Ices can still be used in conjunction with other
+ applications such as xmms by making ices read from the say the dsp (eg
+ oss, alsa etc), that way anything that is played by that other application
+ is encoded and sent to icecast.
+ </div>
+ <h4>My player seems unable to play the stream</h4>
+ <div class=indentedbox>
+ If the stream looks to be getting to the player then it will be how the
+ player is handling it. The usual causes of this are
+ <ul>missing ".ogg" extension. Both ices and icecast do not care about the
+ extension however some apps use the extension to determine which plugin to
+ use.</ul>
+ <ul>Missing Ogg Vorbis plugin. The winamp lite versions were known for
+ this.</ul>
+ <ul>Are you running Winamp 3. This is a discontinued product and had problems
+ with the vorbis plugin, either use the later v2.9 series or v5.</ul>
+ </div>
<h4>The sound quality is poor</h4>
<div class=indentedbox>
<p>
<p><p>1.4 +18 -2 ices/doc/inputs.html
Index: inputs.html
===================================================================
RCS file: /usr/local/cvsroot/ices/doc/inputs.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- a/inputs.html 4 Mar 2004 05:45:16 -0000 1.3
+++ b/inputs.html 11 Mar 2004 17:22:59 -0000 1.4
@@ -96,11 +96,27 @@
<param name="rate">44100</param>
<param name="channels">2</param>
<param name="device">plughw:0,0</param>
+ <param name="periods">plughw:0,0</param>
+ <param name="buffer-time">plughw:0,0</param>
<param name="metadata">1</param>
<param name="metadatafilename">/home/ices/metadata</param>
</pre>
- The parameters to ALSA are the same for OSS, as it performs the same task,
- ie captures audio from the DSP.
+ The parameters to ALSA are mostly the same for OSS, as it performs the same
+ task, ie captures audio from the DSP.
+
+ <h4>device</h4>
+ <div class=indentedbox>
+ <p>This is the device name as used in ALSA. This can be a physical device
+ as in the case of "hw:0.0" or a virtual device like one with dsnoop.</p>
+ </div>
+ <h4>periods</h4>
+ <div class=indentedbox>
+ <p>This specifies how many interrupts will be generated (default: 2)</p>
+ </div>
+ <h4>buffer-time</h4>
+ <div class=indentedbox>
+ <p>The size of the buffer measured in mS (default 500)</p>
+ </div>
<h2>Sun</h2>
<p>
<p><p>1.32 +2 -2 ices/src/input.c
Index: input.c
===================================================================
RCS file: /usr/local/cvsroot/ices/src/input.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- a/input.c 11 Mar 2004 17:00:44 -0000 1.31
+++ b/input.c 11 Mar 2004 17:22:59 -0000 1.32
@@ -2,7 +2,7 @@
* - Main producer control loop. Fetches data from input modules, and controls
* submission of these to the instance threads. Timing control happens here.
*
- * $Id: input.c,v 1.31 2004/03/11 17:00:44 karl Exp $
+ * $Id: input.c,v 1.32 2004/03/11 17:22:59 karl Exp $
*
* Copyright (c) 2001 Michael Smith <msmith at labyrinth.net.au>
*
@@ -300,7 +300,7 @@
if(!inmod)
{
- LOG_ERROR1("Couldn't initialise input module \"%s\"\n",
+ LOG_ERROR1("Couldn't initialise input module \"%s\"",
ices_config->playlist_module);
return;
}
<p><p>1.33 +1 -2 ices/src/stream.c
Index: stream.c
===================================================================
RCS file: /usr/local/cvsroot/ices/src/stream.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- a/stream.c 12 Jan 2004 22:53:07 -0000 1.32
+++ b/stream.c 11 Mar 2004 17:22:59 -0000 1.33
@@ -1,7 +1,7 @@
/* stream.c
* - Core streaming functions/main loop.
*
- * $Id: stream.c,v 1.32 2004/01/12 22:53:07 karl Exp $
+ * $Id: stream.c,v 1.33 2004/03/11 17:22:59 karl Exp $
*
* Copyright (c) 2001 Michael Smith <msmith at labyrinth.net.au>
*
@@ -67,7 +67,6 @@
/* we only support the ice protocol and vorbis streams currently */
shout_set_format(sdsc->shout, SHOUT_FORMAT_VORBIS);
- //shout_set_protocol(sdsc->shout, SHOUT_PROTOCOL_ICE);
shout_set_protocol(sdsc->shout, SHOUT_PROTOCOL_HTTP);
signal(SIGPIPE, signal_hup_handler);
<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