Mercurial > hg > match-vamp

changeset 230:175c8f044e7c v1.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More copyright updates, add CITATION file
author Chris Cannam
date Wed, 09 Sep 2015 09:57:57 +0100
parents c6ec6f04be67
children 55bdec565e9d
files CITATION README src/DistanceMetric.cpp src/DistanceMetric.h src/FeatureConditioner.cpp src/FeatureConditioner.h src/FeatureExtractor.cpp src/FeatureExtractor.h src/Finder.cpp src/Finder.h src/MatchFeatureFeeder.cpp src/MatchFeatureFeeder.h src/MatchPipeline.cpp src/MatchPipeline.h src/MatchTypes.h src/MatchVampPlugin.cpp src/MatchVampPlugin.h src/Matcher.cpp src/Matcher.h src/Path.cpp src/Path.h
diffstat 21 files changed, 80 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/CITATION	Wed Sep 09 09:57:57 2015 +0100
@@ -0,0 +1,6 @@
+ @inproceedings{simon2005a,
+  author = {Simon Dixon and Gerhard Widmer},
+  title = {MATCH: A Music Alignment Tool Chest},
+  booktitle = {Proceedings of the 6th International Conference on Music Information Retrieval (ISMIR-05)},
+  year = {2005}
+}
--- a/README	Tue Sep 08 18:07:58 2015 +0100
+++ b/README	Wed Sep 09 09:57:57 2015 +0100
@@ -11,7 +11,37 @@
 
   http://code.soundsoftware.ac.uk/projects/match-vamp/
 
-This plugin is Copyright (c) 2007-2015 Simon Dixon, Chris Cannam,
-Queen Mary University of London, and Tido GmbH. Distributed under the
-GNU General Public License. See the file COPYING for details.
+This is version 1.0 of the plugin, which includes a number of fixes,
+efficiency improvements, and extra options not present in the prior
+0.2.1 release.
 
+Plugin code by Chris Cannam and Simon Dixon.
+
+
+Citation, License and Use
+-------------------------
+
+If you make use of this software for any public or commercial purpose,
+we ask you to kindly mention the authors and Queen Mary, University of
+London in your user-visible documentation. We're very happy to see
+this sort of use but would much appreciate being credited, independent
+of the requirements of the software license itself (see below).
+
+Use of this software within a proprietary software application is
+likely to require a commercial licence. Please contact the authors or
+QM Innovation, http://www.qminnovation.co.uk/ for more information.
+
+If you make use of this software for academic purposes, please cite:
+
+  S. Dixon and G. Widmer, “MATCH: A Music Alignment Tool Chest”, in
+  Proceedings of the 6th International Conference on Music Information
+  Retrieval (ISMIR-05), 2005.
+
+(See the CITATION file for a BibTeX reference.)
+
+Copyright (c) 2007-2015 Simon Dixon, Chris Cannam, and Queen Mary
+University of London, Copyright (c) 2014-2015 Tido GmbH.
+
+Distributed under the GNU General Public License. See the file COPYING
+for details.
+
--- a/src/DistanceMetric.cpp	Tue Sep 08 18:07:58 2015 +0100
+++ b/src/DistanceMetric.cpp	Wed Sep 09 09:57:57 2015 +0100
@@ -5,7 +5,8 @@
     algorithm.
 
     Centre for Digital Music, Queen Mary, University of London.
-    This file copyright 2007 Simon Dixon, Chris Cannam and QMUL.
+    Copyright (c) 2007-2015 Simon Dixon, Chris Cannam, and Queen Mary
+    University of London, Copyright (c) 2014-2015 Tido GmbH.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
--- a/src/DistanceMetric.h	Tue Sep 08 18:07:58 2015 +0100
+++ b/src/DistanceMetric.h	Wed Sep 09 09:57:57 2015 +0100
@@ -5,7 +5,8 @@
     algorithm.
 
     Centre for Digital Music, Queen Mary, University of London.
-    This file copyright 2007 Simon Dixon, Chris Cannam and QMUL.
+    Copyright (c) 2007-2015 Simon Dixon, Chris Cannam, and Queen Mary
+    University of London, Copyright (c) 2014-2015 Tido GmbH.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
--- a/src/FeatureConditioner.cpp	Tue Sep 08 18:07:58 2015 +0100
+++ b/src/FeatureConditioner.cpp	Wed Sep 09 09:57:57 2015 +0100
@@ -5,6 +5,8 @@
     algorithm.
 
     Centre for Digital Music, Queen Mary, University of London.
+    Copyright (c) 2007-2015 Simon Dixon, Chris Cannam, and Queen Mary
+    University of London, Copyright (c) 2014-2015 Tido GmbH.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
--- a/src/FeatureConditioner.h	Tue Sep 08 18:07:58 2015 +0100
+++ b/src/FeatureConditioner.h	Wed Sep 09 09:57:57 2015 +0100
@@ -5,6 +5,8 @@
     algorithm.
 
     Centre for Digital Music, Queen Mary, University of London.
+    Copyright (c) 2007-2015 Simon Dixon, Chris Cannam, and Queen Mary
+    University of London, Copyright (c) 2014-2015 Tido GmbH.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
--- a/src/FeatureExtractor.cpp	Tue Sep 08 18:07:58 2015 +0100
+++ b/src/FeatureExtractor.cpp	Wed Sep 09 09:57:57 2015 +0100
@@ -5,7 +5,8 @@
     algorithm.
 
     Centre for Digital Music, Queen Mary, University of London.
-    This file copyright 2007 Simon Dixon, Chris Cannam and QMUL.
+    Copyright (c) 2007-2015 Simon Dixon, Chris Cannam, and Queen Mary
+    University of London, Copyright (c) 2014-2015 Tido GmbH.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
--- a/src/FeatureExtractor.h	Tue Sep 08 18:07:58 2015 +0100
+++ b/src/FeatureExtractor.h	Wed Sep 09 09:57:57 2015 +0100
@@ -5,7 +5,8 @@
     algorithm.
 
     Centre for Digital Music, Queen Mary, University of London.
-    This file copyright 2007 Simon Dixon, Chris Cannam and QMUL.
+    Copyright (c) 2007-2015 Simon Dixon, Chris Cannam, and Queen Mary
+    University of London, Copyright (c) 2014-2015 Tido GmbH.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
--- a/src/Finder.cpp	Tue Sep 08 18:07:58 2015 +0100
+++ b/src/Finder.cpp	Wed Sep 09 09:57:57 2015 +0100
@@ -5,7 +5,8 @@
     algorithm.
 
     Centre for Digital Music, Queen Mary, University of London.
-    This file copyright 2007 Simon Dixon, Chris Cannam and QMUL.
+    Copyright (c) 2007-2015 Simon Dixon, Chris Cannam, and Queen Mary
+    University of London, Copyright (c) 2014-2015 Tido GmbH.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
--- a/src/Finder.h	Tue Sep 08 18:07:58 2015 +0100
+++ b/src/Finder.h	Wed Sep 09 09:57:57 2015 +0100
@@ -5,8 +5,9 @@
     algorithm.
 
     Centre for Digital Music, Queen Mary, University of London.
-    This file copyright 2007 Simon Dixon, Chris Cannam and QMUL.
-    
+    Copyright (c) 2007-2015 Simon Dixon, Chris Cannam, and Queen Mary
+    University of London, Copyright (c) 2014-2015 Tido GmbH.
+
     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
--- a/src/MatchFeatureFeeder.cpp	Tue Sep 08 18:07:58 2015 +0100
+++ b/src/MatchFeatureFeeder.cpp	Wed Sep 09 09:57:57 2015 +0100
@@ -5,7 +5,8 @@
     algorithm.
 
     Centre for Digital Music, Queen Mary, University of London.
-    This file copyright 2007 Simon Dixon, Chris Cannam and QMUL.
+    Copyright (c) 2007-2015 Simon Dixon, Chris Cannam, and Queen Mary
+    University of London, Copyright (c) 2014-2015 Tido GmbH.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
--- a/src/MatchFeatureFeeder.h	Tue Sep 08 18:07:58 2015 +0100
+++ b/src/MatchFeatureFeeder.h	Wed Sep 09 09:57:57 2015 +0100
@@ -4,7 +4,8 @@
     algorithm.
 
     Centre for Digital Music, Queen Mary, University of London.
-    This file copyright 2007 Simon Dixon, Chris Cannam and QMUL.
+    Copyright (c) 2007-2015 Simon Dixon, Chris Cannam, and Queen Mary
+    University of London, Copyright (c) 2014-2015 Tido GmbH.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
--- a/src/MatchPipeline.cpp	Tue Sep 08 18:07:58 2015 +0100
+++ b/src/MatchPipeline.cpp	Wed Sep 09 09:57:57 2015 +0100
@@ -4,7 +4,8 @@
     algorithm.
 
     Centre for Digital Music, Queen Mary, University of London.
-    This file copyright 2007 Simon Dixon, Chris Cannam and QMUL.
+    Copyright (c) 2007-2015 Simon Dixon, Chris Cannam, and Queen Mary
+    University of London, Copyright (c) 2014-2015 Tido GmbH.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
--- a/src/MatchPipeline.h	Tue Sep 08 18:07:58 2015 +0100
+++ b/src/MatchPipeline.h	Wed Sep 09 09:57:57 2015 +0100
@@ -4,7 +4,8 @@
     algorithm.
 
     Centre for Digital Music, Queen Mary, University of London.
-    This file copyright 2007 Simon Dixon, Chris Cannam and QMUL.
+    Copyright (c) 2007-2015 Simon Dixon, Chris Cannam, and Queen Mary
+    University of London, Copyright (c) 2014-2015 Tido GmbH.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
--- a/src/MatchTypes.h	Tue Sep 08 18:07:58 2015 +0100
+++ b/src/MatchTypes.h	Wed Sep 09 09:57:57 2015 +0100
@@ -5,7 +5,9 @@
     algorithm.
 
     Centre for Digital Music, Queen Mary, University of London.
-    
+    Copyright (c) 2007-2015 Simon Dixon, Chris Cannam, and Queen Mary
+    University of London, Copyright (c) 2014-2015 Tido GmbH.
+
     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
--- a/src/MatchVampPlugin.cpp	Tue Sep 08 18:07:58 2015 +0100
+++ b/src/MatchVampPlugin.cpp	Wed Sep 09 09:57:57 2015 +0100
@@ -5,7 +5,8 @@
     algorithm.
 
     Centre for Digital Music, Queen Mary, University of London.
-    This file copyright 2007 Simon Dixon, Chris Cannam and QMUL.
+    Copyright (c) 2007-2015 Simon Dixon, Chris Cannam, and Queen Mary
+    University of London, Copyright (c) 2014-2015 Tido GmbH.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
--- a/src/MatchVampPlugin.h	Tue Sep 08 18:07:58 2015 +0100
+++ b/src/MatchVampPlugin.h	Wed Sep 09 09:57:57 2015 +0100
@@ -5,8 +5,9 @@
     algorithm.
 
     Centre for Digital Music, Queen Mary, University of London.
-    This file copyright 2007 Simon Dixon, Chris Cannam and QMUL.
-    
+    Copyright (c) 2007-2015 Simon Dixon, Chris Cannam, and Queen Mary
+    University of London, Copyright (c) 2014-2015 Tido GmbH.
+
     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
--- a/src/Matcher.cpp	Tue Sep 08 18:07:58 2015 +0100
+++ b/src/Matcher.cpp	Wed Sep 09 09:57:57 2015 +0100
@@ -5,7 +5,8 @@
     algorithm.
 
     Centre for Digital Music, Queen Mary, University of London.
-    This file copyright 2007 Simon Dixon, Chris Cannam and QMUL.
+    Copyright (c) 2007-2015 Simon Dixon, Chris Cannam, and Queen Mary
+    University of London, Copyright (c) 2014-2015 Tido GmbH.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
--- a/src/Matcher.h	Tue Sep 08 18:07:58 2015 +0100
+++ b/src/Matcher.h	Wed Sep 09 09:57:57 2015 +0100
@@ -5,7 +5,8 @@
     algorithm.
 
     Centre for Digital Music, Queen Mary, University of London.
-    This file copyright 2007 Simon Dixon, Chris Cannam and QMUL.
+    Copyright (c) 2007-2015 Simon Dixon, Chris Cannam, and Queen Mary
+    University of London, Copyright (c) 2014-2015 Tido GmbH.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
--- a/src/Path.cpp	Tue Sep 08 18:07:58 2015 +0100
+++ b/src/Path.cpp	Wed Sep 09 09:57:57 2015 +0100
@@ -5,7 +5,8 @@
     algorithm.
 
     Centre for Digital Music, Queen Mary, University of London.
-    This file copyright 2007 Simon Dixon, Chris Cannam and QMUL.
+    Copyright (c) 2007-2015 Simon Dixon, Chris Cannam, and Queen Mary
+    University of London, Copyright (c) 2014-2015 Tido GmbH.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
--- a/src/Path.h	Tue Sep 08 18:07:58 2015 +0100
+++ b/src/Path.h	Wed Sep 09 09:57:57 2015 +0100
@@ -5,7 +5,8 @@
     algorithm.
 
     Centre for Digital Music, Queen Mary, University of London.
-    This file copyright 2007 Simon Dixon, Chris Cannam and QMUL.
+    Copyright (c) 2007-2015 Simon Dixon, Chris Cannam, and Queen Mary
+    University of London, Copyright (c) 2014-2015 Tido GmbH.
     
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as