From 03052d825891048b7cc296ead643e2b4b63b6a97 Mon Sep 17 00:00:00 2001 From: darkeye Date: Sun, 26 Aug 2001 08:43:13 +0000 Subject: [PATCH] added support for unlimited time encoding --- darkice/trunk/AUTHORS | 6 +++++- darkice/trunk/ChangeLog | 5 +++++ darkice/trunk/README | 2 +- darkice/trunk/TODO | 1 - darkice/trunk/configure.in | 2 +- darkice/trunk/src/Connector.cpp | 5 ++++- darkice/trunk/src/main.cpp | 5 ++++- 7 files changed, 20 insertions(+), 6 deletions(-) diff --git a/darkice/trunk/AUTHORS b/darkice/trunk/AUTHORS index 0276ca3..7788811 100644 --- a/darkice/trunk/AUTHORS +++ b/darkice/trunk/AUTHORS @@ -1,4 +1,8 @@ DarkIce is being written by: - Akos Maroy, darkeye@users.sourceforge.net + Akos Maroy, + +with contributions by: + + Jim Crilly, diff --git a/darkice/trunk/ChangeLog b/darkice/trunk/ChangeLog index 8401a2f..96e7412 100644 --- a/darkice/trunk/ChangeLog +++ b/darkice/trunk/ChangeLog @@ -1,3 +1,8 @@ +26-08-2001: DarkIce 0.3.1 released + + o support for unlimited time encoding + thanks to Jim Crilly, + 20-12-2000: DarkIce 0.3 released o added POSIX real-time scheduling diff --git a/darkice/trunk/README b/darkice/trunk/README index 3d70082..9897028 100644 --- a/darkice/trunk/README +++ b/darkice/trunk/README @@ -62,7 +62,7 @@ This section describes general operational parameters. Required values: -duration Time for DarkIce to run, in seconds. +duration Time for DarkIce to run, in seconds. If 0, run forever. 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. diff --git a/darkice/trunk/TODO b/darkice/trunk/TODO index 26f8a10..c98126f 100644 --- a/darkice/trunk/TODO +++ b/darkice/trunk/TODO @@ -5,5 +5,4 @@ o make a master config file, and a small one o add support for shared object lame o add support for VBR encoding o reconnect to server if connection is dropped -o add support for unlimited time encoding o add support for multiple servers for one stream diff --git a/darkice/trunk/configure.in b/darkice/trunk/configure.in index cf6f810..f125927 100644 --- a/darkice/trunk/configure.in +++ b/darkice/trunk/configure.in @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(src/DarkIce.cpp) -AM_INIT_AUTOMAKE(darkice, 0.3) +AM_INIT_AUTOMAKE(darkice, 0.3.1) AM_CONFIG_HEADER(configure.h) diff --git a/darkice/trunk/src/Connector.cpp b/darkice/trunk/src/Connector.cpp index 4971441..2bb20f3 100644 --- a/darkice/trunk/src/Connector.cpp +++ b/darkice/trunk/src/Connector.cpp @@ -267,7 +267,7 @@ Connector :: transfer ( unsigned long bytes, reportEvent( 6, "Connector :: tranfer, bytes", bytes); - for ( b = 0; b < bytes; ) { + for ( b = 0; !bytes || b < bytes; ) { unsigned int d = 0; unsigned int e = 0; @@ -333,6 +333,9 @@ Connector :: close ( void ) throw ( Exception ) $Source$ $Log$ + Revision 1.5 2001/08/26 08:43:13 darkeye + added support for unlimited time encoding + Revision 1.4 2000/11/15 18:37:37 darkeye changed the transferable number of bytes to unsigned long diff --git a/darkice/trunk/src/main.cpp b/darkice/trunk/src/main.cpp index 3dfe279..c99fc9c 100644 --- a/darkice/trunk/src/main.cpp +++ b/darkice/trunk/src/main.cpp @@ -86,7 +86,7 @@ main ( cout << "DarkIce " << VERSION << " live audio streamer, http://darkice.sourceforge.net" << endl; - cout << "Copyright (C) 2000, Tyrell Hungary, http://tyrell.hu" << endl; + cout << "Copyright (c) 2000-2001, Tyrell Hungary, http://tyrell.hu" << endl; cout << endl; try { @@ -171,6 +171,9 @@ showUsage ( ostream & os ) $Source$ $Log$ + Revision 1.6 2001/08/26 08:43:13 darkeye + added support for unlimited time encoding + Revision 1.5 2000/11/15 18:08:43 darkeye added multiple verbosity-level event reporting and verbosity command line option