Commit 589a7756 authored by Karl Heyes's avatar Karl Heyes
Browse files

small updates/cleanups

svn path=/trunk/ices/; revision=5931
parent 02f8d22a
......@@ -12,10 +12,10 @@ AM_PROG_LIBTOOL
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])
;;
......
......@@ -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.
......
......@@ -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>
......
......@@ -96,11 +96,27 @@
&lt;param name="rate"&gt;44100&lt;/param&gt;
&lt;param name="channels"&gt;2&lt;/param&gt;
&lt;param name="device"&gt;plughw:0,0&lt;/param&gt;
&lt;param name="periods"&gt;plughw:0,0&lt;/param&gt;
&lt;param name="buffer-time"&gt;plughw:0,0&lt;/param&gt;
&lt;param name="metadata"&gt;1&lt;/param&gt;
&lt;param name="metadatafilename"&gt;/home/ices/metadata&lt;/param&gt;
</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>
......
......@@ -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@labyrinth.net.au>
*
......@@ -300,7 +300,7 @@ void input_loop(void)
if(!inmod)
{
LOG_ERROR1("Couldn't initialise input module \"%s\"\n",
LOG_ERROR1("Couldn't initialise input module \"%s\"",
ices_config->playlist_module);
return;
}
......
/* 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@labyrinth.net.au>
*
......@@ -67,7 +67,6 @@ void *ices_instance_stream(void *arg)
/* 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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment