From 1b421741ca81666c5a5b6565cd5d608692edab4a Mon Sep 17 00:00:00 2001 From: drowe67 Date: Fri, 1 Oct 2010 08:57:41 +0000 Subject: [PATCH] GPL license tweak for URL rather than mailing list, thanks Bruce for pointing this out git-svn-id: https://svn.code.sf.net/p/freetel/code@201 01035d8c-6547-0410-b346-abe4f91aad63 --- codec2/COPYING | 4 ++-- codec2/script/menu.sh | 3 +-- codec2/src/c2dec.c | 3 +-- codec2/src/c2enc.c | 3 +-- codec2/src/c2sim.c | 3 +-- codec2/src/codec2.c | 3 +-- codec2/src/codec2.h | 3 +-- codec2/src/comp.h | 3 +-- codec2/src/defines.h | 3 +-- codec2/src/dump.c | 5 ++--- codec2/src/dump.h | 3 +-- codec2/src/generate_codebook.c | 25 +++++++++++++++++++++++++ codec2/src/globals.c | 3 +-- codec2/src/globals.h | 3 +-- codec2/src/interp.c | 3 +-- codec2/src/interp.h | 3 +-- codec2/src/lpc.c | 3 +-- codec2/src/lpc.h | 3 +-- codec2/src/lsp.c | 18 ++++++++++++++++++ codec2/src/lsp.h | 17 +++++++++++++++++ codec2/src/nlp.c | 3 +-- codec2/src/nlp.h | 3 +-- codec2/src/phase.c | 3 +-- codec2/src/phase.h | 3 +-- codec2/src/postfilter.c | 3 +-- codec2/src/postfilter.h | 3 +-- codec2/src/quantise.c | 4 ++-- codec2/src/quantise.h | 3 +-- codec2/src/sine.c | 3 +-- codec2/src/sine.h | 3 +-- codec2/unittest/extract.c | 3 +-- codec2/unittest/genlsp.c | 3 +-- codec2/unittest/genres.c | 3 +-- codec2/unittest/lsptest.c | 3 +-- codec2/unittest/sd.c | 3 +-- codec2/unittest/sd.h | 3 +-- codec2/unittest/tcodec2.c | 3 +-- codec2/unittest/tcontphase.c | 3 +-- codec2/unittest/tinterp.c | 3 +-- codec2/unittest/tnlp.c | 3 +-- codec2/unittest/tquant.c | 3 +-- codec2/unittest/vqtrain.c | 3 +-- 42 files changed, 102 insertions(+), 79 deletions(-) diff --git a/codec2/COPYING b/codec2/COPYING index 4362b491..cc40a468 100644 --- a/codec2/COPYING +++ b/codec2/COPYING @@ -484,8 +484,8 @@ convey the exclusion of warranty; and each file should have at least the Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + License along with this library; if not, see + . Also add information on how to contact you by electronic and paper mail. diff --git a/codec2/script/menu.sh b/codec2/script/menu.sh index 3713522a..7f586ca1 100755 --- a/codec2/script/menu.sh +++ b/codec2/script/menu.sh @@ -35,8 +35,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# along with this program; if not, see . files=0 items="Q-Quit\n" diff --git a/codec2/src/c2dec.c b/codec2/src/c2dec.c index f64b3807..a3037bd2 100644 --- a/codec2/src/c2dec.c +++ b/codec2/src/c2dec.c @@ -27,8 +27,7 @@ License for more details. You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program; if not, see . */ #include "codec2.h" diff --git a/codec2/src/c2enc.c b/codec2/src/c2enc.c index a2d02db6..91ea3a30 100644 --- a/codec2/src/c2enc.c +++ b/codec2/src/c2enc.c @@ -28,8 +28,7 @@ License for more details. You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program; if not, see . */ #include "codec2.h" diff --git a/codec2/src/c2sim.c b/codec2/src/c2sim.c index 77219648..a89e823b 100644 --- a/codec2/src/c2sim.c +++ b/codec2/src/c2sim.c @@ -23,8 +23,7 @@ License for more details. You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program; if not, see . */ #include diff --git a/codec2/src/codec2.c b/codec2/src/codec2.c index 1d49dc3d..1c71cc12 100644 --- a/codec2/src/codec2.c +++ b/codec2/src/codec2.c @@ -23,8 +23,7 @@ License for more details. You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program; if not, see . */ #include diff --git a/codec2/src/codec2.h b/codec2/src/codec2.h index 131b94e0..5d8e1e64 100644 --- a/codec2/src/codec2.h +++ b/codec2/src/codec2.h @@ -23,8 +23,7 @@ License for more details. You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program; if not, see . */ #ifndef __CODEC2__ diff --git a/codec2/src/comp.h b/codec2/src/comp.h index bca01b5d..cedcab37 100644 --- a/codec2/src/comp.h +++ b/codec2/src/comp.h @@ -22,8 +22,7 @@ License for more details. You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program; if not, see . */ #ifndef __COMP__ diff --git a/codec2/src/defines.h b/codec2/src/defines.h index 76955e65..93b4d853 100644 --- a/codec2/src/defines.h +++ b/codec2/src/defines.h @@ -22,8 +22,7 @@ License for more details. You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program; if not, see . */ #ifndef __DEFINES__ diff --git a/codec2/src/dump.c b/codec2/src/dump.c index 1c5d74ac..c3613f91 100644 --- a/codec2/src/dump.c +++ b/codec2/src/dump.c @@ -1,7 +1,7 @@ /*---------------------------------------------------------------------------*\ FILE........: dump.c - AUTHOR......: David Rowe + AUTHOR......: David Rowe DATE CREATED: 25/8/09 Routines to dump data to text files for Octave analysis. @@ -20,8 +20,7 @@ License for more details. You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program; if not, see . */ #include "defines.h" diff --git a/codec2/src/dump.h b/codec2/src/dump.h index 8f402251..9f59a558 100644 --- a/codec2/src/dump.h +++ b/codec2/src/dump.h @@ -20,8 +20,7 @@ License for more details. You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program; if not, see . */ #ifndef __DUMP__ diff --git a/codec2/src/generate_codebook.c b/codec2/src/generate_codebook.c index de8f4446..22df87a1 100644 --- a/codec2/src/generate_codebook.c +++ b/codec2/src/generate_codebook.c @@ -1,3 +1,28 @@ +/*---------------------------------------------------------------------------*\ + + FILE........: generate_codebook.c + AUTHOR......: Bruce Perens + DATE CREATED: 29 Sep 2010 + + Generate header files containing LSP quantisers, runs at compile time. + +\*---------------------------------------------------------------------------*/ + +/* + All rights reserved. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License version 2.1, as + published by the Free Software Foundation. This program is + distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public + License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program; if not, see . +*/ + #include #include #include diff --git a/codec2/src/globals.c b/codec2/src/globals.c index 2e04f680..f2182f79 100644 --- a/codec2/src/globals.c +++ b/codec2/src/globals.c @@ -22,8 +22,7 @@ License for more details. You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program; if not, see . */ #include "sine.h" /* global defines for coder */ diff --git a/codec2/src/globals.h b/codec2/src/globals.h index 44aab8b0..cef72034 100644 --- a/codec2/src/globals.h +++ b/codec2/src/globals.h @@ -22,8 +22,7 @@ License for more details. You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program; if not, see . */ /* Globals used in encoder and decoder */ diff --git a/codec2/src/interp.c b/codec2/src/interp.c index a0dc762c..0889fc63 100644 --- a/codec2/src/interp.c +++ b/codec2/src/interp.c @@ -22,8 +22,7 @@ License for more details. You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program; if not, see . */ #include diff --git a/codec2/src/interp.h b/codec2/src/interp.h index 0684b5bb..653b1832 100644 --- a/codec2/src/interp.h +++ b/codec2/src/interp.h @@ -22,8 +22,7 @@ License for more details. You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program; if not, see . */ #ifndef __INTERP__ diff --git a/codec2/src/lpc.c b/codec2/src/lpc.c index 1f9ff2bf..e38bbd54 100644 --- a/codec2/src/lpc.c +++ b/codec2/src/lpc.c @@ -22,8 +22,7 @@ License for more details. You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program; if not, see . */ #define LPC_MAX_N 512 /* maximum no. of samples in frame */ diff --git a/codec2/src/lpc.h b/codec2/src/lpc.h index e9b42aef..dc0cc40d 100644 --- a/codec2/src/lpc.h +++ b/codec2/src/lpc.h @@ -22,8 +22,7 @@ License for more details. You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program; if not, see . */ #ifndef __LPC__ diff --git a/codec2/src/lsp.c b/codec2/src/lsp.c index 158e9a19..f51c13ce 100644 --- a/codec2/src/lsp.c +++ b/codec2/src/lsp.c @@ -11,6 +11,23 @@ \*---------------------------------------------------------------------------*/ +/* + Copyright (C) 2009 David Rowe + + All rights reserved. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License version 2.1, as + published by the Free Software Foundation. This program is + distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public + License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program; if not, see . +*/ + #include "defines.h" #include "lsp.h" #include @@ -19,6 +36,7 @@ /* Only 10 gets used, so far. */ #define LSP_MAX_ORDER 20 + /*---------------------------------------------------------------------------*\ Introduction to Line Spectrum Pairs (LSPs) diff --git a/codec2/src/lsp.h b/codec2/src/lsp.h index 88eae7e4..5acef018 100644 --- a/codec2/src/lsp.h +++ b/codec2/src/lsp.h @@ -11,6 +11,23 @@ \*---------------------------------------------------------------------------*/ +/* + Copyright (C) 2009 David Rowe + + All rights reserved. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License version 2.1, as + published by the Free Software Foundation. This program is + distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public + License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program; if not, see . +*/ + #ifndef __LSP__ #define __LSP__ diff --git a/codec2/src/nlp.c b/codec2/src/nlp.c index 8cf1fc7d..f4a8e90e 100644 --- a/codec2/src/nlp.c +++ b/codec2/src/nlp.c @@ -22,8 +22,7 @@ License for more details. You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program; if not, see . */ #include "defines.h" diff --git a/codec2/src/nlp.h b/codec2/src/nlp.h index eaaae970..5348ba59 100644 --- a/codec2/src/nlp.h +++ b/codec2/src/nlp.h @@ -22,8 +22,7 @@ License for more details. You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program; if not, see . */ #ifndef __NLP__ diff --git a/codec2/src/phase.c b/codec2/src/phase.c index 83fd680e..e8cee7ec 100644 --- a/codec2/src/phase.c +++ b/codec2/src/phase.c @@ -22,8 +22,7 @@ License for more details. You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program; if not,see . */ #include "defines.h" diff --git a/codec2/src/phase.h b/codec2/src/phase.h index 6dbf3fa2..33483208 100644 --- a/codec2/src/phase.h +++ b/codec2/src/phase.h @@ -22,8 +22,7 @@ License for more details. You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program; if not, see . */ #ifndef __PHASE__ diff --git a/codec2/src/postfilter.c b/codec2/src/postfilter.c index cd6c28b0..dead6a34 100644 --- a/codec2/src/postfilter.c +++ b/codec2/src/postfilter.c @@ -24,8 +24,7 @@ License for more details. You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program; if not, see . */ #include diff --git a/codec2/src/postfilter.h b/codec2/src/postfilter.h index d4dd4ae0..bf080b1b 100644 --- a/codec2/src/postfilter.h +++ b/codec2/src/postfilter.h @@ -22,8 +22,7 @@ License for more details. You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program; if not, see . */ #ifndef __POSTFILTER__ diff --git a/codec2/src/quantise.c b/codec2/src/quantise.c index 3d1d9bf8..635d4eeb 100644 --- a/codec2/src/quantise.c +++ b/codec2/src/quantise.c @@ -20,8 +20,8 @@ License for more details. You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program; if not, see . + */ #include diff --git a/codec2/src/quantise.h b/codec2/src/quantise.h index eeef8469..387d70bd 100644 --- a/codec2/src/quantise.h +++ b/codec2/src/quantise.h @@ -20,8 +20,7 @@ License for more details. You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program; if not, see . */ #ifndef __QUANTISE__ diff --git a/codec2/src/sine.c b/codec2/src/sine.c index 9263151b..89cdc044 100644 --- a/codec2/src/sine.c +++ b/codec2/src/sine.c @@ -22,8 +22,7 @@ License for more details. You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program; if not, see . */ /*---------------------------------------------------------------------------*\ diff --git a/codec2/src/sine.h b/codec2/src/sine.h index 9cdfbcfb..78e9e10f 100644 --- a/codec2/src/sine.h +++ b/codec2/src/sine.h @@ -22,8 +22,7 @@ License for more details. You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program; if not, see . */ #ifndef __SINE__ diff --git a/codec2/unittest/extract.c b/codec2/unittest/extract.c index b7544edf..5833cd05 100644 --- a/codec2/unittest/extract.c +++ b/codec2/unittest/extract.c @@ -25,8 +25,7 @@ License for more details. You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program; if not, see . */ #define MAX_STR 256 /* maximum string length */ diff --git a/codec2/unittest/genlsp.c b/codec2/unittest/genlsp.c index 8340e2fe..59423776 100644 --- a/codec2/unittest/genlsp.c +++ b/codec2/unittest/genlsp.c @@ -23,8 +23,7 @@ License for more details. You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program; if not, see . */ #define P 10 /* LP order */ diff --git a/codec2/unittest/genres.c b/codec2/unittest/genres.c index 8e5a266e..7fb501b4 100644 --- a/codec2/unittest/genres.c +++ b/codec2/unittest/genres.c @@ -22,8 +22,7 @@ License for more details. You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program; if not, see . */ #include diff --git a/codec2/unittest/lsptest.c b/codec2/unittest/lsptest.c index 8a610a18..c60d7f87 100644 --- a/codec2/unittest/lsptest.c +++ b/codec2/unittest/lsptest.c @@ -22,8 +22,7 @@ License for more details. You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program; if not, see . */ #include diff --git a/codec2/unittest/sd.c b/codec2/unittest/sd.c index f77b5099..74bec67d 100644 --- a/codec2/unittest/sd.c +++ b/codec2/unittest/sd.c @@ -22,8 +22,7 @@ License for more details. You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program; if not, see . */ #define MAX_N 2048 /* maximum DFT size */ diff --git a/codec2/unittest/sd.h b/codec2/unittest/sd.h index 203f9883..c92e0f70 100644 --- a/codec2/unittest/sd.h +++ b/codec2/unittest/sd.h @@ -22,8 +22,7 @@ License for more details. You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program; if not, see . */ #ifndef __SD__ diff --git a/codec2/unittest/tcodec2.c b/codec2/unittest/tcodec2.c index 33806fc7..b95dd449 100644 --- a/codec2/unittest/tcodec2.c +++ b/codec2/unittest/tcodec2.c @@ -22,8 +22,7 @@ License for more details. You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program; if not, see . */ #include diff --git a/codec2/unittest/tcontphase.c b/codec2/unittest/tcontphase.c index ee2f662a..403e4f94 100644 --- a/codec2/unittest/tcontphase.c +++ b/codec2/unittest/tcontphase.c @@ -24,8 +24,7 @@ License for more details. You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program; if not, see . */ #define N 80 /* frame size */ diff --git a/codec2/unittest/tinterp.c b/codec2/unittest/tinterp.c index 7bb37c52..e743e6ba 100644 --- a/codec2/unittest/tinterp.c +++ b/codec2/unittest/tinterp.c @@ -22,8 +22,7 @@ License for more details. You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program; if not, see . */ #include diff --git a/codec2/unittest/tnlp.c b/codec2/unittest/tnlp.c index 19fa0940..5ecff877 100644 --- a/codec2/unittest/tnlp.c +++ b/codec2/unittest/tnlp.c @@ -22,8 +22,7 @@ License for more details. You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program; if not, see . */ #define N 80 /* frame size */ diff --git a/codec2/unittest/tquant.c b/codec2/unittest/tquant.c index 1ff75641..9c70c5fe 100644 --- a/codec2/unittest/tquant.c +++ b/codec2/unittest/tquant.c @@ -22,8 +22,7 @@ License for more details. You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program; if not, see . */ #include diff --git a/codec2/unittest/vqtrain.c b/codec2/unittest/vqtrain.c index b46d4fcf..d3f60d46 100644 --- a/codec2/unittest/vqtrain.c +++ b/codec2/unittest/vqtrain.c @@ -23,8 +23,7 @@ License for more details. You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program; if not, see . */ /*-----------------------------------------------------------------------*\ -- 2.25.1