# HG changeset patch
# User cannam
# Date 1302181582 0
# Node ID f75f330aa1303813a08e8811ce18a79e7179e705
# Parent  e80ec66613a05433977e4ed0004823262307ca96
Various updates for new repo locations, releases, etc

diff -r e80ec66613a0 -r f75f330aa130 develop.html
--- a/develop.html	Mon Apr 04 12:40:20 2011 +0000
+++ b/develop.html	Thu Apr 07 13:06:22 2011 +0000
@@ -32,37 +32,40 @@
       <p>Vamp plugins use a C binary interface for the greatest level
       of binary compatibility.  However, plugins and hosts are
       strongly encouraged to make use of the set of C++ base classes
-      provided in the SDK.  You can also now <b>write Vamp plugins in
-      Python</b> using <a href="vampy.html">VamPy</a>.</p>
+      provided in the SDK.</p>
 
-      <ul><li>Download the <b>Vamp plugin SDK</b> (<b><i>new!</i></b> version 2.2):
+      <p>Alternatively, you can also now make Vamp plugins in
+      Python using <a href="vampy.html">VamPy</a>.</p>
+
+      <h3>Developer Downloads</h3>
+      <ul><li>Download the <b>Vamp plugin SDK</b> (version 2.2.1):
 
 	<a href="http://sourceforge.net/projects/vamp/"><img style="float:right"
 	      src="http://sourceforge.net/sflogo.php?group_id=192001&type=1"
 width="88" height="31" border="0" alt="SourceForge.net Logo"/></a>
 
-      <ul><li>The development headers and source code: <a href="http://downloads.sourceforge.net/vamp/vamp-plugin-sdk-2.2.tar.gz">Gzipped tar file</a> or <a href="http://downloads.sourceforge.net/vamp/vamp-plugin-sdk-2.2.zip">ZIP file</a> (the contents are identical).</li>
+      <ul><br><li>The main SDK (development headers, source code, example code):<br><a href="http://downloads.sourceforge.net/vamp/vamp-plugin-sdk-2.2.1.tar.gz">As a gzipped tar file</a> or <a href="http://downloads.sourceforge.net/vamp/vamp-plugin-sdk-2.2.1.zip">as a ZIP file</a>.</li><br>
 
-      <li>Pre-compiled library and host binaries for <a href="http://downloads.sourceforge.net/vamp/vamp-plugin-sdk-2.1-binaries-win32-mingw.zip">Windows (MinGW)</a>, <a href="http://downloads.sourceforge.net/vamp/vamp-plugin-sdk-2.1-staticlibs-win32-msvc.zip">Windows (MSVC: static libraries only)</a>, <a href="http://downloads.sourceforge.net/vamp/vamp-plugin-sdk-2.1b-binaries-osx-universal.tar.gz">OS/X (universal)</a>, <a href="http://downloads.sourceforge.net/vamp/vamp-plugin-sdk-2.1-binaries-i686-linux.tar.gz">32-bit Linux</a>, <a href="http://downloads.sourceforge.net/vamp/vamp-plugin-sdk-2.1-binaries-amd64-linux.tar.gz">64-bit Linux</a>, and <a href="http://downloads.sourceforge.net/vamp/vamp-plugin-sdk-2.1-binaries-i686-solaris.tar.gz">32-bit x86 Solaris</a> (these are unchanged from version 2.1).</li>
+      <li>Pre-compiled library and host binaries:<br><a href="http://downloads.sourceforge.net/vamp/vamp-plugin-sdk-2.1-binaries-win32-mingw.zip">Windows (MinGW)</a>, <a href="http://downloads.sourceforge.net/vamp/vamp-plugin-sdk-2.1-staticlibs-win32-msvc.zip">Windows (MSVC: static libraries only)</a>, <a href="http://downloads.sourceforge.net/vamp/vamp-plugin-sdk-2.1b-binaries-osx-universal.tar.gz">OS/X (universal)</a>, <a href="http://downloads.sourceforge.net/vamp/vamp-plugin-sdk-2.1-binaries-i686-linux.tar.gz">32-bit Linux</a>, <a href="http://downloads.sourceforge.net/vamp/vamp-plugin-sdk-2.1-binaries-amd64-linux.tar.gz">64-bit Linux</a>, and <a href="http://downloads.sourceforge.net/vamp/vamp-plugin-sdk-2.1-binaries-i686-solaris.tar.gz">32-bit x86 Solaris</a> (these are unchanged from version 2.1).</li><br>
+
+      <li>Example plugin binaries:<br><a href="http://downloads.sourceforge.net/vamp/vamp-example-plugins-2.0-win32.zip">Windows</a>, <a href="http://downloads.sourceforge.net/vamp/vamp-example-plugins-2.2.1-osx-universal.tar.gz">OS/X</a>, <a href="http://downloads.sourceforge.net/vamp/vamp-example-plugins-2.0-i686-linux.tar.gz">32-bit Linux</a>, <a href="http://downloads.sourceforge.net/vamp/vamp-example-plugins-2.0-i686-linux.tar.gz">64-bit Linux</a>, and <a href="http://downloads.sourceforge.net/vamp/vamp-example-plugins-2.0-i686-solaris.tar.gz">32-bit x86 Solaris</a> (these are unchanged from version 2.0).</li></br>
 
       <li><a href="http://downloads.sourceforge.net/vamp/vamp-plugin-sdk-2.1-docs.tar.gz">API documentation bundle</a>.</li>
 
-      <li>Example plugin binaries for <a href="http://downloads.sourceforge.net/vamp/vamp-example-plugins-2.0-win32.zip">Windows</a>, <a href="http://downloads.sourceforge.net/vamp/vamp-example-plugins-2.0-osx-universal.tar.gz">OS/X</a>, <a href="http://downloads.sourceforge.net/vamp/vamp-example-plugins-2.0-i686-linux.tar.gz">32-bit Linux</a>, <a href="http://downloads.sourceforge.net/vamp/vamp-example-plugins-2.0-i686-linux.tar.gz">64-bit Linux</a>, and <a href="http://downloads.sourceforge.net/vamp/vamp-example-plugins-2.0-i686-solaris.tar.gz">32-bit x86 Solaris</a> (these are unchanged from version 2.0).</li>
-
       <li><a href="http://sourceforge.net/project/showfiles.php?group_id=192001&package_id=225765">The SourceForge download area</a> for any files not listed above.</li>
 
       </ul>
 
       <br>
 
-      <li>Download the <b>Vamp plugin tester</b> (<b><i>new!</i></b> version 1.0), a simple
+      <li>Download the <b>Vamp plugin tester</b> (version 1.0), a simple
       command-line utility that tests your plugins for various common
       failure cases.  It can't check whether you're getting the right
       results, but it can help you write better behaved and more
       resilient plugins.
 
-      <ul><li>Source code: <a
-      href="http://downloads.sourceforge.net/vamp/vamp-plugin-tester-1.0.tar.gz">Gzipped tar file</a>.</li>
+      <ul><br><li>Source code: <a
+      href="http://downloads.sourceforge.net/vamp/vamp-plugin-tester-1.0.tar.gz">Gzipped tar file</a>.</li><br>
       <li>Pre-compiled binaries for <a
       href="http://downloads.sourceforge.net/vamp/vamp-plugin-tester-1.0-win32.zip">Windows</a>,	
       <a href="http://downloads.sourceforge.net/vamp/vamp-plugin-tester-1.0-osx-universal.tar.gz">OS/X (universal)</a>,
@@ -83,21 +86,21 @@
       <li>Read <a href="vamp-programmer-presentation.pdf">a presentation</a> about the principles of Vamp plugins for
       potential developers.</li>
 
-      <li><a href="code-doc/index.html">Read the API documentation online</a>.  Your plugins will normally derive from <a href="code-doc/classVamp_1_1Plugin.html">the Vamp::Plugin class</a>.</li>
+      <li><a href="https://code.soundsoftware.ac.uk/embedded/vamp-plugin-sdk/">Read the API documentation online</a>.  Your plugins will normally derive from <a href="https://code.soundsoftware.ac.uk/embedded/vamp-plugin-sdk/classVamp_1_1Plugin.html">the Vamp::Plugin class</a>.</li>
 
-      <li><a href="http://vamp.svn.sourceforge.net/viewvc/vamp/vamp-plugin-sdk/trunk/README?view=markup">Read the README file for the SDK</a>.</li>
+      <li><a href="https://code.soundsoftware.ac.uk/projects/vamp-plugin-sdk/repository/entry/README">Read the README file for the SDK</a>.</li>
 
-      <li>Have a look at a simple example plugin: <a href="http://vamp.svn.sourceforge.net/viewvc/*checkout*/vamp/vamp-plugin-sdk/trunk/examples/ZeroCrossing.h">header</a>, <a href="http://vamp.svn.sourceforge.net/viewvc/*checkout*/vamp/vamp-plugin-sdk/trunk/examples/ZeroCrossing.cpp">source file</a>.
+      <li>Have a look at a simple example plugin: <a href="https://code.soundsoftware.ac.uk/projects/vamp-plugin-sdk/repository/entry/examples/ZeroCrossing.h">header</a>, <a href="https://code.soundsoftware.ac.uk/projects/vamp-plugin-sdk/repository/entry/examples/ZeroCrossing.cpp">source file</a>.
 
       <li>Read documentation for all the <a href="plugin-doc/vamp-example-plugins.html">SDK example plugins</a>.
 
-      <li><a href="http://vamp.svn.sourceforge.net/viewvc/vamp/vamp-plugin-sdk/trunk/">Browse the SDK and examples code</a> in the Subversion repository.</li>
+      <li><a href="https://code.soundsoftware.ac.uk/projects/vamp-plugin-sdk">Visit the Vamp SDK code project</a>.</li>
 
       </ul>
 
       <p>The entire SDK is published under a very permissive BSD-style
       <a
-      href="http://vamp.svn.sourceforge.net/viewvc/vamp/vamp-plugin-sdk/trunk/COPYING">license</a>.
+      href="https://code.soundsoftware.ac.uk/projects/vamp-plugin-sdk/repository/entry/COPYING">license</a>.
       You are encouraged to copy from it wholesale, whether developing
       open-source or proprietary plugin or host software.</p>
 
diff -r e80ec66613a0 -r f75f330aa130 download.html
--- a/download.html	Mon Apr 04 12:40:20 2011 +0000
+++ b/download.html	Thu Apr 07 13:06:22 2011 +0000
@@ -24,26 +24,26 @@
 
       <h2 id="firstpara">Download Vamp Plugins</h2>
 
-      <p>Several useful Vamp plugins are linked below, and you'll find
-      <a href="#install">installation instructions</a> at the bottom
-      of the page.</p>
+      <p>Here are links to all the Vamp plugins that we have been notified of.</p>
+      <p><b>For <a href="#install">installation instructions</a> see the bottom
+      of the page.</b></p>
 
-      <p>Some of these may be ready to download and run straight away
-      on your platform.  Some are open source; others are not.  Please
-      see the individual plugin pages for details.</p>
+      <p>Many of these will be ready to download and run straight away
+      on your platform.  Licensing terms vary: please see the
+      individual plugin pages for details.</p>
 
-      <p><i><small>Looking for the developer kit?  Look <a href="develop.html">here</a>!</small></i><br>
+      <p><i><small>Want to make your own plugins? <a href="develop.html">Go here!</a></small></i><br>
       <i><small>Would you like to see your plugins listed here? <a href="mailto:cannam@all-day-breakfast.com">Drop us a line!</a></small></i></p>
 
       <table align=center border=1 cellpadding=5>
 
-      <tr><td><b>Plugins</b></td><td><b>Version</b></td><td><b>Linux</b></td><td><b>OS/X</b></td><td><b>Windows</b></td><td><b>Solaris/x86</b></td><td><b>Source&nbsp;code</b></td></tr>
+      <tr><td><b>Plugins</b></td><td><b>Version</b></td><td><b>Linux</b></td><td><b>OS/X</b></td><td><b>Windows</b></td><td><b>Source&nbsp;code</b></td></tr>
 
       <tr><td>Queen Mary plugin set <small>(<a href="plugin-doc/qm-vamp-plugins.html">docs</a>)</small><br><i><small>Note onset detector, beat and barline tracker, tempo estimator, key estimator, tonal change detector, structural segmenter, timbral and rhythmic similarity estimator, wavelet scaleogram, adaptive spectrogram, note transcription, chromagram, constant Q spectrogram and MFCC calculation plugins from the <a href="http://www.elec.qmul.ac.uk/digitalmusic/">Centre for Digital Music</a> at Queen Mary, University of London</small></i></td>
 
-      <td><small>1.6</small></td><td><small><a href="http://isophonics.net/QMVampPlugins">Download</a><br>(32&nbsp;and&nbsp;64&nbsp;bit)</small></td><td><small><a href="http://isophonics.net/QMVampPlugins">Download</a></small></td><td><small><a href="http://isophonics.net/QMVampPlugins">Download</a></small></td><td><small><a href="http://isophonics.net/QMVampPlugins">Download</a></small></td>
+      <td><small>1.7</small></td><td><small><a href="http://isophonics.net/QMVampPlugins">Download</a><br>(32&nbsp;and&nbsp;64&nbsp;bit)</small></td><td><small><a href="http://isophonics.net/QMVampPlugins">Download</a></small></td><td><small><a href="http://isophonics.net/QMVampPlugins">Download</a></small></td>
 
-      <td><small>N/A</small></td></tr>
+      <td><small><a href="https://code.soundsoftware.ac.uk/projects/qm-vamp-plugins/repository">Browse</a></small></td></tr>
 
       <tr><td>Vamp Aubio plugins<br><i><small>Onset detection, pitch tracking, note tracking and tempo tracking plugins using Paul Brossier's <a href="http://aubio.piem.org/">aubio</a> library.</small></i></td><td><small>0.3.2c</small></td>
 
@@ -53,9 +53,7 @@
 
       <td><small><a href="http://downloads.sourceforge.net/vamp/vamp-aubio-plugins-0.3.2c.1-win32.zip">Download</a></small></td>
 
-      <td><small>&nbsp;</small></td>
-
-      <td><small><a href="http://downloads.sourceforge.net/vamp/vamp-aubio-plugins-0.3.2c.tar.gz">Download</a><br><a href="http://vamp.svn.sourceforge.net/viewvc/vamp/vamp-aubio-plugins/trunk/">Browse&nbsp;SVN</a></small></td>
+      <td><small><a href="http://downloads.sourceforge.net/vamp/vamp-aubio-plugins-0.3.2c.tar.gz">Download</a><br>or&nbsp;<a href="http://vamp.svn.sourceforge.net/viewvc/vamp/vamp-aubio-plugins/trunk/">Browse</a></small></td>
 
       </tr>
 
@@ -64,8 +62,7 @@
 	<td>&nbsp;</td>
 	<td><small><a href="http://isophonics.net/nnls-chroma">Download</a></small></td>
 	<td><small><a href="http://isophonics.net/nnls-chroma">Download</a></small></td>
-	<td>&nbsp;</td>
-	<td><small><a href="http://isophonics.net/nnls-chroma">Download</a></small></td>
+	<td><small><a href="http://isophonics.net/nnls-chroma">Download</a><br>or&nbsp;<a href="https://code.soundsoftware.ac.uk/projects/nnls-chroma/repository">Browse</a></small></td>
 	</tr>
 
       <tr><td>Mazurka plugins<br><i><small>Spectral visualisation and feature extraction plugins from the <a href="http://www.mazurka.org.uk/">Mazurka project</a>.</small></i></td>
@@ -78,8 +75,6 @@
 
       <td><small><a href="http://www.mazurka.org.uk/software/sv/plugin/download/#windows">Download</a></small></td>
 
-      <td><small>&nbsp;</small></td>
-
       <td><small><a href="http://www.mazurka.org.uk/software/sv/plugin/">Browse</a></small></td>
 
       </tr>
@@ -96,9 +91,7 @@
 
       <td><small><a href="http://downloads.sourceforge.net/vamp/vamp-libxtract-plugins-0.4.5.20081202.1-win32.zip">Download</a></small></td>
 
-      <td><small>&nbsp;</small></td>
-
-      <td><small><a href="http://downloads.sourceforge.net/vamp/vamp-libxtract-plugins-0.4.5.20081202.tar.gz">Download</a><br><a href="http://vamp.svn.sourceforge.net/viewvc/vamp/vamp-libxtract-plugins/trunk/">Browse&nbsp;SVN</a>
+      <td><small><a href="http://downloads.sourceforge.net/vamp/vamp-libxtract-plugins-0.4.5.20081202.tar.gz">Download</a><br>or&nbsp;<a href="http://vamp.svn.sourceforge.net/viewvc/vamp/vamp-libxtract-plugins/trunk/">Browse</a>
 
       </tr>
 
@@ -117,9 +110,7 @@
 
       <td><small><a href="http://downloads.sourceforge.net/vamp/match-vamp-plugin-0.2.1-win32.zip">Download</a></small></td>
 
-      <td><small><a href="http://downloads.sourceforge.net/vamp/match-vamp-plugin-0.2.1-i686-solaris.tar.gz">Download</a></small></td>
-
-      <td><small><a href="http://downloads.sourceforge.net/vamp/match-vamp-plugin-0.2.1.tar.gz">Download</a></small></td>
+      <td><small><a href="http://downloads.sourceforge.net/vamp/match-vamp-plugin-0.2.1.tar.gz">Download</a><br>or&nbsp;<a href="https://code.soundsoftware.ac.uk/projects/match-vamp/repository">Browse</a></small></td>
 
       </tr>
 
@@ -133,8 +124,6 @@
 
       <td><small>&nbsp;</small></td>
 
-      <td><small>&nbsp;</small></td>
-
       <td><small><a href="http://marsyas.sness.net/download/vamp_plugins">Download</a></small></td>
 
       </tr>
@@ -148,7 +137,6 @@
       <td><small>&nbsp;</small></td>
       <td><small>&nbsp;</small></td>
       <td><small>&nbsp;</small></td>
-      <td><small>&nbsp;</small></td>
 
 
       <td><small><a href="http://downloads.sourceforge.net/vamp/ofa-vamp-plugin-20080128.tar.gz">Download</a></small></td>
@@ -165,8 +153,6 @@
       <td><small><a href="http://downloads.sourceforge.net/vamp/vamp-onsetsds-plugin-0.2-osx-universal.tar.gz">Download</a></small></td>
       <td><small><a href="http://downloads.sourceforge.net/vamp/vamp-onsetsds-plugin-0.2-win32.zip">Download</a></small></td>
 
-      <td><small>&nbsp;</small></td>
-
       <td><small><a href="http://downloads.sourceforge.net/vamp/vamp-onsetsds-plugin-0.2.tar.gz">Download</a></small></td>
 
       </tr>
@@ -179,13 +165,11 @@
 
       <td><small><a href="http://downloads.sourceforge.net/vamp/vamp-example-plugins-2.0-i686-linux.tar.gz">Download</a> (32&nbsp;bit)<br><a href="http://downloads.sourceforge.net/vamp/vamp-example-plugins-2.0-amd64-linux.tar.gz">Download</a> (64&nbsp;bit)</small></td>
 
-      <td><small><a href="http://downloads.sourceforge.net/vamp/vamp-example-plugins-2.0-osx-universal.tar.gz">Download</a></small></td>
+      <td><small><a href="http://downloads.sourceforge.net/vamp/vamp-example-plugins-2.2.1-osx-universal.tar.gz">Download</a></small></td>
 
       <td><small><a href="http://downloads.sourceforge.net/vamp/vamp-example-plugins-2.0-win32.zip">Download</a></small></td>
 
-      <td><small><a href="http://downloads.sourceforge.net/vamp/vamp-example-plugins-2.0-i686-solaris.tar.gz">Download</a></small></td>
-
-      <td><small><a href="http://vamp.svn.sourceforge.net/viewvc/vamp/vamp-plugin-sdk/trunk/examples/">Browse&nbsp;SVN</a>
+      <td><small><a href="http://vamp.svn.sourceforge.net/viewvc/vamp/vamp-plugin-sdk/trunk/examples/">Browse</a>
 
       </tr>
 
@@ -201,10 +185,14 @@
 
       <a name="install"></a><h3>How to Install</h3>
 
-      <p>A Vamp plugin set consists of a single dynamic library (DLL)
-      file containing one or more plugins, and an optional category
-      file (.cat).  To install a plugin set, just copy the plugin's
-      library file and category file (if supplied) into your system or
+      <p>A Vamp plugin set consists of a single dynamic library file
+      with <code>DLL</code>, <code>.dylib</code>, or <code>.so</code>
+      extension (depending on your platform) plus optionally a category
+      file with <code>.cat</code> extension and an RDF description file
+      with <code>.ttl</code> or <code>.n3</code> extension.</p>
+
+      <p>To install a plugin set, just copy the plugin's library file
+      and any supplied category or RDF files into your system or
       personal Vamp plugin location.</p>
 
       <p>The plugin file extension and the location to
@@ -212,11 +200,10 @@
 
       <table align=center border=1 cellpadding=5>
       <tr><td>&nbsp;</td><td><b>File extension</b></td><td><b>System plugin folder</b></td><td><b>Personal plugin folder</b></td></tr>
-      <tr><td>Linux</td><td><code>.so</code></td><td><code>/usr/local/lib/vamp</code></td><td><code>$HOME/vamp</code></td></tr>
+      <tr><td>Linux or other Unix</td><td><code>.so</code></td><td><code>/usr/local/lib/vamp</code></td><td><code>$HOME/vamp</code></td></tr>
       <tr><td>OS/X</td><td><code>.dylib</code></td><td><code>/Library/Audio/Plug-Ins/Vamp</code></td><td><code>$HOME/Library/Audio/Plug-Ins/Vamp</code></td></tr>
       <tr><td>Windows (32-bit)</td><td><code>.dll</code></td><td><code>C:\Program Files\Vamp Plugins</code></td><td>&nbsp;</td></tr>
       <tr><td>Windows (64-bit)</td><td><code>.dll</code></td><td><code>C:\Program Files (x86)\Vamp Plugins</code></td><td>&nbsp;</td></tr>
-      <tr><td>Solaris</td><td><code>.so</code></td><td><code>/usr/local/lib/vamp</code></td><td><code>$HOME/vamp</code></td></tr>
       </table>
 
       <p>You can alternatively set the <code>VAMP_PATH</code>
diff -r e80ec66613a0 -r f75f330aa130 vampy.html
--- a/vampy.html	Mon Apr 04 12:40:20 2011 +0000
+++ b/vampy.html	Thu Apr 07 13:06:22 2011 +0000
@@ -34,7 +34,7 @@
       easily, taking advantage of the wide range of Python libraries
       already available for scientific work.</p>
 
-      <p>Read the <a href="http://vamp.svn.sourceforge.net/viewvc/vamp/vamp-vampy/trunk/README">README file</a> for VamPy, or read an <a href="http://vamp.svn.sourceforge.net/viewvc/vamp/vamp-vampy/trunk/Example%20VamPy%20plugins/PySpectralFeatures.py?content-type=text%2Fplain">example Python plugin</a>.
+      <p>Read the <a href="https://code.soundsoftware.ac.uk/projects/vampy/repository/entry/README">README file</a> for VamPy, or read an <a href="https://code.soundsoftware.ac.uk/projects/vampy/repository/entry/Example%20VamPy%20plugins/PySpectralFeatures.py">example Python plugin</a>.
 
       <p><b>To use VamPy</b>, just download the VamPy wrapper plugin
       compiled for your platform, copy it to your Vamp plugin
@@ -67,7 +67,7 @@
 
       <td><small><a href="http://downloads.sourceforge.net/vamp/vampy-2.0-i386-solaris.tar.bz2">Download</a></small></td>
 
-      <td><small><a href="http://downloads.sourceforge.net/vamp/vampy-2.0.tar.bz2">Download</a></small></td></tr>
+      <td><small><a href="http://downloads.sourceforge.net/vamp/vampy-2.0.tar.bz2">Download</a><br>or&nbsp;<a href="https://code.soundsoftware.ac.uk/projects/vampy/repository">Browse</a></small></td></tr>
 
       </table>