diff --git a/darkice/trunk/README b/darkice/trunk/README index 9e7c042..e9dbc6c 100644 --- a/darkice/trunk/README +++ b/darkice/trunk/README @@ -1,5 +1,5 @@ -DarkIce live audio streamer, http://darkice.sourceforge.net -Copyright (c) 2000-2006, Tyrell Hungary, http://tyrell.hu +DarkIce live audio streamer, http://darkice.tyrell.hu/ +Copyright (c) 2000-2007, Tyrell Hungary, http://tyrell.hu/ Contents @@ -18,7 +18,7 @@ takes audio input from a sound card, encodes it into mp3 and/or Ogg Vorbis, and sends the mp3 stream to one or more IceCast and/or ShoutCast servers, the Ogg Vorbis stream to one or more IceCast2 servers. -DarkIce is hosted on SourceForge, at http://darkice.sourceforge.net/ +DarkIce is hosted by Tyrell Corporation, at http://darkice.tyrell.hu/ 2. Compiling and installing @@ -45,7 +45,8 @@ man darkice -------------------- When DarkIce core dumps, please send the backtrace along with your error -report to the darkice mailing list: darkice-list@lists.sourceforge.net +report to the darkice mailing list: darkice-list@lists.tyrell.hu. +Alternatively you could file a bug report at http://darkice.tyrell.hu/trac To get the backtrace information, you need gdb, the GNU debugger: 1. configure and compile using the --with-debug option: diff --git a/darkice/trunk/man/darkice.1 b/darkice/trunk/man/darkice.1 index 6545c39..a59f288 100644 --- a/darkice/trunk/man/darkice.1 +++ b/darkice/trunk/man/darkice.1 @@ -72,7 +72,7 @@ darkice.cfg(5) .SH AUTHOR Akos Maroy -.I +.I .SH ACKNOWLEDGEMENTS @@ -105,7 +105,7 @@ Developed with contributions by .SH LINKS Project homepage: -.I http://darkice.sourceforge.net/ +.I http://darkice.tyrell.hu/ .B IceCast homepage: diff --git a/darkice/trunk/man/darkice.cfg.5 b/darkice/trunk/man/darkice.cfg.5 index 842abc2..704860c 100644 --- a/darkice/trunk/man/darkice.cfg.5 +++ b/darkice/trunk/man/darkice.cfg.5 @@ -1,4 +1,4 @@ -.TH darkice.cfg 5 "January 25, 2006" "DarkIce" "DarkIce live audio streamer" +.TH darkice.cfg 5 "January 14, 2007" "DarkIce" "DarkIce live audio streamer" .SH NAME darkice.cfg \- configuration file for darkice .SH DESCRIPTION @@ -624,12 +624,12 @@ darkice(1) .SH AUTHOR Akos Maroy -.I +.I .SH LINKS Project homepage: -.I http://darkice.sourceforge.net/ +.I http://darkice.tyrell.hu/ .B IceCast homepage: diff --git a/darkice/trunk/src/AlsaDspSource.cpp b/darkice/trunk/src/AlsaDspSource.cpp index 94eef6d..0e443d1 100644 --- a/darkice/trunk/src/AlsaDspSource.cpp +++ b/darkice/trunk/src/AlsaDspSource.cpp @@ -1,5 +1,7 @@ /*------------------------------------------------------------------------------ + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. + Copyright (c) 2004 LS Informationstechnik (LIKE) University of Erlangen Nuremberg @@ -10,7 +12,7 @@ File : AlsaDspSource.cpp Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -286,25 +288,3 @@ AlsaDspSource :: close ( void ) throw ( Exception ) #endif // HAVE_ALSA_LIB - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.4 2005/04/04 08:36:16 darkeye - commited changes to enable Jack support - thanks to Nicholas J. Humfrey, njh@ecs.soton.ac.uk - - Revision 1.3 2005/04/03 05:00:14 jbebel - Fixing code documentation of buffer overruns - - Revision 1.2 2004/02/15 22:36:57 darkeye - proper checking to see if ALSA support is present / needed - - Revision 1.1 2004/02/15 12:06:29 darkeye - added ALSA support, thanks to Christian Forster - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/AlsaDspSource.h b/darkice/trunk/src/AlsaDspSource.h index 25ec320..bee97b8 100644 --- a/darkice/trunk/src/AlsaDspSource.h +++ b/darkice/trunk/src/AlsaDspSource.h @@ -1,5 +1,7 @@ /*------------------------------------------------------------------------------ + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. + Copyright (c) 2004 LS Informationstechnik (LIKE) University of Erlangen Nuremberg @@ -10,7 +12,7 @@ File : AlsaDspSource.h Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -295,18 +297,3 @@ class AlsaDspSource : public AudioSource, public virtual Reporter #endif /* ALSA_SOURCE_H */ - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.2 2005/04/14 11:53:17 darkeye - fixed API documentation issues - - Revision 1.1 2004/02/15 12:06:29 darkeye - added ALSA support, thanks to Christian Forster - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/AudioEncoder.h b/darkice/trunk/src/AudioEncoder.h index cddb022..e8fbf31 100644 --- a/darkice/trunk/src/AudioEncoder.h +++ b/darkice/trunk/src/AudioEncoder.h @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------------ - Copyright (c) 2000 Tyrell Corporation. All rights reserved. + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. Tyrell DarkIce File : AudioEncoder.h Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -491,39 +491,3 @@ class AudioEncoder : public Sink, public virtual Referable #endif /* AUDIO_ENCODER_H */ - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.9 2005/04/13 18:03:43 jbebel - Allow quality settings down to -0.1 for ogg - - Revision 1.8 2002/08/20 19:35:37 darkeye - added possibility to specify maximum bitrate for Ogg Vorbis streams - - Revision 1.7 2002/04/13 11:26:00 darkeye - added cbr, abr and vbr setting feature with encoding quality - - Revision 1.6 2002/03/28 16:39:32 darkeye - added interface for variable bitrate encoding - - Revision 1.5 2002/02/19 15:23:59 darkeye - fixed typo - - Revision 1.4 2001/09/18 14:57:19 darkeye - finalized Solaris port - - Revision 1.3 2001/09/14 19:31:06 darkeye - added IceCast2 / vorbis support - - Revision 1.2 2000/11/12 14:54:50 darkeye - added kdoc-style documentation comments - - Revision 1.1.1.1 2000/11/05 10:05:47 darkeye - initial version - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/AudioSource.cpp b/darkice/trunk/src/AudioSource.cpp index e9e63d7..95187ad 100644 --- a/darkice/trunk/src/AudioSource.cpp +++ b/darkice/trunk/src/AudioSource.cpp @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------------ - Copyright (c) 2004 Tyrell Corporation. All rights reserved. + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. Tyrell DarkIce File : AudioSource.cpp Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -111,22 +111,3 @@ AudioSource :: createDspSource( const char * deviceName, } } - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.3 2005/04/04 08:36:16 darkeye - commited changes to enable Jack support - thanks to Nicholas J. Humfrey, njh@ecs.soton.ac.uk - - Revision 1.2 2004/02/15 22:26:16 darkeye - fixed typo, minimal cosmetic change - - Revision 1.1 2004/02/15 12:06:29 darkeye - added ALSA support, thanks to Christian Forster - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/AudioSource.h b/darkice/trunk/src/AudioSource.h index 211bd47..59c4b0b 100644 --- a/darkice/trunk/src/AudioSource.h +++ b/darkice/trunk/src/AudioSource.h @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------------ - Copyright (c) 2000 Tyrell Corporation. All rights reserved. + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. Tyrell DarkIce File : AudioSource.h Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -301,40 +301,3 @@ class AudioSource : public Source, public virtual Reporter #endif /* AUDIO_SOURCE_H */ - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.9 2005/04/14 11:53:17 darkeye - fixed API documentation issues - - Revision 1.8 2005/04/04 08:36:16 darkeye - commited changes to enable Jack support - thanks to Nicholas J. Humfrey, njh@ecs.soton.ac.uk - - Revision 1.7 2004/02/18 21:08:11 darkeye - ported to OpenBSD (real-time scheduling not yet supported) - - Revision 1.6 2004/02/15 12:06:29 darkeye - added ALSA support, thanks to Christian Forster - - Revision 1.5 2001/09/18 14:57:19 darkeye - finalized Solaris port - - Revision 1.4 2001/09/11 15:05:21 darkeye - added Solaris support - - Revision 1.3 2000/11/12 13:31:40 darkeye - added kdoc-style documentation comments - - Revision 1.2 2000/11/05 17:37:24 darkeye - removed clone() functions - - Revision 1.1.1.1 2000/11/05 10:05:47 darkeye - initial version - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/BufferedSink.cpp b/darkice/trunk/src/BufferedSink.cpp index d82cbfb..aabbadd 100644 --- a/darkice/trunk/src/BufferedSink.cpp +++ b/darkice/trunk/src/BufferedSink.cpp @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------------ - Copyright (c) 2000 Tyrell Corporation. All rights reserved. + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. Tyrell DarkIce File : BufferedSink.cpp Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ the buffer is filled like this: @@ -366,30 +366,3 @@ BufferedSink :: close ( void ) throw ( Exception ) inp = outp = buffer; } - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.6 2002/10/19 12:21:28 darkeye - fixed comment typo - - Revision 1.5 2001/08/30 17:25:56 darkeye - renamed configure.h to config.h - - Revision 1.4 2000/11/11 12:33:13 darkeye - added kdoc-style documentation - - Revision 1.3 2000/11/10 20:16:21 darkeye - first real tests with multiple streaming - - Revision 1.2 2000/11/05 14:08:27 darkeye - changed builting to an automake / autoconf environment - - Revision 1.1.1.1 2000/11/05 10:05:48 darkeye - initial version - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/BufferedSink.h b/darkice/trunk/src/BufferedSink.h index 177622c..99a03f2 100644 --- a/darkice/trunk/src/BufferedSink.h +++ b/darkice/trunk/src/BufferedSink.h @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------------ - Copyright (c) 2000 Tyrell Corporation. All rights reserved. + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. Tyrell DarkIce File : BufferedSink.h Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -397,37 +397,3 @@ class BufferedSink : public Sink, public virtual Reporter #endif /* BUFFERED_SINK_H */ - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.8 2005/04/03 05:01:46 jbebel - Fix peak reporting to report new peak rather than previous - - Revision 1.7 2002/07/21 08:47:06 darkeye - some exception cleanup (throw clauses in function declarations) - - Revision 1.6 2002/05/28 12:35:41 darkeye - code cleanup: compiles under gcc-c++ 3.1, using -pedantic option - - Revision 1.5 2000/11/15 18:08:42 darkeye - added multiple verbosity-level event reporting and verbosity command - line option - - Revision 1.4 2000/11/11 12:33:13 darkeye - added kdoc-style documentation - - Revision 1.3 2000/11/10 20:16:21 darkeye - first real tests with multiple streaming - - Revision 1.2 2000/11/05 17:37:24 darkeye - removed clone() functions - - Revision 1.1.1.1 2000/11/05 10:05:48 darkeye - initial version - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/CastSink.cpp b/darkice/trunk/src/CastSink.cpp index dc3368e..363bffe 100644 --- a/darkice/trunk/src/CastSink.cpp +++ b/darkice/trunk/src/CastSink.cpp @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------------ - Copyright (c) 2000 Tyrell Corporation. All rights reserved. + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. Tyrell DarkIce File : CastSink.cpp Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -139,41 +139,3 @@ CastSink :: open ( void ) throw ( Exception ) } - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.9 2002/04/09 13:10:43 darkeye - resolved memory leak issue introduced in 0.9 - - Revision 1.8 2002/03/28 16:40:55 darkeye - slight changes to allow for variable bitrate streams - (where the value of bitrate is 0) - - Revision 1.7 2002/02/28 09:49:25 darkeye - added possibility to save the encoded stream to a local file only - (no streaming server needed) - - Revision 1.6 2002/02/20 11:54:11 darkeye - added local dump file possibility - - Revision 1.5 2001/09/09 11:27:31 darkeye - added support for ShoutCast servers - - Revision 1.4 2001/08/29 21:08:30 darkeye - made some description options in the darkice config file optional - - Revision 1.3 2000/11/12 14:54:50 darkeye - added kdoc-style documentation comments - - Revision 1.2 2000/11/10 20:14:11 darkeye - added support for remote dump file - - Revision 1.1.1.1 2000/11/05 10:05:48 darkeye - initial version - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/CastSink.h b/darkice/trunk/src/CastSink.h index 117e36f..a513056 100644 --- a/darkice/trunk/src/CastSink.h +++ b/darkice/trunk/src/CastSink.h @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------------ - Copyright (c) 2000 Tyrell Corporation. All rights reserved. + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. Tyrell DarkIce File : CastSink.h Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -478,36 +478,3 @@ class CastSink : public Sink, public virtual Reporter #endif /* CAST_SINK_H */ - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.8 2004/01/05 12:00:00 darkeye - fixed possible null pointer problem when destroying the object - - Revision 1.7 2002/02/20 11:54:11 darkeye - added local dump file possibility - - Revision 1.6 2001/09/09 11:27:31 darkeye - added support for ShoutCast servers - - Revision 1.5 2001/08/29 21:08:30 darkeye - made some description options in the darkice config file optional - - Revision 1.4 2000/11/12 14:54:50 darkeye - added kdoc-style documentation comments - - Revision 1.3 2000/11/10 20:14:11 darkeye - added support for remote dump file - - Revision 1.2 2000/11/05 17:37:24 darkeye - removed clone() functions - - Revision 1.1.1.1 2000/11/05 10:05:48 darkeye - initial version - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/ConfigSection.cpp b/darkice/trunk/src/ConfigSection.cpp index 929cc20..06d5db0 100644 --- a/darkice/trunk/src/ConfigSection.cpp +++ b/darkice/trunk/src/ConfigSection.cpp @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------------ - Copyright (c) 2000 Tyrell Corporation. All rights reserved. + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. Tyrell ConfigSection File : ConfigSection.cpp Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -171,46 +171,3 @@ ConfigSection :: addLine ( const char * line ) throw ( Exception ) return add( key.c_str(), value.c_str()); } - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.8 2002/05/28 12:35:41 darkeye - code cleanup: compiles under gcc-c++ 3.1, using -pedantic option - - Revision 1.7 2001/10/19 09:20:09 darkeye - config file now may contain tabs also as white space - - Revision 1.6 2001/09/09 11:26:43 darkeye - full line comments skipped earlier: commens allowed before the first secion - - Revision 1.5 2001/09/05 20:11:15 darkeye - removed dependency on locally stored SGI STL header files - now compiler-supplied C++ library STL header files are used - compiles under GNU C++ 3 - hash_map (an SGI extension to STL) replaced with map - std:: namespace prefix added to all STL class references - - Revision 1.4 2001/08/30 17:25:56 darkeye - renamed configure.h to config.h - - Revision 1.3 2000/11/13 18:46:50 darkeye - added kdoc-style documentation comments - - Revision 1.2 2000/11/09 22:08:17 darkeye - added function getForSure - - Revision 1.1 2000/11/08 17:29:50 darkeye - added configuration file reader - - Revision 1.2 2000/11/05 14:08:27 darkeye - changed builting to an automake / autoconf environment - - Revision 1.1.1.1 2000/11/05 10:05:49 darkeye - initial version - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/ConfigSection.h b/darkice/trunk/src/ConfigSection.h index a20dc47..e86ba8f 100644 --- a/darkice/trunk/src/ConfigSection.h +++ b/darkice/trunk/src/ConfigSection.h @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------------ - Copyright (c) 2000 Tyrell Corporation. All rights reserved. + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. Tyrell ConfigSection File : ConfigSection.h Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -182,31 +182,3 @@ class ConfigSection : public virtual Referable #endif /* CONFIG_SECTION_H */ - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.4 2001/09/05 20:11:15 darkeye - removed dependency on locally stored SGI STL header files - now compiler-supplied C++ library STL header files are used - compiles under GNU C++ 3 - hash_map (an SGI extension to STL) replaced with map - std:: namespace prefix added to all STL class references - - Revision 1.3 2000/11/13 18:46:50 darkeye - added kdoc-style documentation comments - - Revision 1.2 2000/11/09 22:08:17 darkeye - added function getForSure - - Revision 1.1 2000/11/08 17:29:50 darkeye - added configuration file reader - - Revision 1.1.1.1 2000/11/05 10:05:50 darkeye - initial version - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/Connector.cpp b/darkice/trunk/src/Connector.cpp index bfacb92..ed0a593 100644 --- a/darkice/trunk/src/Connector.cpp +++ b/darkice/trunk/src/Connector.cpp @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------------ - Copyright (c) 2000 Tyrell Corporation. All rights reserved. + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. Tyrell DarkIce File : Connector.cpp Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -356,49 +356,3 @@ Connector :: close ( void ) throw ( Exception ) } - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.11 2002/10/20 20:42:56 darkeye - cosmetic changes - - Revision 1.10 2002/10/19 12:24:55 darkeye - anged internals so that now each encoding/server connection is - a separate thread - - Revision 1.9 2002/08/02 17:59:17 darkeye - bug fix: when the last server dropped connection, darkice crashed - - Revision 1.8 2002/07/20 16:37:06 darkeye - added fault tolerance in case a server connection is dropped - - Revision 1.7 2002/05/28 12:35:41 darkeye - code cleanup: compiles under gcc-c++ 3.1, using -pedantic option - - Revision 1.6 2001/08/26 20:44:30 darkeye - removed external command-line encoder support - replaced it with a shared-object support for lame with the possibility - of static linkage - - 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 - - Revision 1.3 2000/11/15 18:08:43 darkeye - added multiple verbosity-level event reporting and verbosity command - line option - - Revision 1.2 2000/11/13 18:46:50 darkeye - added kdoc-style documentation comments - - Revision 1.1.1.1 2000/11/05 10:05:49 darkeye - initial version - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/Connector.h b/darkice/trunk/src/Connector.h index eea3215..a2e96bb 100644 --- a/darkice/trunk/src/Connector.h +++ b/darkice/trunk/src/Connector.h @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------------ - Copyright (c) 2000 Tyrell Corporation. All rights reserved. + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. Tyrell DarkIce File : Connector.h Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -262,34 +262,3 @@ class Connector : public virtual Referable, public virtual Reporter #endif /* CONNECTOR_H */ - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.6 2002/10/19 12:24:55 darkeye - anged internals so that now each encoding/server connection is - a separate thread - - Revision 1.5 2001/08/26 20:44:30 darkeye - removed external command-line encoder support - replaced it with a shared-object support for lame with the possibility - of static linkage - - Revision 1.4 2000/11/15 18:37:37 darkeye - changed the transferable number of bytes to unsigned long - - Revision 1.3 2000/11/15 18:08:43 darkeye - added multiple verbosity-level event reporting and verbosity command - line option - - Revision 1.2 2000/11/13 18:46:50 darkeye - added kdoc-style documentation comments - - Revision 1.1.1.1 2000/11/05 10:05:49 darkeye - initial version - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/DarkIce.cpp b/darkice/trunk/src/DarkIce.cpp index 0bb3e8f..864f66d 100644 --- a/darkice/trunk/src/DarkIce.cpp +++ b/darkice/trunk/src/DarkIce.cpp @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------------ - Copyright (c) 2000 Tyrell Corporation. All rights reserved. + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. Tyrell DarkIce File : DarkIce.cpp Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -1150,173 +1150,3 @@ DarkIce :: cut ( void ) throw () reportEvent( 5, "cutting ends"); } - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.49 2006/03/23 09:34:57 darkeye - fixed checking for mp3 and mp2 lib support for icecast-1.x streams - - Revision 1.48 2006/01/27 15:02:05 darkeye - fixued issue of compiling without lame, but with twolame - - Revision 1.47 2006/01/25 22:47:15 darkeye - added mpeg2 support, thanks to Nicholas J Humfrey - - Revision 1.46 2006/01/19 16:09:05 darkeye - added check for bufferSecs setting not to be 0 - - Revision 1.45 2005/10/22 10:34:21 darkeye - added highpass and lowpass values to icecast2 sections - - Revision 1.44 2005/04/16 21:57:34 darkeye - added AAC support through the faac codec, http://www.audiocoding.com/ - - Revision 1.43 2005/04/11 19:27:43 darkeye - added option to turn off automatic reconnect feature - - Revision 1.42 2005/04/04 08:36:17 darkeye - commited changes to enable Jack support - thanks to Nicholas J. Humfrey, njh@ecs.soton.ac.uk - - Revision 1.41 2005/04/03 05:12:20 jbebel - Changed mechanism for testing the presence of the quality value such that - zero is a valid option. - - Revision 1.40 2004/02/23 19:12:51 darkeye - ported to NetBSD - - Revision 1.39 2004/02/19 06:47:06 darkeye - finalized OpenBSD port - - Revision 1.38 2004/02/18 21:08:11 darkeye - ported to OpenBSD (real-time scheduling not yet supported) - - Revision 1.37 2004/02/15 12:14:38 darkeye - added patch to allow mp3 stream downsampling to mono for icecast2 as well - - Revision 1.36 2004/02/15 12:06:30 darkeye - added ALSA support, thanks to Christian Forster - - Revision 1.35 2003/02/09 13:15:57 darkeye - added feature for setting the TITLE comment field for vorbis streams - - Revision 1.34 2003/02/09 12:57:36 darkeye - cosmetic changes to the fileAddDate option - - Revision 1.33 2002/11/20 16:52:05 wandereq - added fileAddDate function - - Revision 1.32 2002/10/19 12:24:55 darkeye - anged internals so that now each encoding/server connection is - a separate thread - - Revision 1.31 2002/08/20 19:35:37 darkeye - added possibility to specify maximum bitrate for Ogg Vorbis streams - - Revision 1.30 2002/08/20 18:37:49 darkeye - added mp3 streaming possibility for icecast2 - - Revision 1.29 2002/08/03 12:41:18 darkeye - added possibility to stream in mono when recording in stereo - - Revision 1.28 2002/07/20 10:59:00 darkeye - added support for Ogg Vorbis 1.0, removed support for rc2 - - Revision 1.27 2002/04/13 11:26:00 darkeye - added cbr, abr and vbr setting feature with encoding quality - - Revision 1.26 2002/03/28 16:43:11 darkeye - enabled resampling and variable bitrates for vorbis (icecast2) streams - - Revision 1.25 2002/02/28 09:49:25 darkeye - added possibility to save the encoded stream to a local file only - (no streaming server needed) - - Revision 1.24 2002/02/20 11:54:11 darkeye - added local dump file possibility - - Revision 1.23 2002/02/20 10:35:35 darkeye - updated to work with Ogg Vorbis libs rc3 and current IceCast2 cvs - - Revision 1.22 2001/10/20 10:56:45 darkeye - added possibility to disable highpass and lowpass filters for lame - - Revision 1.21 2001/10/19 12:39:42 darkeye - created configure options to compile with or without lame / Ogg Vorbis - - Revision 1.20 2001/10/19 09:03:39 darkeye - added support for resampling mp3 streams - - Revision 1.19 2001/09/14 19:31:06 darkeye - added IceCast2 / vorbis support - - Revision 1.18 2001/09/11 15:05:21 darkeye - added Solaris support - - Revision 1.17 2001/09/09 11:27:31 darkeye - added support for ShoutCast servers - - Revision 1.16 2001/09/05 20:11:15 darkeye - removed dependency on locally stored SGI STL header files - now compiler-supplied C++ library STL header files are used - compiles under GNU C++ 3 - hash_map (an SGI extension to STL) replaced with map - std:: namespace prefix added to all STL class references - - Revision 1.15 2001/08/30 17:25:56 darkeye - renamed configure.h to config.h - - Revision 1.14 2001/08/29 21:08:30 darkeye - made some description options in the darkice config file optional - - Revision 1.13 2001/08/26 20:44:30 darkeye - removed external command-line encoder support - replaced it with a shared-object support for lame with the possibility - of static linkage - - Revision 1.12 2000/12/20 12:36:47 darkeye - added POSIX real-time scheduling - - Revision 1.11 2000/11/18 11:13:27 darkeye - removed direct reference to cout, except from main.cpp - all class use the Reporter interface to report events - - Revision 1.10 2000/11/17 15:50:48 darkeye - added -Wall flag to compiler and eleminated new warnings - - Revision 1.9 2000/11/15 18:37:37 darkeye - changed the transferable number of bytes to unsigned long - - Revision 1.8 2000/11/15 18:08:43 darkeye - added multiple verbosity-level event reporting and verbosity command - line option - - Revision 1.7 2000/11/13 19:38:55 darkeye - moved command line parameter parsing from DarkIce.cpp to main.cpp - - Revision 1.6 2000/11/13 18:46:50 darkeye - added kdoc-style documentation comments - - Revision 1.5 2000/11/10 20:16:21 darkeye - first real tests with multiple streaming - - Revision 1.4 2000/11/09 22:09:46 darkeye - added multiple outputs - added configuration reading - added command line processing - - Revision 1.3 2000/11/08 17:29:50 darkeye - added configuration file reader - - Revision 1.2 2000/11/05 14:08:27 darkeye - changed builting to an automake / autoconf environment - - Revision 1.1.1.1 2000/11/05 10:05:49 darkeye - initial version - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/DarkIce.h b/darkice/trunk/src/DarkIce.h index 5729bb7..bdeac5e 100644 --- a/darkice/trunk/src/DarkIce.h +++ b/darkice/trunk/src/DarkIce.h @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------------ - Copyright (c) 2000 Tyrell Corporation. All rights reserved. + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. Tyrell DarkIce File : DarkIce.h Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -317,67 +317,3 @@ class DarkIce : public virtual Referable, public virtual Reporter #endif /* DARK_ICE_H */ - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.16 2006/01/25 22:47:15 darkeye - added mpeg2 support, thanks to Nicholas J Humfrey - - Revision 1.15 2005/04/04 08:36:17 darkeye - commited changes to enable Jack support - thanks to Nicholas J. Humfrey, njh@ecs.soton.ac.uk - - Revision 1.14 2002/05/28 12:35:41 darkeye - code cleanup: compiles under gcc-c++ 3.1, using -pedantic option - - Revision 1.13 2002/02/28 09:49:25 darkeye - added possibility to save the encoded stream to a local file only - (no streaming server needed) - - Revision 1.12 2001/09/14 19:31:06 darkeye - added IceCast2 / vorbis support - - Revision 1.11 2001/09/11 15:05:21 darkeye - added Solaris support - - Revision 1.10 2001/09/09 11:27:31 darkeye - added support for ShoutCast servers - - Revision 1.9 2001/08/30 17:25:56 darkeye - renamed configure.h to config.h - - Revision 1.8 2001/08/26 20:44:30 darkeye - removed external command-line encoder support - replaced it with a shared-object support for lame with the possibility - of static linkage - - Revision 1.7 2000/12/20 12:36:47 darkeye - added POSIX real-time scheduling - - Revision 1.6 2000/11/15 18:08:43 darkeye - added multiple verbosity-level event reporting and verbosity command - line option - - Revision 1.5 2000/11/13 19:38:55 darkeye - moved command line parameter parsing from DarkIce.cpp to main.cpp - - Revision 1.4 2000/11/13 18:46:50 darkeye - added kdoc-style documentation comments - - Revision 1.3 2000/11/10 20:16:21 darkeye - first real tests with multiple streaming - - Revision 1.2 2000/11/09 22:09:46 darkeye - added multiple outputs - added configuration reading - added command line processing - - Revision 1.1.1.1 2000/11/05 10:05:50 darkeye - initial version - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/DarkIceConfig.cpp b/darkice/trunk/src/DarkIceConfig.cpp index 1584a45..a96e098 100644 --- a/darkice/trunk/src/DarkIceConfig.cpp +++ b/darkice/trunk/src/DarkIceConfig.cpp @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------------ - Copyright (c) 2000 Tyrell Corporation. All rights reserved. + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. Tyrell Config File : DarkIceConfig.cpp Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -164,47 +164,3 @@ Config :: read ( std::istream & is ) throw ( Exception ) } - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.1 2005/04/04 08:36:17 darkeye - commited changes to enable Jack support - thanks to Nicholas J. Humfrey, njh@ecs.soton.ac.uk - - Revision 1.7 2002/05/28 12:35:41 darkeye - code cleanup: compiles under gcc-c++ 3.1, using -pedantic option - - Revision 1.6 2001/10/19 09:20:09 darkeye - config file now may contain tabs also as white space - - Revision 1.5 2001/09/09 11:26:43 darkeye - full line comments skipped earlier: commens allowed before the first secion - - Revision 1.4 2001/09/05 20:11:15 darkeye - removed dependency on locally stored SGI STL header files - now compiler-supplied C++ library STL header files are used - compiles under GNU C++ 3 - hash_map (an SGI extension to STL) replaced with map - std:: namespace prefix added to all STL class references - - Revision 1.3 2001/08/30 17:25:56 darkeye - renamed configure.h to config.h - - Revision 1.2 2000/11/13 18:46:50 darkeye - added kdoc-style documentation comments - - Revision 1.1 2000/11/08 17:29:50 darkeye - added configuration file reader - - Revision 1.2 2000/11/05 14:08:27 darkeye - changed builting to an automake / autoconf environment - - Revision 1.1.1.1 2000/11/05 10:05:49 darkeye - initial version - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/DarkIceConfig.h b/darkice/trunk/src/DarkIceConfig.h index 7e390ee..3000d02 100644 --- a/darkice/trunk/src/DarkIceConfig.h +++ b/darkice/trunk/src/DarkIceConfig.h @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------------ - Copyright (c) 2000 Tyrell Corporation. All rights reserved. + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. Tyrell Config File : DarkIceConfig.h Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -207,41 +207,3 @@ class Config : public virtual Referable #endif /* CONFIG_H */ - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.2 2005/04/14 11:53:17 darkeye - fixed API documentation issues - - Revision 1.1 2005/04/04 08:36:17 darkeye - commited changes to enable Jack support - thanks to Nicholas J. Humfrey, njh@ecs.soton.ac.uk - - Revision 1.5 2002/05/28 12:35:41 darkeye - code cleanup: compiles under gcc-c++ 3.1, using -pedantic option - - Revision 1.4 2001/09/05 20:11:15 darkeye - removed dependency on locally stored SGI STL header files - now compiler-supplied C++ library STL header files are used - compiles under GNU C++ 3 - hash_map (an SGI extension to STL) replaced with map - std:: namespace prefix added to all STL class references - - Revision 1.3 2000/11/13 18:46:50 darkeye - added kdoc-style documentation comments - - Revision 1.2 2000/11/09 22:07:19 darkeye - added constructor with istream - - Revision 1.1 2000/11/08 17:29:50 darkeye - added configuration file reader - - Revision 1.1.1.1 2000/11/05 10:05:50 darkeye - initial version - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/Exception.cpp b/darkice/trunk/src/Exception.cpp index 5bb40e2..b3198e8 100644 --- a/darkice/trunk/src/Exception.cpp +++ b/darkice/trunk/src/Exception.cpp @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------------ - Copyright (c) 2000 Tyrell Corporation. All rights reserved. + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. Tyrell DarkIce File : Exception.cpp Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -199,30 +199,3 @@ Exception :: strip ( void ) throw () - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.6 2002/05/28 12:35:41 darkeye - code cleanup: compiles under gcc-c++ 3.1, using -pedantic option - - Revision 1.5 2001/08/30 17:25:56 darkeye - renamed configure.h to config.h - - Revision 1.4 2000/11/11 12:33:13 darkeye - added kdoc-style documentation - - Revision 1.3 2000/11/09 22:05:44 darkeye - added multiple-string constructors - - Revision 1.2 2000/11/05 14:08:27 darkeye - changed builting to an automake / autoconf environment - - Revision 1.1.1.1 2000/11/05 10:05:50 darkeye - initial version - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/Exception.h b/darkice/trunk/src/Exception.h index 2f58e49..dbe8473 100644 --- a/darkice/trunk/src/Exception.h +++ b/darkice/trunk/src/Exception.h @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------------ - Copyright (c) 2000 Tyrell Corporation. All rights reserved. + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. Tyrell DarkIce File : Exception.h Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -296,30 +296,3 @@ operator<< ( std::ostream & os, #endif /* EXCEPTION_H */ - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.6 2002/05/28 12:35:41 darkeye - code cleanup: compiles under gcc-c++ 3.1, using -pedantic option - - Revision 1.5 2000/11/17 15:33:54 darkeye - bug fix: ostream << operator overload didn't return the ostream - - Revision 1.4 2000/11/11 12:33:13 darkeye - added kdoc-style documentation - - Revision 1.3 2000/11/09 22:05:44 darkeye - added multiple-string constructors - - Revision 1.2 2000/11/05 14:08:27 darkeye - changed builting to an automake / autoconf environment - - Revision 1.1.1.1 2000/11/05 10:05:50 darkeye - initial version - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/FaacEncoder.cpp b/darkice/trunk/src/FaacEncoder.cpp index b8f7c7b..87bd243 100644 --- a/darkice/trunk/src/FaacEncoder.cpp +++ b/darkice/trunk/src/FaacEncoder.cpp @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------------ - Copyright (c) 2005 Tyrell Corporation. All rights reserved. + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. Tyrell DarkIce File : FaacEncoder.cpp Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -189,19 +189,3 @@ FaacEncoder :: close ( void ) throw ( Exception ) #endif // HAVE_FAAC_LIB - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.2 2005/04/16 22:19:20 darkeye - changed remaining typos - - Revision 1.1 2005/04/16 21:57:34 darkeye - added AAC support through the faac codec, http://www.audiocoding.com/ - - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/FaacEncoder.h b/darkice/trunk/src/FaacEncoder.h index 647a716..4589a8a 100644 --- a/darkice/trunk/src/FaacEncoder.h +++ b/darkice/trunk/src/FaacEncoder.h @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------------ - Copyright (c) 2005 Tyrell Corporation. All rights reserved. + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. Tyrell DarkIce File : FaacEncoder.h Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -431,22 +431,3 @@ class FaacEncoder : public AudioEncoder, public virtual Reporter #endif /* AAC_ENCODER_H */ - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.3 2006/01/27 08:51:23 darkeye - fixed issue of double colons at the end of the declaration - - Revision 1.2 2005/04/16 22:19:20 darkeye - changed remaining typos - - Revision 1.1 2005/04/16 21:57:34 darkeye - added AAC support through the faac codec, http://www.audiocoding.com/ - - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/FileCast.cpp b/darkice/trunk/src/FileCast.cpp index 1ce1684..3bcd966 100644 --- a/darkice/trunk/src/FileCast.cpp +++ b/darkice/trunk/src/FileCast.cpp @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------------ - Copyright (c) 2000 Tyrell Corporation. All rights reserved. + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. Tyrell DarkIce File : FileCast.cpp Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -87,17 +87,3 @@ FileCast :: open ( void ) throw ( Exception ) } - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.1 2002/02/28 09:49:25 darkeye - added possibility to save the encoded stream to a local file only - (no streaming server needed) - - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/FileCast.h b/darkice/trunk/src/FileCast.h index 2926ef1..977f3d4 100644 --- a/darkice/trunk/src/FileCast.h +++ b/darkice/trunk/src/FileCast.h @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------------ - Copyright (c) 2000 Tyrell Corporation. All rights reserved. + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. Tyrell DarkIce File : FileCast.h Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -272,17 +272,3 @@ class FileCast : public CastSink #endif /* FILE_CAST_H */ - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.1 2002/02/28 09:49:25 darkeye - added possibility to save the encoded stream to a local file only - (no streaming server needed) - - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/FileSink.cpp b/darkice/trunk/src/FileSink.cpp index e20cbfc..97c7dad 100644 --- a/darkice/trunk/src/FileSink.cpp +++ b/darkice/trunk/src/FileSink.cpp @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------------ - Copyright (c) 2000 Tyrell Corporation. All rights reserved. + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. Tyrell DarkIce File : FileSink.cpp Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -376,35 +376,3 @@ FileSink :: close ( void ) throw ( Exception ) } - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.8 2002/03/28 16:41:49 darkeye - some fixes to typos in comments - - Revision 1.7 2002/02/20 11:54:11 darkeye - added local dump file possibility - - Revision 1.5 2001/09/11 15:05:21 darkeye - added Solaris support - - Revision 1.4 2001/08/26 20:44:30 darkeye - removed external command-line encoder support - replaced it with a shared-object support for lame with the possibility - of static linkage - - Revision 1.3 2000/11/11 12:33:13 darkeye - added kdoc-style documentation - - Revision 1.2 2000/11/05 14:08:27 darkeye - changed builting to an automake / autoconf environment - - Revision 1.1.1.1 2000/11/05 10:05:51 darkeye - initial version - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/FileSink.h b/darkice/trunk/src/FileSink.h index c45cafe..c076599 100644 --- a/darkice/trunk/src/FileSink.h +++ b/darkice/trunk/src/FileSink.h @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------------ - Copyright (c) 2000 Tyrell Corporation. All rights reserved. + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. Tyrell DarkIce File : FileSink.h Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -264,24 +264,3 @@ class FileSink : public Sink, public virtual Reporter #endif /* FILE_SINK_H */ - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.5 2002/02/20 11:54:11 darkeye - added local dump file possibility - - Revision 1.3 2000/11/11 12:33:13 darkeye - added kdoc-style documentation - - Revision 1.2 2000/11/05 17:37:24 darkeye - removed clone() functions - - Revision 1.1.1.1 2000/11/05 10:05:51 darkeye - initial version - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/FileSource.cpp b/darkice/trunk/src/FileSource.cpp index 6ec47e9..f649283 100644 --- a/darkice/trunk/src/FileSource.cpp +++ b/darkice/trunk/src/FileSource.cpp @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------------ - Copyright (c) 2000 Tyrell Corporation. All rights reserved. + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. Tyrell DarkIce File : FileSource.cpp Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -268,29 +268,3 @@ FileSource :: close ( void ) throw ( Exception ) fileDescriptor = 0; } - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.5 2001/09/11 15:05:21 darkeye - added Solaris support - - Revision 1.4 2001/08/26 20:44:30 darkeye - removed external command-line encoder support - replaced it with a shared-object support for lame with the possibility - of static linkage - - Revision 1.3 2000/11/12 13:31:40 darkeye - added kdoc-style documentation comments - - Revision 1.2 2000/11/05 14:08:27 darkeye - changed builting to an automake / autoconf environment - - Revision 1.1.1.1 2000/11/05 10:05:51 darkeye - initial version - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/IceCast.cpp b/darkice/trunk/src/IceCast.cpp index 5c8f810..3230a8c 100644 --- a/darkice/trunk/src/IceCast.cpp +++ b/darkice/trunk/src/IceCast.cpp @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------------ - Copyright (c) 2000 Tyrell Corporation. All rights reserved. + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. Tyrell DarkIce File : IceCast.cpp Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -213,42 +213,3 @@ IceCast :: sendLogin ( void ) throw ( Exception ) } - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.10 2002/05/28 12:35:41 darkeye - code cleanup: compiles under gcc-c++ 3.1, using -pedantic option - - Revision 1.9 2001/11/20 09:06:18 darkeye - fixed public stream reporting - - Revision 1.8 2001/09/14 19:31:06 darkeye - added IceCast2 / vorbis support - - Revision 1.7 2001/09/09 11:27:31 darkeye - added support for ShoutCast servers - - Revision 1.6 2001/08/30 17:25:56 darkeye - renamed configure.h to config.h - - Revision 1.5 2001/08/29 21:08:30 darkeye - made some description options in the darkice config file optional - - Revision 1.4 2000/11/12 14:54:50 darkeye - added kdoc-style documentation comments - - Revision 1.3 2000/11/10 20:14:11 darkeye - added support for remote dump file - - Revision 1.2 2000/11/05 14:08:28 darkeye - changed builting to an automake / autoconf environment - - Revision 1.1.1.1 2000/11/05 10:05:52 darkeye - initial version - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/IceCast.h b/darkice/trunk/src/IceCast.h index 09c3dab..18afd24 100644 --- a/darkice/trunk/src/IceCast.h +++ b/darkice/trunk/src/IceCast.h @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------------ - Copyright (c) 2000 Tyrell Corporation. All rights reserved. + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. Tyrell DarkIce File : IceCast.h Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -259,36 +259,3 @@ class IceCast : public CastSink #endif /* ICE_CAST_H */ - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.8 2005/04/14 11:53:17 darkeye - fixed API documentation issues - - Revision 1.7 2002/02/20 11:54:11 darkeye - added local dump file possibility - - Revision 1.6 2001/09/09 11:27:31 darkeye - added support for ShoutCast servers - - Revision 1.5 2001/08/29 21:08:30 darkeye - made some description options in the darkice config file optional - - Revision 1.4 2000/11/12 14:54:50 darkeye - added kdoc-style documentation comments - - Revision 1.3 2000/11/10 20:14:11 darkeye - added support for remote dump file - - Revision 1.2 2000/11/05 17:37:24 darkeye - removed clone() functions - - Revision 1.1.1.1 2000/11/05 10:05:52 darkeye - initial version - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/IceCast2.cpp b/darkice/trunk/src/IceCast2.cpp index aaa85ed..917e50e 100644 --- a/darkice/trunk/src/IceCast2.cpp +++ b/darkice/trunk/src/IceCast2.cpp @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------------ - Copyright (c) 2000 Tyrell Corporation. All rights reserved. + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. Tyrell DarkIce File : IceCast2.cpp Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -186,7 +186,7 @@ IceCast2 :: sendLogin ( void ) throw ( Exception ) } // send user agent info - str = "\nUser-Agent: DarkIce/" VERSION " (http://darkice.sourceforge.net/)"; + str = "\nUser-Agent: DarkIce/" VERSION " (http://darkice.tyrell.hu/)"; sink->write( str, strlen( str)); // send the ice- headers @@ -254,53 +254,3 @@ IceCast2 :: sendLogin ( void ) throw ( Exception ) } - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.13 2006/01/25 22:47:15 darkeye - added mpeg2 support, thanks to Nicholas J Humfrey - - Revision 1.12 2005/04/16 21:57:34 darkeye - added AAC support through the faac codec, http://www.audiocoding.com/ - - Revision 1.11 2005/04/11 18:32:32 darkeye - changed MIME type to application/ogg, which is now official - - Revision 1.10 2002/11/29 08:14:47 darkeye - fixed minor bug in IcecCast2.cpp, which could have lead to a buffer - overflow - - Revision 1.9 2002/10/20 21:09:35 darkeye - added processing of server response - - Revision 1.8 2002/08/20 20:16:59 darkeye - added User-Agent header to HTTP login - - Revision 1.7 2002/08/20 19:34:43 darkeye - minor fix - - Revision 1.6 2002/08/20 18:39:13 darkeye - added HTTP Basic authentication for icecast2 logins - - Revision 1.5 2002/05/28 12:35:41 darkeye - code cleanup: compiles under gcc-c++ 3.1, using -pedantic option - - Revision 1.4 2002/02/20 10:35:35 darkeye - updated to work with Ogg Vorbis libs rc3 and current IceCast2 cvs - - Revision 1.3 2002/02/19 15:24:26 darkeye - send Content-type header when logging in to icecast2 servers - - Revision 1.2 2001/11/20 09:06:18 darkeye - fixed public stream reporting - - Revision 1.1 2001/09/14 19:31:06 darkeye - added IceCast2 / vorbis support - - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/IceCast2.h b/darkice/trunk/src/IceCast2.h index 67fc9c5..a1d54a8 100644 --- a/darkice/trunk/src/IceCast2.h +++ b/darkice/trunk/src/IceCast2.h @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------------ - Copyright (c) 2000 Tyrell Corporation. All rights reserved. + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. Tyrell DarkIce File : IceCast2.h Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -267,31 +267,3 @@ class IceCast2 : public CastSink #endif /* ICE_CAST2_H */ - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.6 2006/01/25 22:47:15 darkeye - added mpeg2 support, thanks to Nicholas J Humfrey - - Revision 1.5 2005/04/16 21:57:34 darkeye - added AAC support through the faac codec, http://www.audiocoding.com/ - - Revision 1.4 2005/04/14 11:53:17 darkeye - fixed API documentation issues - - Revision 1.3 2002/02/20 11:54:11 darkeye - added local dump file possibility - - Revision 1.2 2002/02/20 10:35:35 darkeye - updated to work with Ogg Vorbis libs rc3 and current IceCast2 cvs - - Revision 1.1 2001/09/14 19:31:06 darkeye - added IceCast2 / vorbis support - - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/JackDspSource.cpp b/darkice/trunk/src/JackDspSource.cpp index 9420e90..77757bd 100644 --- a/darkice/trunk/src/JackDspSource.cpp +++ b/darkice/trunk/src/JackDspSource.cpp @@ -1,5 +1,7 @@ /*------------------------------------------------------------------------------ + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. + Copyright (c) 2005 Nicholas Humfrey. All rights reserved. Tyrell DarkIce @@ -7,7 +9,7 @@ File : JackDspSource.cpp Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -439,16 +441,3 @@ JackDspSource :: shutdown_callback( void *arg ) #endif // SUPPORT_JACK_DSP - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.1 2005/04/04 08:36:17 darkeye - commited changes to enable Jack support - thanks to Nicholas J. Humfrey, njh@ecs.soton.ac.uk - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/JackDspSource.h b/darkice/trunk/src/JackDspSource.h index 235a5f3..73fcb70 100644 --- a/darkice/trunk/src/JackDspSource.h +++ b/darkice/trunk/src/JackDspSource.h @@ -1,5 +1,7 @@ /*------------------------------------------------------------------------------ + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. + Copyright (c) 2005 Nicholas Humfrey. All rights reserved. Tyrell DarkIce @@ -7,7 +9,7 @@ File : JackDspSource.h Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -274,19 +276,3 @@ class JackDspSource : public AudioSource, public virtual Reporter #endif /* JACK_DSP_SOURCE_H */ - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.2 2005/04/14 11:53:17 darkeye - fixed API documentation issues - - Revision 1.1 2005/04/04 08:36:17 darkeye - commited changes to enable Jack support - thanks to Nicholas J. Humfrey, njh@ecs.soton.ac.uk - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/LameLibEncoder.cpp b/darkice/trunk/src/LameLibEncoder.cpp index 8bdf50d..76e9798 100644 --- a/darkice/trunk/src/LameLibEncoder.cpp +++ b/darkice/trunk/src/LameLibEncoder.cpp @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------------ - Copyright (c) 2000 Tyrell Corporation. All rights reserved. + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. Tyrell DarkIce File : LameLibEncoder.cpp Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -394,76 +394,3 @@ LameLibEncoder :: close ( void ) throw ( Exception ) #endif // HAVE_LAME_LIB - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.20 2006/01/25 22:47:15 darkeye - added mpeg2 support, thanks to Nicholas J Humfrey - - Revision 1.19 2005/04/13 19:04:55 jbebel - Distribute lame qualities better, and prevent values greater than 9 which are invalid. - - Revision 1.18 2002/10/19 13:31:46 darkeye - some cleanup with the open() / close() functions - - Revision 1.17 2002/10/19 12:22:10 darkeye - return 0 immediately for write() if supplied length is 0 - - Revision 1.16 2002/08/04 10:26:06 darkeye - added additional error checking to make sure that outChannel < inChannel - - Revision 1.15 2002/08/03 12:41:18 darkeye - added possibility to stream in mono when recording in stereo - - Revision 1.14 2002/07/28 00:11:58 darkeye - bugfix for the previous fix :) - - Revision 1.13 2002/07/28 00:08:37 darkeye - bugfix: mp3Buf was deleted too early - - Revision 1.12 2002/05/28 12:35:41 darkeye - code cleanup: compiles under gcc-c++ 3.1, using -pedantic option - - Revision 1.11 2002/04/13 11:26:00 darkeye - added cbr, abr and vbr setting feature with encoding quality - - Revision 1.10 2002/03/28 16:38:37 darkeye - moved functions conv8() and conv16() to class Util - - Revision 1.9 2001/10/20 10:56:45 darkeye - added possibility to disable highpass and lowpass filters for lame - - Revision 1.8 2001/10/19 12:39:42 darkeye - created configure options to compile with or without lame / Ogg Vorbis - - Revision 1.7 2001/09/18 14:57:19 darkeye - finalized Solaris port - - Revision 1.6 2001/09/15 11:35:08 darkeye - minor fixes - - Revision 1.5 2001/09/02 09:54:12 darkeye - fixed typos in CVS substition keywords - - Revision 1.4 2001/08/31 20:09:05 darkeye - added funcitons conv8() and conv16() - - Revision 1.3 2001/08/30 17:25:56 darkeye - renamed configure.h to config.h - - Revision 1.2 2001/08/29 21:06:16 darkeye - added real support for 8 / 16 bit mono / stereo input - (8 bit input still has to be spread on 16 bit words) - - Revision 1.1 2001/08/26 20:44:30 darkeye - removed external command-line encoder support - replaced it with a shared-object support for lame with the possibility - of static linkage - - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/LameLibEncoder.h b/darkice/trunk/src/LameLibEncoder.h index 2a9c246..ba1430c 100644 --- a/darkice/trunk/src/LameLibEncoder.h +++ b/darkice/trunk/src/LameLibEncoder.h @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------------ - Copyright (c) 2000 Tyrell Corporation. All rights reserved. + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. Tyrell DarkIce File : LameLibEncoder.h Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -436,64 +436,3 @@ class LameLibEncoder : public AudioEncoder, public virtual Reporter #endif /* LAME_LIB_ENCODER_H */ - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.16 2005/04/16 21:57:34 darkeye - added AAC support through the faac codec, http://www.audiocoding.com/ - - Revision 1.15 2004/01/07 13:18:17 darkeye - commited patch sent by John Hay, fixing FreeBSD problems - - Revision 1.14 2002/08/04 10:26:06 darkeye - added additional error checking to make sure that outChannel < inChannel - - Revision 1.13 2002/08/03 12:41:18 darkeye - added possibility to stream in mono when recording in stereo - - Revision 1.12 2002/04/13 11:26:00 darkeye - added cbr, abr and vbr setting feature with encoding quality - - Revision 1.11 2002/03/28 16:38:37 darkeye - moved functions conv8() and conv16() to class Util - - Revision 1.10 2001/10/20 10:56:45 darkeye - added possibility to disable highpass and lowpass filters for lame - - Revision 1.9 2001/10/19 12:39:42 darkeye - created configure options to compile with or without lame / Ogg Vorbis - - Revision 1.8 2001/10/19 09:03:39 darkeye - added support for resampling mp3 streams - - Revision 1.7 2001/09/15 11:35:08 darkeye - minor fixes - - Revision 1.6 2001/09/14 19:31:06 darkeye - added IceCast2 / vorbis support - - Revision 1.5 2001/09/02 09:54:12 darkeye - fixed typos in CVS substition keywords - - Revision 1.4 2001/08/31 20:09:05 darkeye - added funcitons conv8() and conv16() - - Revision 1.3 2001/08/30 17:25:56 darkeye - renamed configure.h to config.h - - Revision 1.2 2001/08/29 21:06:16 darkeye - added real support for 8 / 16 bit mono / stereo input - (8 bit input still has to be spread on 16 bit words) - - Revision 1.1 2001/08/26 20:44:30 darkeye - removed external command-line encoder support - replaced it with a shared-object support for lame with the possibility - of static linkage - - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/MultiThreadedConnector.cpp b/darkice/trunk/src/MultiThreadedConnector.cpp index ef92b21..5c331fc 100644 --- a/darkice/trunk/src/MultiThreadedConnector.cpp +++ b/darkice/trunk/src/MultiThreadedConnector.cpp @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------------ - Copyright (c) 2000 Tyrell Corporation. All rights reserved. + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. Tyrell DarkIce File : MultiThreadedConnector.cpp Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -426,39 +426,3 @@ MultiThreadedConnector :: ThreadData :: threadFunction( void * param ) return 0; } - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.8 2006/05/18 07:13:00 darkeye - cosmetic changes - - Revision 1.7 2006/05/16 09:00:08 darkeye - added yield calls to the connector, when trying to reconnect... - - Revision 1.6 2005/04/13 22:03:32 jbebel - Set priority explicitly for encoding threads. This needs more testing. - - Revision 1.5 2005/04/11 19:27:43 darkeye - added option to turn off automatic reconnect feature - - Revision 1.4 2004/01/07 13:18:17 darkeye - commited patch sent by John Hay, fixing FreeBSD problems - - Revision 1.3 2002/10/20 20:43:17 darkeye - more graceful reconnect - - Revision 1.2 2002/10/19 13:35:21 darkeye - when a connection is dropped, DarkIce tries to reconnect, indefinitely - removed extreme event reporting for thread-related events - - Revision 1.1 2002/10/19 12:25:47 darkeye - changed internals so that now each encoding/server connection is - a separate thread - - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/MultiThreadedConnector.h b/darkice/trunk/src/MultiThreadedConnector.h index 5bbdb4c..7fe4a2b 100644 --- a/darkice/trunk/src/MultiThreadedConnector.h +++ b/darkice/trunk/src/MultiThreadedConnector.h @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------------ - Copyright (c) 2000 Tyrell Corporation. All rights reserved. + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. Tyrell DarkIce File : MultiThreadedConnector.h Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -357,30 +357,3 @@ class MultiThreadedConnector : public virtual Connector #endif /* MULTI_THREADED_CONNECTOR_H */ - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.5 2005/04/11 19:27:43 darkeye - added option to turn off automatic reconnect feature - - Revision 1.4 2004/02/23 19:12:52 darkeye - ported to NetBSD - - Revision 1.3 2002/11/26 21:41:20 darkeye - bugfix: MultiThreadedConnector::sinkThread() was private, now public - - Revision 1.2 2002/10/19 13:35:21 darkeye - when a connection is dropped, DarkIce tries to reconnect, indefinitely - removed extreme event reporting for thread-related events - - Revision 1.1 2002/10/19 12:25:47 darkeye - changed internals so that now each encoding/server connection is - a separate thread - - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/OssDspSource.cpp b/darkice/trunk/src/OssDspSource.cpp index 2bc0e92..305d6fa 100644 --- a/darkice/trunk/src/OssDspSource.cpp +++ b/darkice/trunk/src/OssDspSource.cpp @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------------ - Copyright (c) 2000 Tyrell Corporation. All rights reserved. + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. Tyrell DarkIce File : OssDspSource.cpp Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -313,53 +313,3 @@ OssDspSource :: close ( void ) throw ( Exception ) #endif // SUPPORT_OSS_DSP - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.13 2003/02/12 15:48:22 darkeye - added proper guessing for natural endiannes of 16 bit recording - - Revision 1.12 2002/12/20 10:40:40 darkeye - added support for big endian OSS devices (like Linux PowerPC) - - Revision 1.11 2002/05/28 12:35:41 darkeye - code cleanup: compiles under gcc-c++ 3.1, using -pedantic option - - Revision 1.10 2001/09/26 16:55:30 darkeye - BSD port - - Revision 1.9 2001/09/11 15:05:21 darkeye - added Solaris support - - Revision 1.8 2001/09/02 14:08:40 darkeye - setting the sound card recording sample rate is now more relaxed - there is no error reported if the sample rate is not exactly the same - - Revision 1.7 2001/08/30 17:25:56 darkeye - renamed configure.h to config.h - - Revision 1.6 2000/12/01 15:03:28 darkeye - bug fix in error reporting - - Revision 1.5 2000/11/17 15:50:48 darkeye - added -Wall flag to compiler and eleminated new warnings - - Revision 1.4 2000/11/13 20:05:07 darkeye - changed to workaround to start recording so that it reads one sample - per channel, as opposed to only one sample (which misalignes the channels) - - Revision 1.3 2000/11/12 13:31:40 darkeye - added kdoc-style documentation comments - - Revision 1.2 2000/11/05 14:08:28 darkeye - changed builting to an automake / autoconf environment - - Revision 1.1.1.1 2000/11/05 10:05:53 darkeye - initial version - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/OssDspSource.h b/darkice/trunk/src/OssDspSource.h index 8eb6168..50557d6 100644 --- a/darkice/trunk/src/OssDspSource.h +++ b/darkice/trunk/src/OssDspSource.h @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------------ - Copyright (c) 2000 Tyrell Corporation. All rights reserved. + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. Tyrell DarkIce File : OssDspSource.h Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -253,34 +253,3 @@ class OssDspSource : public AudioSource, public virtual Reporter #endif /* OSS_DSP_SOURCE_H */ - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.7 2005/04/14 11:53:17 darkeye - fixed API documentation issues - - Revision 1.6 2002/12/20 10:40:40 darkeye - added support for big endian OSS devices (like Linux PowerPC) - - Revision 1.5 2001/09/18 14:57:19 darkeye - finalized Solaris port - - Revision 1.4 2001/09/02 14:08:40 darkeye - setting the sound card recording sample rate is now more relaxed - there is no error reported if the sample rate is not exactly the same - - Revision 1.3 2000/11/12 13:31:40 darkeye - added kdoc-style documentation comments - - Revision 1.2 2000/11/05 17:37:24 darkeye - removed clone() functions - - Revision 1.1.1.1 2000/11/05 10:05:53 darkeye - initial version - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/Ref.h b/darkice/trunk/src/Ref.h index c02c12c..ec037c0 100644 --- a/darkice/trunk/src/Ref.h +++ b/darkice/trunk/src/Ref.h @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------------ - Copyright (c) 2000 Tyrell Corporation. All rights reserved. + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. Tyrell DarkIce File : Ref.h Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -294,27 +294,3 @@ class Ref #endif /* REF_H */ - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.5 2002/08/20 20:07:36 darkeye - minor fixes - - Revision 1.4 2002/02/20 11:51:27 darkeye - added equality operators to compare with pointers - - Revision 1.3 2000/11/11 14:55:31 darkeye - minor bugfix - - Revision 1.2 2000/11/11 12:33:13 darkeye - added kdoc-style documentation - - Revision 1.1.1.1 2000/11/05 10:05:54 darkeye - initial version - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/Referable.h b/darkice/trunk/src/Referable.h index 87ef065..f53bbff 100644 --- a/darkice/trunk/src/Referable.h +++ b/darkice/trunk/src/Referable.h @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------------ - Copyright (c) 2000 Tyrell Corporation. All rights reserved. + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. Tyrell DarkIce File : Referable.h Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -168,18 +168,3 @@ class Referable #endif /* REFERABLE_H */ - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.2 2000/11/11 12:33:13 darkeye - added kdoc-style documentation - - Revision 1.1.1.1 2000/11/05 10:05:54 darkeye - initial version - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/Reporter.cpp b/darkice/trunk/src/Reporter.cpp index 87621a0..d097628 100644 --- a/darkice/trunk/src/Reporter.cpp +++ b/darkice/trunk/src/Reporter.cpp @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------------ - Copyright (c) 2000 Tyrell Corporation. All rights reserved. + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. Tyrell Reporter File : Reporter.cpp Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -58,20 +58,3 @@ std::ostream * Reporter::os = &std::cout; /* ============================================================= module code */ - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.2 2002/05/28 12:35:41 darkeye - code cleanup: compiles under gcc-c++ 3.1, using -pedantic option - - Revision 1.1 2000/11/16 08:48:43 darkeye - added multiple verbosity-level event reporting and verbosity command - line option - - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/Reporter.h b/darkice/trunk/src/Reporter.h index e9cbf97..be33cf6 100644 --- a/darkice/trunk/src/Reporter.h +++ b/darkice/trunk/src/Reporter.h @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------------ - Copyright (c) 2000 Tyrell Corporation. All rights reserved. + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. Tyrell Reporter File : Reporter.h Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -303,48 +303,3 @@ class Reporter #endif /* REPORTER_H */ - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.9 2005/04/04 08:36:17 darkeye - commited changes to enable Jack support - thanks to Nicholas J. Humfrey, njh@ecs.soton.ac.uk - - Revision 1.8 2005/04/03 05:14:07 jbebel - Changed timestamp on reported events to include date in addition to time. - - Revision 1.7 2004/02/15 12:06:30 darkeye - added ALSA support, thanks to Christian Forster - - Revision 1.6 2002/05/28 12:35:41 darkeye - code cleanup: compiles under gcc-c++ 3.1, using -pedantic option - - Revision 1.5 2001/09/05 20:11:15 darkeye - removed dependency on locally stored SGI STL header files - now compiler-supplied C++ library STL header files are used - compiles under GNU C++ 3 - hash_map (an SGI extension to STL) replaced with map - std:: namespace prefix added to all STL class references - - Revision 1.4 2001/08/30 17:25:56 darkeye - renamed configure.h to config.h - - Revision 1.3 2000/12/20 12:47:40 darkeye - added prefixVerbosity value. in a low verbosity setting no time-stamp - prefix is displayed - - Revision 1.2 2000/11/18 11:12:01 darkeye - added timestamp display, removed process id display in reports - changed reportEvent functions to template functions - - Revision 1.1 2000/11/16 08:48:43 darkeye - added multiple verbosity-level event reporting and verbosity command - line option - - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/ShoutCast.cpp b/darkice/trunk/src/ShoutCast.cpp index acac7df..c146147 100644 --- a/darkice/trunk/src/ShoutCast.cpp +++ b/darkice/trunk/src/ShoutCast.cpp @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------------ - Copyright (c) 2000 Tyrell Corporation. All rights reserved. + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. Tyrell DarkIce File : ShoutCast.cpp Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -229,30 +229,3 @@ ShoutCast :: sendLogin ( void ) throw ( Exception ) } - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.5 2006/07/16 16:46:40 darkeye - changed the order of shoutcast metadata - - Revision 1.4 2006/07/16 16:24:46 darkeye - moved shoutcast server response checking right after passing password - to the server. this should solve connection issues for recent - shoutcast servers - - Revision 1.3 2002/05/28 12:35:41 darkeye - code cleanup: compiles under gcc-c++ 3.1, using -pedantic option - - Revision 1.2 2001/11/20 09:06:18 darkeye - fixed public stream reporting - - Revision 1.1 2001/09/09 11:27:31 darkeye - added support for ShoutCast servers - - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/ShoutCast.h b/darkice/trunk/src/ShoutCast.h index e030f77..5cf9043 100644 --- a/darkice/trunk/src/ShoutCast.h +++ b/darkice/trunk/src/ShoutCast.h @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------------ - Copyright (c) 2000 Tyrell Corporation. All rights reserved. + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. Tyrell DarkIce File : ShoutCast.h Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -255,22 +255,3 @@ class ShoutCast : public CastSink #endif /* SHOUT_CAST_H */ - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.3 2005/04/14 11:53:17 darkeye - fixed API documentation issues - - Revision 1.2 2002/02/20 11:54:11 darkeye - added local dump file possibility - - Revision 1.1 2001/09/09 11:27:31 darkeye - added support for ShoutCast servers - - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/Sink.h b/darkice/trunk/src/Sink.h index f9ff4bc..8dd6f8a 100644 --- a/darkice/trunk/src/Sink.h +++ b/darkice/trunk/src/Sink.h @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------------ - Copyright (c) 2000 Tyrell Corporation. All rights reserved. + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. Tyrell DarkIce File : Sink.h Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -183,24 +183,3 @@ class Sink : public virtual Referable #endif /* SINK_H */ - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.4 2000/11/12 14:54:25 darkeye - added Exception to throws clause for the destructor and assignment operator - - Revision 1.3 2000/11/12 13:31:16 darkeye - minor change in documentation - - Revision 1.2 2000/11/11 12:33:13 darkeye - added kdoc-style documentation - - Revision 1.1.1.1 2000/11/05 10:05:54 darkeye - initial version - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/SolarisDspSource.cpp b/darkice/trunk/src/SolarisDspSource.cpp index a67b431..8e04108 100644 --- a/darkice/trunk/src/SolarisDspSource.cpp +++ b/darkice/trunk/src/SolarisDspSource.cpp @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------------ - Copyright (c) 2000 Tyrell Corporation. All rights reserved. + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. Tyrell DarkIce File : SolarisDspSource.cpp Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -275,19 +275,3 @@ SolarisDspSource :: close ( void ) throw ( Exception ) #endif // SUPPORT_SOLARIS_DSP - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.2 2004/02/18 21:08:11 darkeye - ported to OpenBSD (real-time scheduling not yet supported) - - Revision 1.1 2001/09/11 15:05:21 darkeye - added Solaris support - - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/SolarisDspSource.h b/darkice/trunk/src/SolarisDspSource.h index 83b1e48..c62bbf3 100644 --- a/darkice/trunk/src/SolarisDspSource.h +++ b/darkice/trunk/src/SolarisDspSource.h @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------------ - Copyright (c) 2000 Tyrell Corporation. All rights reserved. + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. Tyrell DarkIce File : SolarisDspSource.h Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -255,27 +255,3 @@ class SolarisDspSource : public AudioSource, public virtual Reporter #endif /* SOLARIS_DSP_SOURCE_H */ - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.5 2005/04/14 11:53:17 darkeye - fixed API documentation issues - - Revision 1.4 2004/02/19 06:47:06 darkeye - finalized OpenBSD port - - Revision 1.3 2004/02/18 21:08:11 darkeye - ported to OpenBSD (real-time scheduling not yet supported) - - Revision 1.2 2001/09/18 14:57:19 darkeye - finalized Solaris port - - Revision 1.1 2001/09/11 15:05:21 darkeye - added Solaris support - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/Source.h b/darkice/trunk/src/Source.h index a8cac63..1b9d313 100644 --- a/darkice/trunk/src/Source.h +++ b/darkice/trunk/src/Source.h @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------------ - Copyright (c) 2000 Tyrell Corporation. All rights reserved. + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. Tyrell DarkIce File : Source.h Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -169,18 +169,3 @@ class Source : public virtual Referable #endif /* SOURCE_H */ - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.2 2000/11/12 13:31:40 darkeye - added kdoc-style documentation comments - - Revision 1.1.1.1 2000/11/05 10:05:54 darkeye - initial version - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/TcpSocket.cpp b/darkice/trunk/src/TcpSocket.cpp index 8e13912..c89ae2e 100644 --- a/darkice/trunk/src/TcpSocket.cpp +++ b/darkice/trunk/src/TcpSocket.cpp @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------------ - Copyright (c) 2000 Tyrell Corporation. All rights reserved. + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. Tyrell DarkIce File : TcpSocket.cpp Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -392,45 +392,3 @@ TcpSocket :: close ( void ) throw ( Exception ) } - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.11 2006/05/19 12:39:19 darkeye - added reconnection capability if the TCP connection is reset by the peer - - Revision 1.10 2005/04/11 19:34:23 darkeye - added IPv6 support, thanks to - - Revision 1.9 2002/10/19 12:22:27 darkeye - cosmetic change - - Revision 1.8 2002/08/28 18:24:46 darkeye - ported to FreeBSD (removed reference to MSG_NOSIGNAL in TcpSocket.cpp) - - Revision 1.7 2002/07/20 16:37:06 darkeye - added fault tolerance in case a server connection is dropped - - Revision 1.6 2001/09/18 16:44:10 darkeye - TcpSocket did not report closed state when could not connect() - - Revision 1.5 2001/08/30 17:25:56 darkeye - renamed configure.h to config.h - - Revision 1.4 2000/11/17 15:50:48 darkeye - added -Wall flag to compiler and eleminated new warnings - - Revision 1.3 2000/11/12 14:54:50 darkeye - added kdoc-style documentation comments - - Revision 1.2 2000/11/05 14:08:28 darkeye - changed builting to an automake / autoconf environment - - Revision 1.1.1.1 2000/11/05 10:05:55 darkeye - initial version - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/TcpSocket.h b/darkice/trunk/src/TcpSocket.h index 79af588..f37a2fb 100644 --- a/darkice/trunk/src/TcpSocket.h +++ b/darkice/trunk/src/TcpSocket.h @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------------ - Copyright (c) 2000 Tyrell Corporation. All rights reserved. + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. Tyrell DarkIce File : TcpSocket.h Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -289,21 +289,3 @@ class TcpSocket : public Source, public Sink #endif /* TCP_SOCKET_H */ - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.3 2000/11/12 14:54:50 darkeye - added kdoc-style documentation comments - - Revision 1.2 2000/11/05 17:37:24 darkeye - removed clone() functions - - Revision 1.1.1.1 2000/11/05 10:05:55 darkeye - initial version - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/TwoLameLibEncoder.cpp b/darkice/trunk/src/TwoLameLibEncoder.cpp index 1d2f13e..26693d4 100644 --- a/darkice/trunk/src/TwoLameLibEncoder.cpp +++ b/darkice/trunk/src/TwoLameLibEncoder.cpp @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------------ - Copyright (c) 2005 Tyrell Corporation. All rights reserved. + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. Tyrell DarkIce File : TwoLameLibEncoder.cpp Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -299,18 +299,3 @@ TwoLameLibEncoder :: close ( void ) throw ( Exception ) #endif // HAVE_TWOLAME_LIB - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.1 2006/01/25 22:49:59 darkeye - added mpeg2 support thanks to Nicholas J Humfrey - - - Revision 1.1 2005/05/02 23:05:02 nhumfrey - initial version - based on LameLibEncoder 1.19 - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/TwoLameLibEncoder.h b/darkice/trunk/src/TwoLameLibEncoder.h index afbf0be..a6b9088 100644 --- a/darkice/trunk/src/TwoLameLibEncoder.h +++ b/darkice/trunk/src/TwoLameLibEncoder.h @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------------ - Copyright (c) 2005 Tyrell Corporation. All rights reserved. + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. Tyrell DarkIce File : TwoLameLibEncoder.cpp Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -365,18 +365,3 @@ class TwoLameLibEncoder : public AudioEncoder, public virtual Reporter #endif /* TWOLAME_LIB_ENCODER_H */ - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.1 2006/01/25 22:49:59 darkeye - added mpeg2 support thanks to Nicholas J Humfrey - - - Revision 1.1 2005/05/02 23:05:02 nhumfrey - initial version - based on LameLibEncoder 1.19 - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/Util.cpp b/darkice/trunk/src/Util.cpp index 2072869..ebd0e78 100644 --- a/darkice/trunk/src/Util.cpp +++ b/darkice/trunk/src/Util.cpp @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------------ - Copyright (c) 2000 Tyrell Corporation. All rights reserved. + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. Tyrell DarkIce File : Util.cpp Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -488,51 +488,3 @@ Util :: conv16 ( unsigned char * pcmBuffer, } - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.13 2004/02/15 12:06:30 darkeye - added ALSA support, thanks to Christian Forster - - Revision 1.12 2003/02/09 12:57:36 darkeye - cosmetic changes to the fileAddDate option - - Revision 1.11 2002/12/22 01:20:32 darkeye - time.h include file was missing - - Revision 1.10 2002/11/20 16:52:07 wandereq - added fileAddDate function - - Revision 1.9 2002/08/20 18:39:14 darkeye - added HTTP Basic authentication for icecast2 logins - - Revision 1.8 2002/07/21 08:47:06 darkeye - some exception cleanup (throw clauses in function declarations) - - Revision 1.7 2002/03/28 16:45:46 darkeye - added functions strToD(), conv8(), conv16() and conv() - - Revision 1.6 2001/08/30 17:25:56 darkeye - renamed configure.h to config.h - - Revision 1.5 2000/11/12 13:31:40 darkeye - added kdoc-style documentation comments - - Revision 1.4 2000/11/09 22:04:33 darkeye - added functions strLen strCpy and strCat - - Revision 1.3 2000/11/09 06:44:21 darkeye - added strEq and strToL functions - - Revision 1.2 2000/11/05 14:08:28 darkeye - changed builting to an automake / autoconf environment - - Revision 1.1.1.1 2000/11/05 10:05:55 darkeye - initial version - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/Util.h b/darkice/trunk/src/Util.h index e6f46bc..9543a59 100644 --- a/darkice/trunk/src/Util.h +++ b/darkice/trunk/src/Util.h @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------------ - Copyright (c) 2000 Tyrell Corporation. All rights reserved. + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. Tyrell DarkIce File : Util.h Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -316,45 +316,3 @@ class Util #endif /* UTIL_H */ - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.11 2005/04/14 11:53:17 darkeye - fixed API documentation issues - - Revision 1.10 2004/02/15 12:06:30 darkeye - added ALSA support, thanks to Christian Forster - - Revision 1.9 2003/02/09 12:57:36 darkeye - cosmetic changes to the fileAddDate option - - Revision 1.8 2002/11/20 16:52:08 wandereq - added fileAddDate function - - Revision 1.7 2002/08/20 18:39:14 darkeye - added HTTP Basic authentication for icecast2 logins - - Revision 1.6 2002/07/21 08:47:06 darkeye - some exception cleanup (throw clauses in function declarations) - - Revision 1.5 2002/03/28 16:45:46 darkeye - added functions strToD(), conv8(), conv16() and conv() - - Revision 1.4 2000/11/12 13:31:40 darkeye - added kdoc-style documentation comments - - Revision 1.3 2000/11/09 22:04:33 darkeye - added functions strLen strCpy and strCat - - Revision 1.2 2000/11/09 06:44:21 darkeye - added strEq and strToL functions - - Revision 1.1.1.1 2000/11/05 10:05:55 darkeye - initial version - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/VorbisLibEncoder.cpp b/darkice/trunk/src/VorbisLibEncoder.cpp index e0a111a..4fde50a 100644 --- a/darkice/trunk/src/VorbisLibEncoder.cpp +++ b/darkice/trunk/src/VorbisLibEncoder.cpp @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------------ - Copyright (c) 2000 Tyrell Corporation. All rights reserved. + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. Tyrell DarkIce File : VorbisLibEncoder.cpp Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -413,86 +413,3 @@ VorbisLibEncoder :: close ( void ) throw ( Exception ) #endif // HAVE_VORBIS_LIB - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.22 2005/04/16 21:57:34 darkeye - added AAC support through the faac codec, http://www.audiocoding.com/ - - Revision 1.21 2005/04/11 19:26:55 darkeye - cosmetic changes - fixed warning for implicit cast from doulbe to int - - Revision 1.20 2005/04/03 05:18:24 jbebel - Add test to determine if the sample rate conversion ratio is a power of 2. - If so, use linear interpolation. Otherwise use more complicated quadratic - interpolation which tends to sound terrible, but is better than trying to - use linear for a non-standard conversion. - - Revision 1.19 2004/03/13 10:41:39 darkeye - added possibility to downsample from stereo to mono when encoding - to Ogg Vorbis - - Revision 1.18 2004/02/15 13:07:42 darkeye - ogg vorbis recording to only a file caused a segfault. now fixed - - Revision 1.17 2003/02/09 13:15:57 darkeye - added feature for setting the TITLE comment field for vorbis streams - - Revision 1.16 2002/10/19 13:31:46 darkeye - some cleanup with the open() / close() functions - - Revision 1.15 2002/10/19 12:22:10 darkeye - return 0 immediately for write() if supplied length is 0 - - Revision 1.14 2002/08/22 21:52:08 darkeye - bug fix: maximum bitrate setting fixed for Ogg Vorbis streams - - Revision 1.13 2002/08/20 19:35:37 darkeye - added possibility to specify maximum bitrate for Ogg Vorbis streams - - Revision 1.12 2002/08/03 10:30:46 darkeye - resampling bugs fixed for vorbis streams - - Revision 1.11 2002/07/20 16:37:06 darkeye - added fault tolerance in case a server connection is dropped - - Revision 1.10 2002/07/20 10:59:00 darkeye - added support for Ogg Vorbis 1.0, removed support for rc2 - - Revision 1.9 2002/05/28 12:35:41 darkeye - code cleanup: compiles under gcc-c++ 3.1, using -pedantic option - - Revision 1.8 2002/04/13 11:26:00 darkeye - added cbr, abr and vbr setting feature with encoding quality - - Revision 1.7 2002/03/28 16:47:38 darkeye - moved functions conv8() and conv16() to class Util (as conv()) - added resampling functionality - added support for variable bitrates - - Revision 1.6 2002/02/20 10:35:35 darkeye - updated to work with Ogg Vorbis libs rc3 and current IceCast2 cvs - - Revision 1.5 2001/10/21 13:08:18 darkeye - fixed incorrect vorbis bitrate setting - - Revision 1.4 2001/10/19 12:39:42 darkeye - created configure options to compile with or without lame / Ogg Vorbis - - Revision 1.3 2001/09/18 14:57:19 darkeye - finalized Solaris port - - Revision 1.2 2001/09/15 11:36:22 darkeye - added function vorbisBlocksOut(), finalized vorbis support - - Revision 1.1 2001/09/14 19:31:06 darkeye - added IceCast2 / vorbis support - - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/VorbisLibEncoder.h b/darkice/trunk/src/VorbisLibEncoder.h index 5ddcee4..8d12b61 100644 --- a/darkice/trunk/src/VorbisLibEncoder.h +++ b/darkice/trunk/src/VorbisLibEncoder.h @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------------ - Copyright (c) 2000 Tyrell Corporation. All rights reserved. + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. Tyrell DarkIce File : VorbisLibEncoder.h Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Copyright notice: @@ -433,42 +433,3 @@ class VorbisLibEncoder : public AudioEncoder, public virtual Reporter #endif /* VORBIS_LIB_ENCODER_H */ - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.9 2003/02/09 13:15:57 darkeye - added feature for setting the TITLE comment field for vorbis streams - - Revision 1.8 2002/08/20 20:07:36 darkeye - minor fixes - - Revision 1.7 2002/08/20 19:35:37 darkeye - added possibility to specify maximum bitrate for Ogg Vorbis streams - - Revision 1.6 2002/07/20 16:37:06 darkeye - added fault tolerance in case a server connection is dropped - - Revision 1.5 2002/04/13 11:26:00 darkeye - added cbr, abr and vbr setting feature with encoding quality - - Revision 1.4 2002/03/28 16:47:38 darkeye - moved functions conv8() and conv16() to class Util (as conv()) - added resampling functionality - added support for variable bitrates - - Revision 1.3 2001/10/19 12:39:42 darkeye - created configure options to compile with or without lame / Ogg Vorbis - - Revision 1.2 2001/09/15 11:36:22 darkeye - added function vorbisBlocksOut(), finalized vorbis support - - Revision 1.1 2001/09/14 19:31:06 darkeye - added IceCast2 / vorbis support - - - -------------------------------------------------------------------------------*/ - diff --git a/darkice/trunk/src/main.cpp b/darkice/trunk/src/main.cpp index 5d9687d..2cf3d67 100644 --- a/darkice/trunk/src/main.cpp +++ b/darkice/trunk/src/main.cpp @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------------ - Copyright (c) 2000 Tyrell Corporation. All rights reserved. + Copyright (c) 2000-2007 Tyrell Corporation. All rights reserved. Tyrell DarkIce File : main.cpp Version : $Revision$ Author : $Author$ - Location : $Source$ + Location : $HeadURL$ Abstract : @@ -107,9 +107,9 @@ main ( int res = -1; std::cout << "DarkIce " << VERSION - << " live audio streamer, http://darkice.sourceforge.net" + << " live audio streamer, http://darkice.tyrell.hu/" << std::endl - << "Copyright (c) 2000-2006, Tyrell Hungary, http://tyrell.hu" + << "Copyright (c) 2000-2007, Tyrell Hungary, http://tyrell.hu/" << std::endl << std::endl; try { @@ -191,68 +191,3 @@ sigusr1Handler(int value) darkice->cut(); } - -/*------------------------------------------------------------------------------ - - $Source$ - - $Log$ - Revision 1.16 2006/01/25 22:47:15 darkeye - added mpeg2 support, thanks to Nicholas J Humfrey - - Revision 1.15 2005/04/14 11:24:42 darkeye - updated copyright notice to extend to 2005 - - Revision 1.14 2005/04/03 05:10:07 jbebel - Moved initialization of Reporter class so it would happen before - instantiation of Darkice class. Any logging that might be reported - during the construction of the Darkice class could not function. - Originally the Reporter initialization was done through the instance - of Darkice (which inherits Reporter), but that obviously isn't possible - before Darkice is instantiated. Since Reporter is largely a static class, - it is reasonable to call it via the scope resolution operator rather - than via an instance of the class, so that's what I did. - - Revision 1.13 2004/02/15 12:06:30 darkeye - added ALSA support, thanks to Christian Forster - - Revision 1.12 2003/02/09 15:09:41 darkeye - for version 0.13 - - Revision 1.11 2002/05/28 12:35:41 darkeye - code cleanup: compiles under gcc-c++ 3.1, using -pedantic option - - Revision 1.10 2002/02/20 15:08:52 darkeye - minor changes - - Revision 1.9 2001/09/11 15:05:21 darkeye - added Solaris support - - Revision 1.8 2001/09/02 12:24:29 darkeye - now displays usage info when no command line parameters given - - Revision 1.7 2001/08/30 17:25:56 darkeye - renamed configure.h to config.h - - 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 - - Revision 1.4 2000/11/13 20:21:29 darkeye - added program version display on startup - - Revision 1.3 2000/11/13 19:38:55 darkeye - moved command line parameter parsing from DarkIce.cpp to main.cpp - - Revision 1.2 2000/11/08 17:29:50 darkeye - added configuration file reader - - Revision 1.1.1.1 2000/11/05 10:05:52 darkeye - initial version - - -------------------------------------------------------------------------------*/ -