From 767f840530dbd722379713a32738d36d365254d7 Mon Sep 17 00:00:00 2001 From: darkeye Date: Mon, 13 Nov 2000 20:22:07 +0000 Subject: [PATCH] preparing for 0.1 release --- darkice/trunk/AUTHORS | 5 +- darkice/trunk/COPYING | 49 ++++++++++++++ darkice/trunk/ChangeLog | 6 +- darkice/trunk/NEWS | 4 +- darkice/trunk/README | 125 ++++++++++++++++++++++++++++++++++- darkice/trunk/configure.h.in | 3 + darkice/trunk/configure.in | 2 +- darkice/trunk/darkice.cfg | 2 +- 8 files changed, 190 insertions(+), 6 deletions(-) diff --git a/darkice/trunk/AUTHORS b/darkice/trunk/AUTHORS index 89ce2aa..0276ca3 100644 --- a/darkice/trunk/AUTHORS +++ b/darkice/trunk/AUTHORS @@ -1 +1,4 @@ -Akos Maroy, darkeye@tyrell.hu +DarkIce is being written by: + + Akos Maroy, darkeye@users.sourceforge.net + diff --git a/darkice/trunk/COPYING b/darkice/trunk/COPYING index d60c31a..c93d9fb 100644 --- a/darkice/trunk/COPYING +++ b/darkice/trunk/COPYING @@ -1,3 +1,52 @@ +Contents +-------- + +1. Standard Template Library license +2. GNU General Public License + + + +1. Standard Template Library license +------------------------------------ + +Sources found in the stl directory are covered under the following +license: + + Copyright (c) 1996 + Silicon Graphics Computer Systems, Inc. + + Permission to use, copy, modify, distribute and sell this software + and its documentation for any purpose is hereby granted without fee, + provided that the above copyright notice appear in all copies and + that both that copyright notice and this permission notice appear + in supporting documentation. Silicon Graphics makes no + representations about the suitability of this software for any + purpose. It is provided "as is" without express or implied warranty. + + + Copyright (c) 1994 + Hewlett-Packard Company + + Permission to use, copy, modify, distribute and sell this software + and its documentation for any purpose is hereby granted without fee, + provided that the above copyright notice appear in all copies and + that both that copyright notice and this permission notice appear + in supporting documentation. Hewlett-Packard Company makes no + representations about the suitability of this software for any + purpose. It is provided "as is" without express or implied warranty. + + + + + +2. GNU General Public License +----------------------------- + +All source code in the src directory is covered under the +GNU General Public License (GNU GPL). + + + GNU GENERAL PUBLIC LICENSE Version 2, June 1991 diff --git a/darkice/trunk/ChangeLog b/darkice/trunk/ChangeLog index 6153c46..f6c65d2 100644 --- a/darkice/trunk/ChangeLog +++ b/darkice/trunk/ChangeLog @@ -1 +1,5 @@ -nothing so far + +13-11-2000, Akos Maroy, darkeye@users.sourceforge.net + + Initial release. Supports the lame encoder. + diff --git a/darkice/trunk/NEWS b/darkice/trunk/NEWS index 492bafc..31460be 100644 --- a/darkice/trunk/NEWS +++ b/darkice/trunk/NEWS @@ -1 +1,3 @@ -nothing special + +13-11-2000: DarkIce 0.1 released + diff --git a/darkice/trunk/README b/darkice/trunk/README index f0735bc..af78e66 100644 --- a/darkice/trunk/README +++ b/darkice/trunk/README @@ -1,2 +1,125 @@ -DarkIce, a live streamer for IceCast +DarkIce 0.1 live audio streamer, http://darkice.sourceforge.net +Copyright (C) 2000, Tyrell Hungary, http://tyrell.hu + + +Contents +-------- + +1. Compiling and installing +2. Configuration file format +2.1 Section [general] +2.2 Section [input] +2.3 Section [lamex] +3. Supported encoders +4. Kown bugs and issues + + + +1. Compiling and installing +--------------------------- + + +On how to compile and install, please read the file INSTALL. If you're +impatient, try: + +./configure +make +make install + +The executable built is src/darkice. + + + +2. Configuration file format +---------------------------- + +DarkIce requires a configuration file. Please take a look at the supplied +darkice.cfg sample configuration file. + +The file has to following general format: + +[section1] +# this is a whole line comment +key = value +an ugly key name = long value # this end is a comment too + +[section2] +# this is a whole line comment in section 2 +key = value +an ugly key name = long value # this end is a comment too + + +In particular, the following sections and values are required: + + +2.1 Section [general] +--------------------- +This section describes general operational parameters. + +Required values: + +duration Time for DarkIce to run, in seconds. +bufferSecs Data read from the sound card is buffered before sent to + the mp3 encoder. Each buffer will be able to hold this + many seconds of samples. + + +2.2 Section [input] +--------------------- +This section describes the input. + +Required values: + +device OSS DSP audio device to record from (e.g. /dev/dsp) +sampleRate The sample rate to record with, samples per second + (e.g. 44100 for 44.1kHz CD-quality audio) +bitsPerSample Bites to use for each sample (e.g. 8 bits or 16 bits) +channel Number of channels to record (e.g. 1 for mono, 2 for stereo) + + +2.3 Section [lamex] +--------------------- +This section describes an output to an IceCast server, while encoding +with a lame encoder. There may be at most 8 outputs, numbered from 0 ... 7. +The number is included in the section name (e.g. [lame0] ... [lame7]). + +Required values: + +encoder The command used to invoke the encoder +bitrate Bit rate to encode to in kBits / sec (e.g. 96) +server The IceCast server's name (e.g. yp.sourserver.com) +port The port to connect to the IceCast server (e.g. 8000) +password The password to use to connet to the IceCast server +mountPoint Mount point for the stream on the server +name Name of the stream +description Description of the stream +url Url related to the stream +genre Genre of the stream +public "yes" or "no", wether the stream is public + +Optional values: + +lowpass Lowpass filter setting for the lame encoder. If not set, + the encoder's default behaviour is used +highpass Highpass filter setting for the lame encoder. If not set, + the encoder's default behaviour is used + + + +3. Supported encoders +--------------------- + +Currently the lame encoder is supported (http://www.mp3dev.org/mp3/). +Tests were made with version 3.86. + + + +4. Kown bugs and issues +----------------------- + +Lots of bugs, this is the first release. + +You must have write permissions in the directory you execute DarkIce. +It is recommended to run DarkIce as root, with a nice level of -10. + diff --git a/darkice/trunk/configure.h.in b/darkice/trunk/configure.h.in index 8078cc1..ec6c2ed 100644 --- a/darkice/trunk/configure.h.in +++ b/darkice/trunk/configure.h.in @@ -18,6 +18,9 @@ /* Define if you have the header file. */ #undef HAVE_FCNTL_H +/* Define if you have the header file. */ +#undef HAVE_GETOPT_H + /* Define if you have the header file. */ #undef HAVE_LIMITS_H diff --git a/darkice/trunk/configure.in b/darkice/trunk/configure.in index f56c35a..f4298a8 100644 --- a/darkice/trunk/configure.in +++ b/darkice/trunk/configure.in @@ -9,7 +9,7 @@ AC_PROG_INSTALL dnl AC_STDC_HEADERS AC_HAVE_HEADERS(errno.h fcntl.h stdio.h stdlib.h string.h unistd.h limits.h) -AC_HAVE_HEADERS(signal.h sys/time.h sys/types.h sys/soundcard.h) +AC_HAVE_HEADERS(getopt.h signal.h sys/time.h sys/types.h sys/soundcard.h) AC_HAVE_HEADERS(netdb.h netinet/in.h sys/ioctl.h sys/socket.h sys/stat.h) AC_HEADER_SYS_WAIT() diff --git a/darkice/trunk/darkice.cfg b/darkice/trunk/darkice.cfg index 8c49142..b64f051 100644 --- a/darkice/trunk/darkice.cfg +++ b/darkice/trunk/darkice.cfg @@ -23,7 +23,7 @@ genre = live public = no remoteDumpFile = /tmp/live96.mp3 -[lame0] +[lame1] encoder = notlame bitrate = 24 lowpass = 8500