# HG changeset patch
# User Chris Cannam
# Date 1292252128 0
# Node ID e5907ae6de17a69b470b836a127f67fbbb077290
# Parent  67899fda84f5adcb5d76eae6c5194a4dba340b47
 * Add GPL and README; some tidying

diff -r 67899fda84f5 -r e5907ae6de17 README.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/README.txt	Mon Dec 13 14:55:28 2010 +0000
@@ -0,0 +1,28 @@
+
+
+QM-DSP library
+==============
+
+This is a C++ library of functions for DSP and Music Informatics
+purposes developed at Queen Mary, University of London.
+It is used by the QM Vamp Plugins (q.v.) amongst other things.
+
+This code is Copyright (c) 2006-2010 Queen Mary, University of London,
+with the following exceptions:
+
+maths/pca.c -- Fionn Murtagh, from StatLib; with permission
+
+maths/Polyfit.h -- Allen Miller, David J Taylor and others; also for
+Delphi in the the JEDI Math Library, under the Mozilla Public License
+
+See individual files for further authorship details.
+
+
+License
+=======
+
+This code is provided under the terms of the GNU General Public
+License.  You may use, modify and redistribute it in source or
+binary form, provided you comply with the terms given by the GNU
+General Public License.  See the file COPYING for more details.
+
diff -r 67899fda84f5 -r e5907ae6de17 base/Pitch.cpp
--- a/base/Pitch.cpp	Wed Dec 01 14:05:25 2010 +0000
+++ b/base/Pitch.cpp	Mon Dec 13 14:55:28 2010 +0000
@@ -4,7 +4,12 @@
     QM DSP library
     Centre for Digital Music, Queen Mary, University of London.
     This file Copyright 2006 Chris Cannam.
-    All rights reserved.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
 */
 
 #include "Pitch.h"
diff -r 67899fda84f5 -r e5907ae6de17 base/Pitch.h
--- a/base/Pitch.h	Wed Dec 01 14:05:25 2010 +0000
+++ b/base/Pitch.h	Mon Dec 13 14:55:28 2010 +0000
@@ -4,7 +4,12 @@
     QM DSP library
     Centre for Digital Music, Queen Mary, University of London.
     This file Copyright 2006 Chris Cannam.
-    All rights reserved.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
 */
 
 #ifndef _PITCH_H_
diff -r 67899fda84f5 -r e5907ae6de17 base/Window.h
--- a/base/Window.h	Wed Dec 01 14:05:25 2010 +0000
+++ b/base/Window.h	Mon Dec 13 14:55:28 2010 +0000
@@ -4,7 +4,12 @@
     QM DSP library
     Centre for Digital Music, Queen Mary, University of London.
     This file Copyright 2006 Chris Cannam.
-    All rights reserved.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
 */
 
 #ifndef _WINDOW_H_
diff -r 67899fda84f5 -r e5907ae6de17 dsp/chromagram/Chromagram.cpp
--- a/dsp/chromagram/Chromagram.cpp	Wed Dec 01 14:05:25 2010 +0000
+++ b/dsp/chromagram/Chromagram.cpp	Mon Dec 13 14:55:28 2010 +0000
@@ -4,8 +4,13 @@
     QM DSP Library
 
     Centre for Digital Music, Queen Mary, University of London.
-    This file copyright 2005-2006 Christian Landone.
-    All rights reserved.
+    This file 2005-2006 Christian Landone.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
 */
 
 #include <iostream>
diff -r 67899fda84f5 -r e5907ae6de17 dsp/chromagram/Chromagram.h
--- a/dsp/chromagram/Chromagram.h	Wed Dec 01 14:05:25 2010 +0000
+++ b/dsp/chromagram/Chromagram.h	Mon Dec 13 14:55:28 2010 +0000
@@ -4,8 +4,13 @@
     QM DSP Library
 
     Centre for Digital Music, Queen Mary, University of London.
-    This file copyright 2005-2006 Christian Landone.
-    All rights reserved.
+    This file 2005-2006 Christian Landone.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
 */
 
 #ifndef CHROMAGRAM_H
diff -r 67899fda84f5 -r e5907ae6de17 dsp/chromagram/ConstantQ.cpp
--- a/dsp/chromagram/ConstantQ.cpp	Wed Dec 01 14:05:25 2010 +0000
+++ b/dsp/chromagram/ConstantQ.cpp	Mon Dec 13 14:55:28 2010 +0000
@@ -3,8 +3,13 @@
     QM DSP Library
 
     Centre for Digital Music, Queen Mary, University of London.
-    This file copyright 2005-2006 Christian Landone.
-    All rights reserved.
+    This file 2005-2006 Christian Landone.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
 */
 
 #include "ConstantQ.h"
diff -r 67899fda84f5 -r e5907ae6de17 dsp/chromagram/ConstantQ.h
--- a/dsp/chromagram/ConstantQ.h	Wed Dec 01 14:05:25 2010 +0000
+++ b/dsp/chromagram/ConstantQ.h	Mon Dec 13 14:55:28 2010 +0000
@@ -4,8 +4,13 @@
     QM DSP Library
 
     Centre for Digital Music, Queen Mary, University of London.
-    This file copyright 2005-2006 Christian Landone.
-    All rights reserved.
+    This file 2005-2006 Christian Landone.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
 */
 
 #ifndef CONSTANTQ_H
diff -r 67899fda84f5 -r e5907ae6de17 dsp/mfcc/MFCC.cpp
--- a/dsp/mfcc/MFCC.cpp	Wed Dec 01 14:05:25 2010 +0000
+++ b/dsp/mfcc/MFCC.cpp	Mon Dec 13 14:55:28 2010 +0000
@@ -5,7 +5,12 @@
 
     Centre for Digital Music, Queen Mary, University of London.
     This file copyright 2005 Nicolas Chetry, copyright 2008 QMUL.
-    All rights reserved.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
 */
 
 #include <cmath>
diff -r 67899fda84f5 -r e5907ae6de17 dsp/mfcc/MFCC.h
--- a/dsp/mfcc/MFCC.h	Wed Dec 01 14:05:25 2010 +0000
+++ b/dsp/mfcc/MFCC.h	Mon Dec 13 14:55:28 2010 +0000
@@ -5,7 +5,12 @@
 
     Centre for Digital Music, Queen Mary, University of London.
     This file copyright 2005 Nicolas Chetry, copyright 2008 QMUL.
-    All rights reserved.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
 */
 
 #ifndef MFCC_H
diff -r 67899fda84f5 -r e5907ae6de17 dsp/onsets/DetectionFunction.cpp
--- a/dsp/onsets/DetectionFunction.cpp	Wed Dec 01 14:05:25 2010 +0000
+++ b/dsp/onsets/DetectionFunction.cpp	Mon Dec 13 14:55:28 2010 +0000
@@ -4,8 +4,13 @@
     QM DSP Library
 
     Centre for Digital Music, Queen Mary, University of London.
-    This file copyright 2005-2006 Christian Landone.
-    All rights reserved.
+    This file 2005-2006 Christian Landone.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
 */
 
 #include "DetectionFunction.h"
diff -r 67899fda84f5 -r e5907ae6de17 dsp/onsets/DetectionFunction.h
--- a/dsp/onsets/DetectionFunction.h	Wed Dec 01 14:05:25 2010 +0000
+++ b/dsp/onsets/DetectionFunction.h	Mon Dec 13 14:55:28 2010 +0000
@@ -4,8 +4,13 @@
     QM DSP Library
 
     Centre for Digital Music, Queen Mary, University of London.
-    This file copyright 2005-2006 Christian Landone.
-    All rights reserved.
+    This file 2005-2006 Christian Landone.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
 */
 
 #ifndef DETECTIONFUNCTION_H
diff -r 67899fda84f5 -r e5907ae6de17 dsp/onsets/PeakPicking.cpp
--- a/dsp/onsets/PeakPicking.cpp	Wed Dec 01 14:05:25 2010 +0000
+++ b/dsp/onsets/PeakPicking.cpp	Mon Dec 13 14:55:28 2010 +0000
@@ -4,8 +4,13 @@
     QM DSP Library
 
     Centre for Digital Music, Queen Mary, University of London.
-    This file copyright 2005-2006 Christian Landone.
-    All rights reserved.
+    This file 2005-2006 Christian Landone.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
 */
 
 #include "PeakPicking.h"
diff -r 67899fda84f5 -r e5907ae6de17 dsp/onsets/PeakPicking.h
--- a/dsp/onsets/PeakPicking.h	Wed Dec 01 14:05:25 2010 +0000
+++ b/dsp/onsets/PeakPicking.h	Mon Dec 13 14:55:28 2010 +0000
@@ -4,8 +4,13 @@
     QM DSP Library
 
     Centre for Digital Music, Queen Mary, University of London.
-    This file copyright 2005-2006 Christian Landone.
-    All rights reserved.
+    This file 2005-2006 Christian Landone.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
 */
 
 // PeakPicking.h: interface for the PeakPicking class.
diff -r 67899fda84f5 -r e5907ae6de17 dsp/phasevocoder/PhaseVocoder.cpp
--- a/dsp/phasevocoder/PhaseVocoder.cpp	Wed Dec 01 14:05:25 2010 +0000
+++ b/dsp/phasevocoder/PhaseVocoder.cpp	Mon Dec 13 14:55:28 2010 +0000
@@ -4,8 +4,13 @@
     QM DSP Library
 
     Centre for Digital Music, Queen Mary, University of London.
-    This file copyright 2005-2006 Christian Landone.
-    All rights reserved.
+    This file 2005-2006 Christian Landone.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
 */
 
 #include "PhaseVocoder.h"
diff -r 67899fda84f5 -r e5907ae6de17 dsp/phasevocoder/PhaseVocoder.h
--- a/dsp/phasevocoder/PhaseVocoder.h	Wed Dec 01 14:05:25 2010 +0000
+++ b/dsp/phasevocoder/PhaseVocoder.h	Mon Dec 13 14:55:28 2010 +0000
@@ -4,8 +4,13 @@
     QM DSP Library
 
     Centre for Digital Music, Queen Mary, University of London.
-    This file copyright 2005-2006 Christian Landone.
-    All rights reserved.
+    This file 2005-2006 Christian Landone.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
 */
 
 #ifndef PHASEVOCODER_H
diff -r 67899fda84f5 -r e5907ae6de17 dsp/rateconversion/Decimator.cpp
--- a/dsp/rateconversion/Decimator.cpp	Wed Dec 01 14:05:25 2010 +0000
+++ b/dsp/rateconversion/Decimator.cpp	Mon Dec 13 14:55:28 2010 +0000
@@ -4,8 +4,13 @@
     QM DSP Library
 
     Centre for Digital Music, Queen Mary, University of London.
-    This file copyright 2005-2006 Christian Landone.
-    All rights reserved.
+    This file 2005-2006 Christian Landone.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
 */
 
 #include "Decimator.h"
diff -r 67899fda84f5 -r e5907ae6de17 dsp/rateconversion/Decimator.h
--- a/dsp/rateconversion/Decimator.h	Wed Dec 01 14:05:25 2010 +0000
+++ b/dsp/rateconversion/Decimator.h	Mon Dec 13 14:55:28 2010 +0000
@@ -3,8 +3,13 @@
     QM DSP Library
 
     Centre for Digital Music, Queen Mary, University of London.
-    This file copyright 2005-2006 Christian Landone.
-    All rights reserved.
+    This file 2005-2006 Christian Landone.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
 */
 
 #ifndef DECIMATOR_H
diff -r 67899fda84f5 -r e5907ae6de17 dsp/rhythm/BeatSpectrum.cpp
--- a/dsp/rhythm/BeatSpectrum.cpp	Wed Dec 01 14:05:25 2010 +0000
+++ b/dsp/rhythm/BeatSpectrum.cpp	Mon Dec 13 14:55:28 2010 +0000
@@ -5,7 +5,12 @@
 
     Centre for Digital Music, Queen Mary, University of London.
     This file copyright 2008 Kurt Jacobson and QMUL.
-    All rights reserved.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
 */
 
 #include "BeatSpectrum.h"
diff -r 67899fda84f5 -r e5907ae6de17 dsp/rhythm/BeatSpectrum.h
--- a/dsp/rhythm/BeatSpectrum.h	Wed Dec 01 14:05:25 2010 +0000
+++ b/dsp/rhythm/BeatSpectrum.h	Mon Dec 13 14:55:28 2010 +0000
@@ -5,7 +5,12 @@
 
     Centre for Digital Music, Queen Mary, University of London.
     This file copyright 2008 Kurt Jacobson and QMUL.
-    All rights reserved.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
 */
 
 #ifndef BEATSPECTRUM_H
diff -r 67899fda84f5 -r e5907ae6de17 dsp/segmentation/ClusterMeltSegmenter.cpp
--- a/dsp/segmentation/ClusterMeltSegmenter.cpp	Wed Dec 01 14:05:25 2010 +0000
+++ b/dsp/segmentation/ClusterMeltSegmenter.cpp	Mon Dec 13 14:55:28 2010 +0000
@@ -5,7 +5,12 @@
  *
  * Created by Mark Levy on 23/03/2006.
  * Copyright 2006 Centre for Digital Music, Queen Mary, University of London.
- * All rights reserved.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
  */
 
 #include <cfloat>
diff -r 67899fda84f5 -r e5907ae6de17 dsp/segmentation/ClusterMeltSegmenter.h
--- a/dsp/segmentation/ClusterMeltSegmenter.h	Wed Dec 01 14:05:25 2010 +0000
+++ b/dsp/segmentation/ClusterMeltSegmenter.h	Mon Dec 13 14:55:28 2010 +0000
@@ -5,7 +5,12 @@
  *
  * Created by Mark Levy on 23/03/2006.
  * Copyright 2006 Centre for Digital Music, Queen Mary, University of London.
- * All rights reserved.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
  */
 
 #include <vector>
diff -r 67899fda84f5 -r e5907ae6de17 dsp/segmentation/Segmenter.cpp
--- a/dsp/segmentation/Segmenter.cpp	Wed Dec 01 14:05:25 2010 +0000
+++ b/dsp/segmentation/Segmenter.cpp	Mon Dec 13 14:55:28 2010 +0000
@@ -2,7 +2,13 @@
  *  Segmenter.cpp
  *
  *  Created by Mark Levy on 04/04/2006.
- *  Copyright 2006 Centre for Digital Music, Queen Mary, University of London. All rights reserved.
+ *  Copyright 2006 Centre for Digital Music, Queen Mary, University of London.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
  *
  */
 
diff -r 67899fda84f5 -r e5907ae6de17 dsp/segmentation/Segmenter.h
--- a/dsp/segmentation/Segmenter.h	Wed Dec 01 14:05:25 2010 +0000
+++ b/dsp/segmentation/Segmenter.h	Mon Dec 13 14:55:28 2010 +0000
@@ -6,7 +6,13 @@
  *  soundbite
  *
  *  Created by Mark Levy on 23/03/2006.
- *  Copyright 2006 Centre for Digital Music, Queen Mary, University of London. All rights reserved.
+ *  Copyright 2006 Centre for Digital Music, Queen Mary, University of London.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
  *
  */
 
diff -r 67899fda84f5 -r e5907ae6de17 dsp/segmentation/cluster_melt.c
--- a/dsp/segmentation/cluster_melt.c	Wed Dec 01 14:05:25 2010 +0000
+++ b/dsp/segmentation/cluster_melt.c	Mon Dec 13 14:55:28 2010 +0000
@@ -3,7 +3,13 @@
  *  cluster_melt
  *
  *  Created by Mark Levy on 21/02/2006.
- *  Copyright 2006 Centre for Digital Music, Queen Mary, University of London. All rights reserved.
+ *  Copyright 2006 Centre for Digital Music, Queen Mary, University of London.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
  *
  */
 
diff -r 67899fda84f5 -r e5907ae6de17 dsp/segmentation/cluster_melt.h
--- a/dsp/segmentation/cluster_melt.h	Wed Dec 01 14:05:25 2010 +0000
+++ b/dsp/segmentation/cluster_melt.h	Mon Dec 13 14:55:28 2010 +0000
@@ -5,7 +5,13 @@
  *  cluster_melt
  *
  *  Created by Mark Levy on 21/02/2006.
- *  Copyright 2006 Centre for Digital Music, Queen Mary, University of London. All rights reserved.
+ *  Copyright 2006 Centre for Digital Music, Queen Mary, University of London.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
  *
  */
 
diff -r 67899fda84f5 -r e5907ae6de17 dsp/segmentation/cluster_segmenter.c
--- a/dsp/segmentation/cluster_segmenter.c	Wed Dec 01 14:05:25 2010 +0000
+++ b/dsp/segmentation/cluster_segmenter.c	Mon Dec 13 14:55:28 2010 +0000
@@ -3,7 +3,13 @@
  *  soundbite
  *
  *  Created by Mark Levy on 06/04/2006.
- *  Copyright 2006 Centre for Digital Music, Queen Mary, University of London. All rights reserved.
+ *  Copyright 2006 Centre for Digital Music, Queen Mary, University of London.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
  *
  */
 
diff -r 67899fda84f5 -r e5907ae6de17 dsp/segmentation/cluster_segmenter.h
--- a/dsp/segmentation/cluster_segmenter.h	Wed Dec 01 14:05:25 2010 +0000
+++ b/dsp/segmentation/cluster_segmenter.h	Mon Dec 13 14:55:28 2010 +0000
@@ -6,7 +6,13 @@
  *  soundbite
  *
  *  Created by Mark Levy on 06/04/2006.
- *  Copyright 2006 Centre for Digital Music, Queen Mary, University of London. All rights reserved.
+ *  Copyright 2006 Centre for Digital Music, Queen Mary, University of London.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
  *
  */
 
diff -r 67899fda84f5 -r e5907ae6de17 dsp/segmentation/segment.h
--- a/dsp/segmentation/segment.h	Wed Dec 01 14:05:25 2010 +0000
+++ b/dsp/segmentation/segment.h	Mon Dec 13 14:55:28 2010 +0000
@@ -9,7 +9,13 @@
  *  segment.h
  *
  *  Created by Mark Levy on 06/04/2006.
- *  Copyright 2006 Centre for Digital Music, Queen Mary, University of London. All rights reserved.
+ *  Copyright 2006 Centre for Digital Music, Queen Mary, University of London.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
  *
  */
 
diff -r 67899fda84f5 -r e5907ae6de17 dsp/signalconditioning/DFProcess.cpp
--- a/dsp/signalconditioning/DFProcess.cpp	Wed Dec 01 14:05:25 2010 +0000
+++ b/dsp/signalconditioning/DFProcess.cpp	Mon Dec 13 14:55:28 2010 +0000
@@ -4,8 +4,13 @@
     QM DSP Library
 
     Centre for Digital Music, Queen Mary, University of London.
-    This file copyright 2005-2006 Christian Landone.
-    All rights reserved.
+    This file 2005-2006 Christian Landone.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
 */
 
 #include "DFProcess.h"
diff -r 67899fda84f5 -r e5907ae6de17 dsp/signalconditioning/DFProcess.h
--- a/dsp/signalconditioning/DFProcess.h	Wed Dec 01 14:05:25 2010 +0000
+++ b/dsp/signalconditioning/DFProcess.h	Mon Dec 13 14:55:28 2010 +0000
@@ -4,8 +4,13 @@
     QM DSP Library
 
     Centre for Digital Music, Queen Mary, University of London.
-    This file copyright 2005-2006 Christian Landone.
-    All rights reserved.
+    This file 2005-2006 Christian Landone.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
 */
 
 #ifndef CDFPROCESS_H
diff -r 67899fda84f5 -r e5907ae6de17 dsp/signalconditioning/FiltFilt.cpp
--- a/dsp/signalconditioning/FiltFilt.cpp	Wed Dec 01 14:05:25 2010 +0000
+++ b/dsp/signalconditioning/FiltFilt.cpp	Mon Dec 13 14:55:28 2010 +0000
@@ -4,8 +4,13 @@
     QM DSP Library
 
     Centre for Digital Music, Queen Mary, University of London.
-    This file copyright 2005-2006 Christian Landone.
-    All rights reserved.
+    This file 2005-2006 Christian Landone.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
 */
 
 #include "FiltFilt.h"
diff -r 67899fda84f5 -r e5907ae6de17 dsp/signalconditioning/FiltFilt.h
--- a/dsp/signalconditioning/FiltFilt.h	Wed Dec 01 14:05:25 2010 +0000
+++ b/dsp/signalconditioning/FiltFilt.h	Mon Dec 13 14:55:28 2010 +0000
@@ -4,8 +4,13 @@
     QM DSP Library
 
     Centre for Digital Music, Queen Mary, University of London.
-    This file copyright 2005-2006 Christian Landone.
-    All rights reserved.
+    This file 2005-2006 Christian Landone.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
 */
 
 #ifndef FILTFILT_H
diff -r 67899fda84f5 -r e5907ae6de17 dsp/signalconditioning/Filter.cpp
--- a/dsp/signalconditioning/Filter.cpp	Wed Dec 01 14:05:25 2010 +0000
+++ b/dsp/signalconditioning/Filter.cpp	Mon Dec 13 14:55:28 2010 +0000
@@ -4,8 +4,13 @@
     QM DSP Library
 
     Centre for Digital Music, Queen Mary, University of London.
-    This file copyright 2005-2006 Christian Landone.
-    All rights reserved.
+    This file 2005-2006 Christian Landone.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
 */
 
 #include "Filter.h"
diff -r 67899fda84f5 -r e5907ae6de17 dsp/signalconditioning/Filter.h
--- a/dsp/signalconditioning/Filter.h	Wed Dec 01 14:05:25 2010 +0000
+++ b/dsp/signalconditioning/Filter.h	Mon Dec 13 14:55:28 2010 +0000
@@ -4,8 +4,13 @@
     QM DSP Library
 
     Centre for Digital Music, Queen Mary, University of London.
-    This file copyright 2005-2006 Christian Landone.
-    All rights reserved.
+    This file 2005-2006 Christian Landone.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
 */
 
 #ifndef FILTER_H
diff -r 67899fda84f5 -r e5907ae6de17 dsp/signalconditioning/Framer.cpp
--- a/dsp/signalconditioning/Framer.cpp	Wed Dec 01 14:05:25 2010 +0000
+++ b/dsp/signalconditioning/Framer.cpp	Mon Dec 13 14:55:28 2010 +0000
@@ -4,8 +4,13 @@
     QM DSP Library
 
     Centre for Digital Music, Queen Mary, University of London.
-    This file copyright 2005-2006 Christian Landone.
-    All rights reserved.
+    This file 2005-2006 Christian Landone.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
 */
 
 #include "Framer.h"
diff -r 67899fda84f5 -r e5907ae6de17 dsp/signalconditioning/Framer.h
--- a/dsp/signalconditioning/Framer.h	Wed Dec 01 14:05:25 2010 +0000
+++ b/dsp/signalconditioning/Framer.h	Mon Dec 13 14:55:28 2010 +0000
@@ -4,8 +4,13 @@
     QM DSP Library
 
     Centre for Digital Music, Queen Mary, University of London.
-    This file copyright 2005-2006 Christian Landone.
-    All rights reserved.
+    This file 2005-2006 Christian Landone.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
 */
 
 #ifndef FRAMER_H
diff -r 67899fda84f5 -r e5907ae6de17 dsp/tempotracking/DownBeat.cpp
--- a/dsp/tempotracking/DownBeat.cpp	Wed Dec 01 14:05:25 2010 +0000
+++ b/dsp/tempotracking/DownBeat.cpp	Mon Dec 13 14:55:28 2010 +0000
@@ -5,7 +5,12 @@
 
     Centre for Digital Music, Queen Mary, University of London.
     This file copyright 2008-2009 Matthew Davies and QMUL.
-    All rights reserved.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
 */
 
 #include "DownBeat.h"
diff -r 67899fda84f5 -r e5907ae6de17 dsp/tempotracking/DownBeat.h
--- a/dsp/tempotracking/DownBeat.h	Wed Dec 01 14:05:25 2010 +0000
+++ b/dsp/tempotracking/DownBeat.h	Mon Dec 13 14:55:28 2010 +0000
@@ -5,7 +5,12 @@
 
     Centre for Digital Music, Queen Mary, University of London.
     This file copyright 2008-2009 Matthew Davies and QMUL.
-    All rights reserved.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
 */
 
 #ifndef DOWNBEAT_H
diff -r 67899fda84f5 -r e5907ae6de17 dsp/tempotracking/TempoTrack.cpp
--- a/dsp/tempotracking/TempoTrack.cpp	Wed Dec 01 14:05:25 2010 +0000
+++ b/dsp/tempotracking/TempoTrack.cpp	Mon Dec 13 14:55:28 2010 +0000
@@ -4,8 +4,13 @@
     QM DSP Library
 
     Centre for Digital Music, Queen Mary, University of London.
-    This file copyright 2005-2006 Christian Landone and Matthew Davies.
-    All rights reserved.
+    This file copyright 2005-2006 Christian Landone.and Matthew Davies.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
 */
 
 #include "TempoTrack.h"
diff -r 67899fda84f5 -r e5907ae6de17 dsp/tempotracking/TempoTrack.h
--- a/dsp/tempotracking/TempoTrack.h	Wed Dec 01 14:05:25 2010 +0000
+++ b/dsp/tempotracking/TempoTrack.h	Mon Dec 13 14:55:28 2010 +0000
@@ -4,8 +4,13 @@
     QM DSP Library
 
     Centre for Digital Music, Queen Mary, University of London.
-    This file copyright 2005-2006 Christian Landone.
-    All rights reserved.
+    This file 2005-2006 Christian Landone.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
 */
 
 #ifndef TEMPOTRACK_H
diff -r 67899fda84f5 -r e5907ae6de17 dsp/tempotracking/TempoTrackV2.cpp
--- a/dsp/tempotracking/TempoTrackV2.cpp	Wed Dec 01 14:05:25 2010 +0000
+++ b/dsp/tempotracking/TempoTrackV2.cpp	Mon Dec 13 14:55:28 2010 +0000
@@ -5,7 +5,12 @@
 
     Centre for Digital Music, Queen Mary, University of London.
     This file copyright 2008-2009 Matthew Davies and QMUL.
-    All rights reserved.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
 */
 
 #include "TempoTrackV2.h"
diff -r 67899fda84f5 -r e5907ae6de17 dsp/tempotracking/TempoTrackV2.h
--- a/dsp/tempotracking/TempoTrackV2.h	Wed Dec 01 14:05:25 2010 +0000
+++ b/dsp/tempotracking/TempoTrackV2.h	Mon Dec 13 14:55:28 2010 +0000
@@ -5,7 +5,12 @@
 
     Centre for Digital Music, Queen Mary, University of London.
     This file copyright 2008-2009 Matthew Davies and QMUL.
-    All rights reserved.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
 */
 
 
diff -r 67899fda84f5 -r e5907ae6de17 dsp/tonal/ChangeDetectionFunction.cpp
--- a/dsp/tonal/ChangeDetectionFunction.cpp	Wed Dec 01 14:05:25 2010 +0000
+++ b/dsp/tonal/ChangeDetectionFunction.cpp	Mon Dec 13 14:55:28 2010 +0000
@@ -5,7 +5,12 @@
 
     Centre for Digital Music, Queen Mary, University of London.
     This file copyright 2006 Martin Gasser.
-    All rights reserved.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
 */
 
 #include "ChangeDetectionFunction.h"
diff -r 67899fda84f5 -r e5907ae6de17 dsp/tonal/ChangeDetectionFunction.h
--- a/dsp/tonal/ChangeDetectionFunction.h	Wed Dec 01 14:05:25 2010 +0000
+++ b/dsp/tonal/ChangeDetectionFunction.h	Mon Dec 13 14:55:28 2010 +0000
@@ -5,7 +5,12 @@
 
     Centre for Digital Music, Queen Mary, University of London.
     This file copyright 2006 Martin Gasser.
-    All rights reserved.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
 */
 
 #ifndef _CHANGEDETECTIONFUNCTION_
diff -r 67899fda84f5 -r e5907ae6de17 dsp/tonal/TCSgram.cpp
--- a/dsp/tonal/TCSgram.cpp	Wed Dec 01 14:05:25 2010 +0000
+++ b/dsp/tonal/TCSgram.cpp	Mon Dec 13 14:55:28 2010 +0000
@@ -5,7 +5,12 @@
 
     Centre for Digital Music, Queen Mary, University of London.
     This file copyright 2006 Martin Gasser.
-    All rights reserved.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
 */
 
 #include "TCSgram.h"
diff -r 67899fda84f5 -r e5907ae6de17 dsp/tonal/TCSgram.h
--- a/dsp/tonal/TCSgram.h	Wed Dec 01 14:05:25 2010 +0000
+++ b/dsp/tonal/TCSgram.h	Mon Dec 13 14:55:28 2010 +0000
@@ -5,7 +5,12 @@
 
     Centre for Digital Music, Queen Mary, University of London.
     This file copyright 2006 Martin Gasser.
-    All rights reserved.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
 */
 
 #ifndef _TCSGram_
diff -r 67899fda84f5 -r e5907ae6de17 dsp/tonal/TonalEstimator.cpp
--- a/dsp/tonal/TonalEstimator.cpp	Wed Dec 01 14:05:25 2010 +0000
+++ b/dsp/tonal/TonalEstimator.cpp	Mon Dec 13 14:55:28 2010 +0000
@@ -5,7 +5,12 @@
 
     Centre for Digital Music, Queen Mary, University of London.
     This file copyright 2006 Martin Gasser.
-    All rights reserved.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
 */
 
 #include "TonalEstimator.h"
diff -r 67899fda84f5 -r e5907ae6de17 dsp/tonal/TonalEstimator.h
--- a/dsp/tonal/TonalEstimator.h	Wed Dec 01 14:05:25 2010 +0000
+++ b/dsp/tonal/TonalEstimator.h	Mon Dec 13 14:55:28 2010 +0000
@@ -5,7 +5,12 @@
 
     Centre for Digital Music, Queen Mary, University of London.
     This file copyright 2006 Martin Gasser.
-    All rights reserved.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
 */
 
 #ifndef _TONALESTIMATOR_
diff -r 67899fda84f5 -r e5907ae6de17 dsp/transforms/FFT.cpp
--- a/dsp/transforms/FFT.cpp	Wed Dec 01 14:05:25 2010 +0000
+++ b/dsp/transforms/FFT.cpp	Mon Dec 13 14:55:28 2010 +0000
@@ -15,10 +15,6 @@
 
 #include <iostream>
 
-//#define USE_BUILTIN_FFT 1
-
-#ifdef USE_BUILTIN_FFT
-
 FFT::FFT(unsigned int n) :
     m_n(n),
     m_private(0)
@@ -183,135 +179,3 @@
     }
 }
 
-#else
-
-#include "kissfft/kiss_fft.h"
-#include "kissfft/kiss_fftr.h"
-
-struct KissFFTRec {
-    kiss_fft_cfg forward;
-    kiss_fft_cfg inverse;
-    kiss_fft_cpx *in;
-    kiss_fft_cpx *out;
-};
-
-FFT::FFT(unsigned int n) :
-    m_n(n),
-    m_private(0)
-{
-    if (m_n & 1) {
-        std::cerr << "Error: Odd FFT size " << m_n
-                  << " not supported in this implementation"
-                  << std::endl;
-        return;
-    }
-    KissFFTRec *rec = new KissFFTRec;
-    rec->forward = kiss_fft_alloc(m_n, 0, 0, 0);
-    rec->inverse = kiss_fft_alloc(m_n, 1, 0, 0);
-    rec->in = new kiss_fft_cpx[m_n];
-    rec->out = new kiss_fft_cpx[m_n];
-    m_private = rec;
-}
-
-FFT::~FFT()
-{
-    if (!m_private) return;
-    KissFFTRec *rec = (KissFFTRec *)m_private;
-    kiss_fft_free(rec->forward);
-    kiss_fft_free(rec->inverse);
-    delete[] rec->in;
-    delete[] rec->out;
-}
-
-void
-FFT::process(bool inverse,
-             const double *rin, const double *iin,
-             double *rout, double *iout)
-{
-    if (!m_private) return;
-    KissFFTRec *rec = (KissFFTRec *)m_private;
-    for (int i = 0; i < m_n; ++i) {
-        rec->in[i].r = rin[i];
-    }
-    if (iin) {
-        for (int i = 0; i < m_n; ++i) {
-            rec->in[i].i = iin[i];
-        }
-    } else {
-        for (int i = 0; i < m_n; ++i) {
-            rec->in[i].i = 0.0;
-        }
-    }
-    if (inverse) {
-        kiss_fft(rec->inverse, rec->in, rec->out);
-    } else {
-        kiss_fft(rec->forward, rec->in, rec->out);
-    }
-    for (int i = 0; i < m_n; ++i) {
-        rout[i] = rec->out[i].r;
-        iout[i] = rec->out[i].i;
-    }
-}
-
-struct KissFFTRealRec {
-    kiss_fftr_cfg forward;
-    kiss_fftr_cfg inverse;
-    kiss_fft_cpx *out;
-};
-
-FFTReal::FFTReal(unsigned int n) :
-    m_n(n),
-    m_private(0)
-{
-    if (m_n & 1) {
-        std::cerr << "Error: Odd FFT size " << m_n
-                  << " not supported in this implementation"
-                  << std::endl;
-        return;
-    }
-    KissFFTRealRec *rec = new KissFFTRealRec;
-    rec->forward = kiss_fftr_alloc(m_n, 0, 0, 0);
-    rec->inverse = kiss_fftr_alloc(m_n, 1, 0, 0);
-    rec->out = new kiss_fft_cpx[m_n];
-    m_private = rec;
-}
-
-FFTReal::~FFTReal()
-{
-    if (!m_private) return;
-    KissFFTRealRec *rec = (KissFFTRealRec *)m_private;
-    kiss_fftr_free(rec->forward);
-    kiss_fftr_free(rec->inverse);
-    delete[] rec->out;
-}
-
-void
-FFTReal::process(bool inverse,
-                 const double *rin,
-                 double *rout, double *iout)
-{
-    if (!m_private) return;
-    KissFFTRealRec *rec = (KissFFTRealRec *)m_private;
-    if (inverse) {
-        kiss_fftr(rec->inverse, rin, rec->out);
-        for (int i = 0; i < m_n; ++i) {
-            rout[i] = rec->out[i].r;
-            iout[i] = rec->out[i].i;
-        }
-    } else {
-        kiss_fftr(rec->forward, rin, rec->out);
-        rout[0] = rec->out[0].r;
-        iout[0] = rec->out[0].i;
-        for (int i = 1; i < m_n/2; ++i) {
-            rout[m_n-i] = rout[i] = rec->out[i].r;
-        }
-        for (int i = 1; i < m_n/2; ++i) {
-            iout[i] = rec->out[i].i;
-            iout[m_n-i] = -iout[i];
-        }
-        rout[m_n/2] = rec->out[m_n/2].r;
-        iout[m_n/2] = rec->out[m_n/2].i;
-    }
-}
-
-#endif
diff -r 67899fda84f5 -r e5907ae6de17 dsp/wavelet/Wavelet.cpp
--- a/dsp/wavelet/Wavelet.cpp	Wed Dec 01 14:05:25 2010 +0000
+++ b/dsp/wavelet/Wavelet.cpp	Mon Dec 13 14:55:28 2010 +0000
@@ -5,7 +5,12 @@
 
     Centre for Digital Music, Queen Mary, University of London.
     This file copyright 2009 Thomas Wilmering.
-    All rights reserved.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
 */
 
 #include "Wavelet.h"
diff -r 67899fda84f5 -r e5907ae6de17 dsp/wavelet/Wavelet.h
--- a/dsp/wavelet/Wavelet.h	Wed Dec 01 14:05:25 2010 +0000
+++ b/dsp/wavelet/Wavelet.h	Mon Dec 13 14:55:28 2010 +0000
@@ -5,7 +5,12 @@
 
     Centre for Digital Music, Queen Mary, University of London.
     This file copyright 2009 Thomas Wilmering.
-    All rights reserved.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
 */
 
 #ifndef _WAVELET_H_
diff -r 67899fda84f5 -r e5907ae6de17 hmm/hmm.c
--- a/hmm/hmm.c	Wed Dec 01 14:05:25 2010 +0000
+++ b/hmm/hmm.c	Mon Dec 13 14:55:28 2010 +0000
@@ -2,7 +2,13 @@
  *  hmm.c
  *
  *  Created by Mark Levy on 12/02/2006.
- *  Copyright 2006 Centre for Digital Music, Queen Mary, University of London. All rights reserved.
+ *  Copyright 2006 Centre for Digital Music, Queen Mary, University of London.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
  *
  */
 
diff -r 67899fda84f5 -r e5907ae6de17 hmm/hmm.h
--- a/hmm/hmm.h	Wed Dec 01 14:05:25 2010 +0000
+++ b/hmm/hmm.h	Mon Dec 13 14:55:28 2010 +0000
@@ -9,7 +9,13 @@
  *  hmm.h
  *
  *  Created by Mark Levy on 12/02/2006.
- *  Copyright 2006 Centre for Digital Music, Queen Mary, University of London. All rights reserved.
+ *  Copyright 2006 Centre for Digital Music, Queen Mary, University of London.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
  *
  */
 
diff -r 67899fda84f5 -r e5907ae6de17 maths/Correlation.cpp
--- a/maths/Correlation.cpp	Wed Dec 01 14:05:25 2010 +0000
+++ b/maths/Correlation.cpp	Mon Dec 13 14:55:28 2010 +0000
@@ -4,8 +4,13 @@
     QM DSP Library
 
     Centre for Digital Music, Queen Mary, University of London.
-    This file copyright 2005-2006 Christian Landone.
-    All rights reserved.
+    This file 2005-2006 Christian Landone.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
 */
 
 #include "Correlation.h"
diff -r 67899fda84f5 -r e5907ae6de17 maths/Correlation.h
--- a/maths/Correlation.h	Wed Dec 01 14:05:25 2010 +0000
+++ b/maths/Correlation.h	Mon Dec 13 14:55:28 2010 +0000
@@ -4,8 +4,13 @@
     QM DSP Library
 
     Centre for Digital Music, Queen Mary, University of London.
-    This file copyright 2005-2006 Christian Landone.
-    All rights reserved.
+    This file 2005-2006 Christian Landone.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
 */
 
 #ifndef CORRELATION_H
diff -r 67899fda84f5 -r e5907ae6de17 maths/CosineDistance.cpp
--- a/maths/CosineDistance.cpp	Wed Dec 01 14:05:25 2010 +0000
+++ b/maths/CosineDistance.cpp	Mon Dec 13 14:55:28 2010 +0000
@@ -5,7 +5,12 @@
 
     Centre for Digital Music, Queen Mary, University of London.
     This file copyright 2008 Kurt Jacobson.
-    All rights reserved.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
 */
 
 #include "CosineDistance.h"
diff -r 67899fda84f5 -r e5907ae6de17 maths/CosineDistance.h
--- a/maths/CosineDistance.h	Wed Dec 01 14:05:25 2010 +0000
+++ b/maths/CosineDistance.h	Mon Dec 13 14:55:28 2010 +0000
@@ -5,7 +5,12 @@
 
     Centre for Digital Music, Queen Mary, University of London.
     This file copyright 2008 Kurt Jacobson.
-    All rights reserved.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
 */
 
 #ifndef COSINEDISTANCE_H
diff -r 67899fda84f5 -r e5907ae6de17 maths/KLDivergence.cpp
--- a/maths/KLDivergence.cpp	Wed Dec 01 14:05:25 2010 +0000
+++ b/maths/KLDivergence.cpp	Mon Dec 13 14:55:28 2010 +0000
@@ -5,7 +5,12 @@
 
     Centre for Digital Music, Queen Mary, University of London.
     This file copyright 2008 QMUL
-    All rights reserved.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
 */
 
 #include "KLDivergence.h"
diff -r 67899fda84f5 -r e5907ae6de17 maths/KLDivergence.h
--- a/maths/KLDivergence.h	Wed Dec 01 14:05:25 2010 +0000
+++ b/maths/KLDivergence.h	Mon Dec 13 14:55:28 2010 +0000
@@ -5,7 +5,12 @@
 
     Centre for Digital Music, Queen Mary, University of London.
     This file copyright 2008 QMUL.
-    All rights reserved.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
 */
 
 #ifndef KLDIVERGENCE_H
diff -r 67899fda84f5 -r e5907ae6de17 maths/MathAliases.h
--- a/maths/MathAliases.h	Wed Dec 01 14:05:25 2010 +0000
+++ b/maths/MathAliases.h	Mon Dec 13 14:55:28 2010 +0000
@@ -4,8 +4,13 @@
     QM DSP Library
 
     Centre for Digital Music, Queen Mary, University of London.
-    This file copyright 2005-2006 Christian Landone.
-    All rights reserved.
+    This file 2005-2006 Christian Landone.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
 */
 
 #ifndef MATHALIASES_H
diff -r 67899fda84f5 -r e5907ae6de17 maths/MathUtilities.cpp
--- a/maths/MathUtilities.cpp	Wed Dec 01 14:05:25 2010 +0000
+++ b/maths/MathUtilities.cpp	Mon Dec 13 14:55:28 2010 +0000
@@ -4,8 +4,13 @@
     QM DSP Library
 
     Centre for Digital Music, Queen Mary, University of London.
-    This file copyright 2005-2006 Christian Landone.
-    All rights reserved.
+    This file 2005-2006 Christian Landone.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
 */
 
 #include "MathUtilities.h"
diff -r 67899fda84f5 -r e5907ae6de17 maths/MathUtilities.h
--- a/maths/MathUtilities.h	Wed Dec 01 14:05:25 2010 +0000
+++ b/maths/MathUtilities.h	Mon Dec 13 14:55:28 2010 +0000
@@ -4,8 +4,13 @@
     QM DSP Library
 
     Centre for Digital Music, Queen Mary, University of London.
-    This file copyright 2005-2006 Christian Landone.
-    All rights reserved.
+    This file 2005-2006 Christian Landone.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
 */
 
 #ifndef MATHUTILITIES_H
diff -r 67899fda84f5 -r e5907ae6de17 maths/pca/pca.h
--- a/maths/pca/pca.h	Wed Dec 01 14:05:25 2010 +0000
+++ b/maths/pca/pca.h	Mon Dec 13 14:55:28 2010 +0000
@@ -9,7 +9,13 @@
  *  pca.h
  *
  *  Created by Mark Levy on 08/02/2006.
- *  Copyright 2006 Centre for Digital Music, Queen Mary, University of London. All rights reserved.
+ *  Copyright 2006 Centre for Digital Music, Queen Mary, University of London.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
  *
  */
 
diff -r 67899fda84f5 -r e5907ae6de17 qm-dsp.pro
--- a/qm-dsp.pro	Wed Dec 01 14:05:25 2010 +0000
+++ b/qm-dsp.pro	Mon Dec 13 14:55:28 2010 +0000
@@ -43,7 +43,6 @@
 HEADERS += base/Pitch.h \
            base/Window.h \
            dsp/chromagram/Chromagram.h \
-           dsp/chromagram/ChromaProcess.h \
            dsp/chromagram/ConstantQ.h \
            dsp/keydetection/GetKeyMode.h \
            dsp/mfcc/MFCC.h \
@@ -55,7 +54,6 @@
            dsp/segmentation/cluster_melt.h \
            dsp/segmentation/ClusterMeltSegmenter.h \
            dsp/segmentation/cluster_segmenter.h \
-           dsp/segmentation/SavedFeatureSegmenter.h \
            dsp/segmentation/Segmenter.h \
            dsp/segmentation/segment.h \
            dsp/signalconditioning/DFProcess.h \
@@ -69,9 +67,6 @@
            dsp/tonal/TCSgram.h \
            dsp/tonal/TonalEstimator.h \
            dsp/transforms/FFT.h \
-           dsp/transforms/kissfft/kiss_fft.h \
-           dsp/transforms/kissfft/kiss_fftr.h \
-           dsp/transforms/kissfft/_kiss_fft_guts.h \
            dsp/wavelet/Wavelet.h \
            hmm/hmm.h \
            maths/Correlation.h \
@@ -87,7 +82,6 @@
            thread/Thread.h
 SOURCES += base/Pitch.cpp \
            dsp/chromagram/Chromagram.cpp \
-           dsp/chromagram/ChromaProcess.cpp \
            dsp/chromagram/ConstantQ.cpp \
            dsp/keydetection/GetKeyMode.cpp \
            dsp/mfcc/MFCC.cpp \
@@ -99,7 +93,6 @@
            dsp/segmentation/cluster_melt.c \
            dsp/segmentation/ClusterMeltSegmenter.cpp \
            dsp/segmentation/cluster_segmenter.c \
-           dsp/segmentation/SavedFeatureSegmenter.cpp \
            dsp/segmentation/Segmenter.cpp \
            dsp/signalconditioning/DFProcess.cpp \
            dsp/signalconditioning/Filter.cpp \
@@ -112,8 +105,6 @@
            dsp/tonal/TCSgram.cpp \
            dsp/tonal/TonalEstimator.cpp \
            dsp/transforms/FFT.cpp \
-           dsp/transforms/kissfft/kiss_fft.c \
-           dsp/transforms/kissfft/kiss_fftr.c \
            dsp/wavelet/Wavelet.cpp \
            hmm/hmm.c \
            maths/Correlation.cpp \