Sonic Visualiser

Revision: 1019
          http://sv1.svn.sourceforge.net/sv1/?rev=1019&view=rev
Author:   cannam
Date:     2008-03-19 06:36:13 -0700 (Wed, 19 Mar 2008)

Log Message:
-----------

* tinkering (does not currently build)

Modified Paths:
--------------
    runner/trunk/AudioDBFeatureWriter.cpp
    runner/trunk/AudioDBFeatureWriter.h
    runner/trunk/RDFFeatureWriter.cpp
    runner/trunk/RDFFeatureWriter.h
    runner/trunk/RDFSinglePluginWriter.h
    runner/trunk/main.cpp
    runner/trunk/runner.pro

Modified: runner/trunk/AudioDBFeatureWriter.cpp
===================================================================
--- runner/trunk/AudioDBFeatureWriter.cpp	2008-03-19 11:20:18 UTC (rev 1018)
+++ runner/trunk/AudioDBFeatureWriter.cpp	2008-03-19 13:36:13 UTC (rev 1019)
@@ -10,18 +10,19 @@
 
 #include <fstream>
 
+#include "AudioDBFeatureWriter.h"
+
 using namespace std;
+using namespace Vamp;
 
-#include "AudioDBFeatureWriter.h"
-
 struct AudioDBFeatureWriter::TrackStream
 {
     string trackid;
     ofstream* ofs;
 };
 
-AudioDBFeatureWriter::AudioDBFeatureWriter(const string& catId, const string& dir) : 
-catalogueId(catId), baseDir(dir)
+AudioDBFeatureWriter::AudioDBFeatureWriter() : 
+    catalogueId("catalog"), baseDir("audiodb")
 {
     
 }
@@ -38,8 +39,23 @@
     // TODO: error handling on close
 }
 
-void AudioDBFeatureWriter::write(const string& trackid, const string& pluginid, const Vamp::Plugin::OutputList& outputList, const Vamp::Plugin::FeatureSet& featureSet)
+void
+AudioDBFeatureWriter::setCatalogueId(const string &catid)
 {
+    catalogueId = catid;
+}
+
+void
+AudioDBFeatureWriter::setBaseDirectory(const string &base)
+{
+    baseDir = base;
+}
+
+void AudioDBFeatureWriter::write(const string& trackid,
+                                 const string& pluginid,
+                                 const Plugin::OutputList& outputList,
+                                 const Plugin::FeatureSet& featureSet)
+{
     // binary output for FeatureSet
     
     // feature-dimension feature-1 feature-2 ...
@@ -59,10 +75,11 @@
     
     
     // iterate through FeatureLists    
-    for (map<int, Vamp::Plugin::FeatureList>::const_iterator iter = featureSet.begin(); iter != featureSet.end(); ++iter)
+    for (Plugin::FeatureSet::const_iterator iter = featureSet.begin();
+         iter != featureSet.end(); ++iter)
     {
-        Vamp::Plugin::FeatureList featureList = iter->second;
-        Vamp::Plugin::OutputDescriptor output = outputList[iter->first];
+        const Plugin::FeatureList &featureList = iter->second;
+        const Plugin::OutputDescriptor &output = outputList[iter->first];
         
         if (output.binCount == 0)    // this kind of feature just outputs timestamps and labels, assume of no interest to audioDB
             continue;    
@@ -114,7 +131,8 @@
 }
 
 // replace file if no file open for this track, else return false
-bool AudioDBFeatureWriter::replaceDBFile(const string& trackid, const string& identifier)
+bool AudioDBFeatureWriter::replaceDBFile(const string& trackid, 
+                                         const string& identifier)
 {
     if (dbfiles.find(identifier) != dbfiles.end() && dbfiles[identifier].trackid == trackid)
         return false;    // have an open file for this track

Modified: runner/trunk/AudioDBFeatureWriter.h
===================================================================
--- runner/trunk/AudioDBFeatureWriter.h	2008-03-19 11:20:18 UTC (rev 1018)
+++ runner/trunk/AudioDBFeatureWriter.h	2008-03-19 13:36:13 UTC (rev 1019)
@@ -22,9 +22,18 @@
 class AudioDBFeatureWriter : public FeatureWriter
 {
 public:
-    AudioDBFeatureWriter(const string& catId, const string& dir);
+    AudioDBFeatureWriter();
     virtual ~AudioDBFeatureWriter();
-    virtual void write(const string& trackid, const string& pluginid, const Vamp::Plugin::OutputList& outputList, const Vamp::Plugin::FeatureSet& featureSet);
+
+    virtual void setParameters(const map<string, string> &params);
+
+    virtual void setCatalogueId(const string &);
+    virtual void setBaseDirectory(const string &);
+
+    virtual void write(const string& trackid,
+                       const string& pluginid,
+                       const Vamp::Plugin::OutputList& outputList, 
+                       const Vamp::Plugin::FeatureSet& featureSet);
     
 private:
     string catalogueId;

Modified: runner/trunk/RDFFeatureWriter.cpp
===================================================================
--- runner/trunk/RDFFeatureWriter.cpp	2008-03-19 11:20:18 UTC (rev 1018)
+++ runner/trunk/RDFFeatureWriter.cpp	2008-03-19 13:36:13 UTC (rev 1019)
@@ -10,18 +10,16 @@
 
 #include <fstream>
 
-using namespace std;
-
 #include "vamp-sdk/PluginHostAdapter.h"
 #include "vamp-sdk/hostext/PluginLoader.h"
 
-using Vamp::HostExt::PluginLoader;
-using Vamp::PluginHostAdapter;
-
 #include "RDFFeatureWriter.h"
 
-RDFFeatureWriter::RDFFeatureWriter(const string& catId, const string& dir) : 
-catalogueId(catId), baseDir(dir)
+using namespace std;
+using namespace Vamp;
+
+RDFFeatureWriter::RDFFeatureWriter() : 
+    catalogueId("."), baseDir(".") //!!!
 {
     
 }
@@ -29,21 +27,24 @@
 RDFFeatureWriter::~RDFFeatureWriter()
 {
     // close all open files
-    for (map<string, RDFSinglePluginWriter*>::iterator iter = featureWriters.begin(); iter != featureWriters.end(); ++iter)
+    for (WriterMap::iterator iter = featureWriters.begin();
+         iter != featureWriters.end(); ++iter)
     {
         delete iter->second;
     }
 }
 
-void RDFFeatureWriter::write(const string& trackid, const string& pluginid, const Vamp::Plugin::OutputList& outputList, const Vamp::Plugin::FeatureSet& featureSet)
+void RDFFeatureWriter::write(const string& trackid,
+                             const string& pluginid,
+                             const Plugin::OutputList& outputList,
+                             const Plugin::FeatureSet& featureSet)
 {
-
-    
     // iterate through FeatureLists    
-    for (map<int, Vamp::Plugin::FeatureList>::const_iterator iter = featureSet.begin(); iter != featureSet.end(); ++iter)
+    for (Plugin::FeatureSet::const_iterator iter = featureSet.begin();
+         iter != featureSet.end(); ++iter)
     {
-        Vamp::Plugin::FeatureList featureList = iter->second;
-        Vamp::Plugin::OutputDescriptor output = outputList[iter->first];
+        const Plugin::FeatureList &featureList = iter->second;
+        const Plugin::OutputDescriptor &output = outputList[iter->first];
         
         for (unsigned int i = 0; i < featureList.size(); ++i)
         {
@@ -75,6 +76,7 @@
             cerr<<"found feature writer with old track"<<endl;
             cerr<<"new : "<<trackid<<", old : "<<featureWriters[pluginid]->trackid<<endl;
             delete featureWriters[pluginid];
+            featureWriters.erase(pluginid);
         }
     }
     cerr<<"allocating new RDFSinglePluginWriter"<<endl;
@@ -82,6 +84,12 @@
     return true;
 }
 
+static bool fileExists(string filepath)
+{
+    std::ifstream fin(filepath.c_str());
+    return (fin != NULL);
+}
+
 string RDFFeatureWriter::getDescriptionFileForPlugin(const string& pluginid)
 {
     string path = "";
@@ -93,7 +101,7 @@
     rdf_exts.push_back("rdf"); rdf_exts.push_back("RDF");
     rdf_exts.push_back("n3");  rdf_exts.push_back("N3");
 
-    PluginLoader *loader = PluginLoader::getInstance();
+    HostExt::PluginLoader *loader = HostExt::PluginLoader::getInstance();
     vector<string> keys = loader->listPlugins();    
     string libname = "";
     for (vector<string>::iterator kitr = keys.begin(); kitr != keys.end(); kitr++)
@@ -132,9 +140,3 @@
     cerr<<"Couldn't find description of plugin !"<<endl;
     return "";
 }
-
-bool fileExists(string filepath)
-{
-    std::ifstream fin(filepath.c_str());
-    return (fin != NULL);
-}

Modified: runner/trunk/RDFFeatureWriter.h
===================================================================
--- runner/trunk/RDFFeatureWriter.h	2008-03-19 11:20:18 UTC (rev 1018)
+++ runner/trunk/RDFFeatureWriter.h	2008-03-19 13:36:13 UTC (rev 1019)
@@ -23,21 +23,27 @@
 class RDFFeatureWriter : public FeatureWriter
 {
 public:
-    RDFFeatureWriter(const string& catId, const string& dir);
+    RDFFeatureWriter();
     virtual ~RDFFeatureWriter();
-    virtual void write(const string& trackid, const string& pluginid, const Vamp::Plugin::OutputList& outputList, const Vamp::Plugin::FeatureSet& featureSet);
+
+    virtual void setParameters(const map<string, string> &params);
+
+    virtual void write(const string& trackid,
+                       const string& pluginid,
+                       const Vamp::Plugin::OutputList& outputList,
+                       const Vamp::Plugin::FeatureSet& featureSet);
+
     static string getDescriptionFileForPlugin(const string& pluginid);
     
 private:
     string catalogueId;
     string baseDir;
+
+    typedef map<string, RDFSinglePluginWriter*> WriterMap;
+    WriterMap featureWriters;
     
-    map<string, RDFSinglePluginWriter*> featureWriters;
-    
     bool newFeatureWriter(const string& trackid, const string& identifier);
     bool replaceFeatureWriter(const string& trackid, const string& identifier);
 };
 
-bool fileExists(string filepath);
-
 #endif

Modified: runner/trunk/RDFSinglePluginWriter.h
===================================================================
--- runner/trunk/RDFSinglePluginWriter.h	2008-03-19 11:20:18 UTC (rev 1018)
+++ runner/trunk/RDFSinglePluginWriter.h	2008-03-19 13:36:13 UTC (rev 1019)
@@ -12,9 +12,12 @@
 #define _RDF_SINGLE_PLUGIN_WRITER_H_
 
 #include <fstream>
-using std::ostream;
+
 #include "FeatureWriter.h"
 
+using std::ostream;
+using std::vector;
+
 enum ODOutputType
 {
     ODOT_UNKNOWN,

Modified: runner/trunk/main.cpp
===================================================================
--- runner/trunk/main.cpp	2008-03-19 11:20:18 UTC (rev 1018)
+++ runner/trunk/main.cpp	2008-03-19 13:36:13 UTC (rev 1019)
@@ -21,11 +21,11 @@
 using std::string;
 
 #include "FeatureExtractionManager.h"
-#include "DefaultFeatureWriter.h"
-#include "RDFFeatureWriter.h"
-#include "AudioDBFeatureWriter.h"
+//#include "DefaultFeatureWriter.h"
+//#include "RDFFeatureWriter.h"
+//#include "AudioDBFeatureWriter.h"
+#include "FeatureWriterFactory.h"
 
-
 // Desired options:
 //
 // * output preference:
@@ -42,7 +42,7 @@
 //   - based on input (obvious choice for one file per input file modes)
 //   - specified on command line (obvious choice for all in one file mode)
 //
-// * output format:
+// * output format: one or more of
 //   - RDF
 //   - AudioDB
 //   - Vamp Simple Host format
@@ -78,7 +78,7 @@
 //
 // MAYBE:
 // * input files to transform:
-//   - supple file names or URIs on command line
+//   - supply file names or URIs on command line
 //   - use all files in a given directory or tree
 
 
@@ -119,10 +119,9 @@
     string writerType = "";
     if (args.size() > 1)
         writerType = args[1].toStdString();
-    if (writerType == "rdf")
-        writers.push_back(new RDFFeatureWriter(".", "."));// For now, dump RDF adjacent to audio
-    if (writerType == "adb")
-        writers.push_back(new AudioDBFeatureWriter("catalog01", "audiodb"));
+
+    FeatureWriter *writer = FeatureWriterFactory::createWriter(writerType);
+    if (writer) writers.push_back(writer);
     
     /*
      // list all the available plugins as transforms

Modified: runner/trunk/runner.pro
===================================================================
--- runner/trunk/runner.pro	2008-03-19 11:20:18 UTC (rev 1018)
+++ runner/trunk/runner.pro	2008-03-19 13:36:13 UTC (rev 1019)
@@ -29,8 +29,8 @@
 MOC_DIR = tmp_moc
 
 # Input
-HEADERS += 
-SOURCES += main.cpp DefaultFeatureWriter.cpp RDFFeatureWriter.cpp RDFSinglePluginWriter.cpp FeatureExtractionManager.cpp AudioDBFeatureWriter.cpp 
+HEADERS += AudioDBFeatureWriter.h      FeatureWriterFactory.h  RDFSinglePluginWriter.h DefaultFeatureWriter.h      FeatureWriter.h         SimpleRDFFeatureWriter.h FeatureExtractionManager.h  RDFFeatureWriter.h
+SOURCES += main.cpp DefaultFeatureWriter.cpp RDFFeatureWriter.cpp RDFSinglePluginWriter.cpp FeatureExtractionManager.cpp AudioDBFeatureWriter.cpp FeatureWriterFactory.cpp
 
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1020
          http://sv1.svn.sourceforge.net/sv1/?rev=1020&view=rev
Author:   cannam
Date:     2008-03-19 06:54:37 -0700 (Wed, 19 Mar 2008)

Log Message:
-----------

* basic factory class

Added Paths:
-----------
    runner/trunk/FeatureWriterFactory.cpp
    runner/trunk/FeatureWriterFactory.h

Added: runner/trunk/FeatureWriterFactory.cpp
===================================================================
--- runner/trunk/FeatureWriterFactory.cpp	                        (rev 0)
+++ runner/trunk/FeatureWriterFactory.cpp	2008-03-19 13:54:37 UTC (rev 1020)
@@ -0,0 +1,28 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
+#include "FeatureWriterFactory.h"
+
+#include "RDFFeatureWriter.h"
+#include "AudioDBFeatureWriter.h"
+
+set<string>
+FeatureWriterFactory::getWriterTags()
+{
+    set<string> tags;
+    tags.insert("rdf");
+    tags.insert("audiodb");
+//    tags.insert("csv");
+    return tags;
+}
+
+FeatureWriter *
+FeatureWriterFactory::createWriter(string tag)
+{
+    if (tag == "rdf") {
+        return new RDFFeatureWriter();
+    } else if (tag == "audiodb") {
+        return new AudioDBFeatureWriter();
+    }
+
+    return 0;
+}

Added: runner/trunk/FeatureWriterFactory.h
===================================================================
--- runner/trunk/FeatureWriterFactory.h	                        (rev 0)
+++ runner/trunk/FeatureWriterFactory.h	2008-03-19 13:54:37 UTC (rev 1020)
@@ -0,0 +1,22 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
+#ifndef _FEATURE_WRITER_FACTORY_H_
+#define _FEATURE_WRITER_FACTORY_H_
+
+#include <set>
+#include <string>
+
+using std::set;
+using std::string;
+
+class FeatureWriter;
+
+class FeatureWriterFactory
+{
+public:
+    static set<string> getWriterTags();
+    static FeatureWriter *createWriter(string tag);
+};
+
+
+#endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1021
          http://sv1.svn.sourceforge.net/sv1/?rev=1021&view=rev
Author:   cannam
Date:     2008-03-19 09:23:47 -0700 (Wed, 19 Mar 2008)

Log Message:
-----------

* Print out usage notes (not actually implemented yet, but hey! the spec is
  half the work!)
* A few other tweaks

Modified Paths:
--------------
    runner/trunk/AudioDBFeatureWriter.cpp
    runner/trunk/AudioDBFeatureWriter.h
    runner/trunk/DefaultFeatureWriter.cpp
    runner/trunk/DefaultFeatureWriter.h
    runner/trunk/FeatureExtractionManager.cpp
    runner/trunk/FeatureExtractionManager.h
    runner/trunk/FeatureWriter.h
    runner/trunk/FeatureWriterFactory.cpp
    runner/trunk/FeatureWriterFactory.h
    runner/trunk/RDFFeatureWriter.cpp
    runner/trunk/RDFFeatureWriter.h
    runner/trunk/RDFSinglePluginWriter.cpp
    runner/trunk/RDFSinglePluginWriter.h
    runner/trunk/SimpleRDFFeatureWriter.cpp
    runner/trunk/SimpleRDFFeatureWriter.h
    runner/trunk/main.cpp

Modified: runner/trunk/AudioDBFeatureWriter.cpp
===================================================================
--- runner/trunk/AudioDBFeatureWriter.cpp	2008-03-19 13:54:37 UTC (rev 1020)
+++ runner/trunk/AudioDBFeatureWriter.cpp	2008-03-19 16:23:47 UTC (rev 1021)
@@ -1,13 +1,18 @@
 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
 /*
- *  DefaultFeatureWriter.cpp
- *  runner
- *
- *  Created by Mark Levy on 01/11/2007.
- *  Copyright 2007 Queen Mary, Univesity of London. All rights reserved.
- *
- */
+    Sonic Annotator
+    A utility for batch feature extraction from audio files.
+    Mark Levy, Chris Sutton and Chris Cannam, Queen Mary, University of London.
+    Copyright 2007-2008 QMUL.
 
+    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 <fstream>
 
 #include "AudioDBFeatureWriter.h"
@@ -15,6 +20,12 @@
 using namespace std;
 using namespace Vamp;
 
+string
+AudioDBFeatureWriter::catalogueIdParam = "catid";
+
+string
+AudioDBFeatureWriter::baseDirParam = "basedir";
+
 struct AudioDBFeatureWriter::TrackStream
 {
     string trackid;
@@ -39,7 +50,29 @@
     // TODO: error handling on close
 }
 
+map<string, string>
+AudioDBFeatureWriter::getSupportedParameters() const
+{
+    map<string, string> params;
+    params[catalogueIdParam] = "Catalogue ID";
+    params[baseDirParam] = "Base output directory path";
+    return params;
+}
+
 void
+AudioDBFeatureWriter::setParameters(map<string, string> &params)
+{
+    if (params.find("catalogue") != params.end()) {
+        setCatalogueId(params["catalogue"]);
+        params.erase("catalogue");
+    }
+    if (params.find("basedir") != params.end()) {
+        setCatalogueId(params["basedir"]);
+        params.erase("basedir");
+    }
+}
+
+void
 AudioDBFeatureWriter::setCatalogueId(const string &catid)
 {
     catalogueId = catid;

Modified: runner/trunk/AudioDBFeatureWriter.h
===================================================================
--- runner/trunk/AudioDBFeatureWriter.h	2008-03-19 13:54:37 UTC (rev 1020)
+++ runner/trunk/AudioDBFeatureWriter.h	2008-03-19 16:23:47 UTC (rev 1021)
@@ -1,13 +1,18 @@
 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
 /*
- *  AudioDBFeatureWriter.h
- *  runner
- *
- *  Created by Mark Levy on 14/11/2007.
- *  Copyright 2007 Queen Mary, University of London. All rights reserved.
- *
- */
+    Sonic Annotator
+    A utility for batch feature extraction from audio files.
+    Mark Levy, Chris Sutton and Chris Cannam, Queen Mary, University of London.
+    Copyright 2007-2008 QMUL.
 
+    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 _AUDIO_DB_FEATURE_WRITER_H_
 #define _AUDIO_DB_FEATURE_WRITER_H_
 
@@ -25,7 +30,8 @@
     AudioDBFeatureWriter();
     virtual ~AudioDBFeatureWriter();
 
-    virtual void setParameters(const map<string, string> &params);
+    virtual map<string, string> getSupportedParameters() const;
+    virtual void setParameters(map<string, string> &params);
 
     virtual void setCatalogueId(const string &);
     virtual void setBaseDirectory(const string &);
@@ -38,6 +44,9 @@
 private:
     string catalogueId;
     string baseDir;
+
+    static string catalogueIdParam;
+    static string baseDirParam;
     
     struct TrackStream;
     map<string, TrackStream> dbfiles;

Modified: runner/trunk/DefaultFeatureWriter.cpp
===================================================================
--- runner/trunk/DefaultFeatureWriter.cpp	2008-03-19 13:54:37 UTC (rev 1020)
+++ runner/trunk/DefaultFeatureWriter.cpp	2008-03-19 16:23:47 UTC (rev 1021)
@@ -1,13 +1,18 @@
 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
 /*
- *  DefaultFeatureWriter.cpp
- *  vamphost
- *
- *  Created by Mark Levy on 01/11/2007.
- *  Copyright 2007 Queen Mary, Univesity of London. All rights reserved.
- *
- */
+    Sonic Annotator
+    A utility for batch feature extraction from audio files.
+    Mark Levy, Chris Sutton and Chris Cannam, Queen Mary, University of London.
+    Copyright 2007-2008 QMUL.
 
+    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>
 #include <map>
 

Modified: runner/trunk/DefaultFeatureWriter.h
===================================================================
--- runner/trunk/DefaultFeatureWriter.h	2008-03-19 13:54:37 UTC (rev 1020)
+++ runner/trunk/DefaultFeatureWriter.h	2008-03-19 16:23:47 UTC (rev 1021)
@@ -1,13 +1,18 @@
 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
 /*
- *  DefaultFeatureWriter.h
- *  vamphost
- *
- *  Created by Mark Levy on 01/11/2007.
- *  Copyright 2007 Queen Mary, Univesity of London. All rights reserved.
- *
- */
+    Sonic Annotator
+    A utility for batch feature extraction from audio files.
+    Mark Levy, Chris Sutton and Chris Cannam, Queen Mary, University of London.
+    Copyright 2007-2008 QMUL.
 
+    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 _DEFAULT_FEATURE_WRITER_H_
 #define _DEFAULT_FEATURE_WRITER_H_
 

Modified: runner/trunk/FeatureExtractionManager.cpp
===================================================================
--- runner/trunk/FeatureExtractionManager.cpp	2008-03-19 13:54:37 UTC (rev 1020)
+++ runner/trunk/FeatureExtractionManager.cpp	2008-03-19 16:23:47 UTC (rev 1021)
@@ -1,13 +1,18 @@
 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
 /*
- *  FeatureExtractionManager.cpp
- *  runner
- *
- *  Created by Mark Levy on 31/10/2007.
- *  Copyright 2007 Queen Mary, University of London. All rights reserved.
- *
- */
+    Sonic Annotator
+    A utility for batch feature extraction from audio files.
+    Mark Levy, Chris Sutton and Chris Cannam, Queen Mary, University of London.
+    Copyright 2007-2008 QMUL.
 
+    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>
 
 using namespace std;

Modified: runner/trunk/FeatureExtractionManager.h
===================================================================
--- runner/trunk/FeatureExtractionManager.h	2008-03-19 13:54:37 UTC (rev 1020)
+++ runner/trunk/FeatureExtractionManager.h	2008-03-19 16:23:47 UTC (rev 1021)
@@ -1,13 +1,18 @@
 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
 /*
- *  FeatureExtractionManager.h
- *  runner
- *
- *  Created by Mark Levy on 31/10/2007.
- *  Copyright 2007 Queen Mary, University of London. All rights reserved.
- *
- */
+    Sonic Annotator
+    A utility for batch feature extraction from audio files.
+    Mark Levy, Chris Sutton and Chris Cannam, Queen Mary, University of London.
+    Copyright 2007-2008 QMUL.
 
+    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 _FEATURE_EXTRACTION_MANAGER_H_
 #define _FEATURE_EXTRACTION_MANAGER_H_
 

Modified: runner/trunk/FeatureWriter.h
===================================================================
--- runner/trunk/FeatureWriter.h	2008-03-19 13:54:37 UTC (rev 1020)
+++ runner/trunk/FeatureWriter.h	2008-03-19 16:23:47 UTC (rev 1021)
@@ -1,27 +1,46 @@
 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
 /*
- *  FeatureWriter.h
- *  vamphost
- *
- *  Created by Mark Levy on 01/11/2007.
- *  Copyright 2007 Queen Mary, Univesity of London. All rights reserved.
- *
- */
+    Sonic Annotator
+    A utility for batch feature extraction from audio files.
+    Mark Levy, Chris Sutton and Chris Cannam, Queen Mary, University of London.
+    Copyright 2007-2008 QMUL.
 
+    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 _FEATURE_WRITER_H_
 #define _FEATURE_WRITER_H_
 
 #include <string>
+#include <map>
 
+#include <vamp-sdk/Plugin.h>
+
 using std::string;
+using std::map;
 
-#include <vamp-sdk/Plugin.h>
-
 class FeatureWriter
 {
 public:
     virtual ~FeatureWriter() { }
-    virtual void write(const string& trackid, const string& pluginid, const Vamp::Plugin::OutputList& outputList, const Vamp::Plugin::FeatureSet& featureSet) = 0;
+
+    virtual map<string, string> getSupportedParameters() const {
+        return map<string, string>();
+    }
+
+    virtual void setParameters(map<string, string> &params) {
+        return;
+    }
+
+    virtual void write(const string& trackid,
+                       const string& pluginid,
+                       const Vamp::Plugin::OutputList& outputList,
+                       const Vamp::Plugin::FeatureSet& featureSet) = 0;
 };
 
 #endif

Modified: runner/trunk/FeatureWriterFactory.cpp
===================================================================
--- runner/trunk/FeatureWriterFactory.cpp	2008-03-19 13:54:37 UTC (rev 1020)
+++ runner/trunk/FeatureWriterFactory.cpp	2008-03-19 16:23:47 UTC (rev 1021)
@@ -1,5 +1,19 @@
 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
 
+/*
+    Sonic Annotator
+    A utility for batch feature extraction from audio files.
+    Mark Levy, Chris Sutton and Chris Cannam, Queen Mary, University of London.
+    Copyright 2007-2008 QMUL.
+
+    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 "FeatureWriterFactory.h"
 
 #include "RDFFeatureWriter.h"

Modified: runner/trunk/FeatureWriterFactory.h
===================================================================
--- runner/trunk/FeatureWriterFactory.h	2008-03-19 13:54:37 UTC (rev 1020)
+++ runner/trunk/FeatureWriterFactory.h	2008-03-19 16:23:47 UTC (rev 1021)
@@ -1,5 +1,19 @@
 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
 
+/*
+    Sonic Annotator
+    A utility for batch feature extraction from audio files.
+    Mark Levy, Chris Sutton and Chris Cannam, Queen Mary, University of London.
+    Copyright 2007-2008 QMUL.
+
+    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 _FEATURE_WRITER_FACTORY_H_
 #define _FEATURE_WRITER_FACTORY_H_
 

Modified: runner/trunk/RDFFeatureWriter.cpp
===================================================================
--- runner/trunk/RDFFeatureWriter.cpp	2008-03-19 13:54:37 UTC (rev 1020)
+++ runner/trunk/RDFFeatureWriter.cpp	2008-03-19 16:23:47 UTC (rev 1021)
@@ -1,13 +1,18 @@
 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
 /*
- *  RDFFeatureWriter.cpp
- *  runner
- *
- *  Created by Chris Sutton 13/12/2007.
- *  Copyright 2007 Queen Mary, Univesity of London. All rights reserved.
- *
- */
+    Sonic Annotator
+    A utility for batch feature extraction from audio files.
+    Mark Levy, Chris Sutton and Chris Cannam, Queen Mary, University of London.
+    Copyright 2007-2008 QMUL.
 
+    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 <fstream>
 
 #include "vamp-sdk/PluginHostAdapter.h"
@@ -34,6 +39,24 @@
     }
 }
 
+map<string, string>
+RDFFeatureWriter::getSupportedParameters() const
+{
+    map<string, string> params;
+    params["one-file"] = "Create one output file only:\nall transforms for all inputs written to the same file";
+    params["per-input"] = "Create one output file for each input file:\nall transforms for that input written to the same file";
+    params["per-transform"] = "Create output file for each transform on each input";
+    params["plain"] = "Use \"plain\" RDF even if transform metadata is available";
+    params["basedir"] = "Base output directory path (default same as input file)";
+    return params;
+}
+
+void
+RDFFeatureWriter::setParameters(map<string, string> &params)
+{
+    //!!! implement
+}
+
 void RDFFeatureWriter::write(const string& trackid,
                              const string& pluginid,
                              const Plugin::OutputList& outputList,

Modified: runner/trunk/RDFFeatureWriter.h
===================================================================
--- runner/trunk/RDFFeatureWriter.h	2008-03-19 13:54:37 UTC (rev 1020)
+++ runner/trunk/RDFFeatureWriter.h	2008-03-19 16:23:47 UTC (rev 1021)
@@ -1,13 +1,18 @@
 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
 /*
- *  RDFFeatureWriter.h
- *  runner
- *
- *  Created by Chris Sutton on 13/12/2007.
- *  Copyright 2007 Queen Mary, University of London. All rights reserved.
- *
- */
+    Sonic Annotator
+    A utility for batch feature extraction from audio files.
+    Mark Levy, Chris Sutton and Chris Cannam, Queen Mary, University of London.
+    Copyright 2007-2008 QMUL.
 
+    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 _RDF_FEATURE_WRITER_H_
 #define _RDF_FEATURE_WRITER_H_
 
@@ -26,7 +31,8 @@
     RDFFeatureWriter();
     virtual ~RDFFeatureWriter();
 
-    virtual void setParameters(const map<string, string> &params);
+    virtual map<string, string> getSupportedParameters() const;
+    virtual void setParameters(map<string, string> &params);
 
     virtual void write(const string& trackid,
                        const string& pluginid,

Modified: runner/trunk/RDFSinglePluginWriter.cpp
===================================================================
--- runner/trunk/RDFSinglePluginWriter.cpp	2008-03-19 13:54:37 UTC (rev 1020)
+++ runner/trunk/RDFSinglePluginWriter.cpp	2008-03-19 16:23:47 UTC (rev 1021)
@@ -1,13 +1,18 @@
 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
 /*
- *  RDFSinglePluginWriter.cpp
- *  vamphost
- *
- *  Created by Chris Sutton on 13/12/2007.
- *  Copyright 2007 Queen Mary, University of London. All rights reserved.
- *
- */
+    Sonic Annotator
+    A utility for batch feature extraction from audio files.
+    Mark Levy, Chris Sutton and Chris Cannam, Queen Mary, University of London.
+    Copyright 2007-2008 QMUL.
 
+    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>
 #include <fstream>
 #include <map>

Modified: runner/trunk/RDFSinglePluginWriter.h
===================================================================
--- runner/trunk/RDFSinglePluginWriter.h	2008-03-19 13:54:37 UTC (rev 1020)
+++ runner/trunk/RDFSinglePluginWriter.h	2008-03-19 16:23:47 UTC (rev 1021)
@@ -1,13 +1,18 @@
 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
 /*
- *  RDFSinglePluginWriter.h
- *  vamphost
- *
- *  Created by Chris Sutton on 13/12/2007.
- *  Copyright 2007 Queen Mary, University of London. All rights reserved.
- *
- */
+    Sonic Annotator
+    A utility for batch feature extraction from audio files.
+    Mark Levy, Chris Sutton and Chris Cannam, Queen Mary, University of London.
+    Copyright 2007-2008 QMUL.
 
+    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 _RDF_SINGLE_PLUGIN_WRITER_H_
 #define _RDF_SINGLE_PLUGIN_WRITER_H_
 

Modified: runner/trunk/SimpleRDFFeatureWriter.cpp
===================================================================
--- runner/trunk/SimpleRDFFeatureWriter.cpp	2008-03-19 13:54:37 UTC (rev 1020)
+++ runner/trunk/SimpleRDFFeatureWriter.cpp	2008-03-19 16:23:47 UTC (rev 1021)
@@ -1,14 +1,18 @@
 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
 /*
- *  SimpleRDFFeatureWriter.cpp
- *  vamphost
- *
- *  Created by Chris Sutton on 01/11/2007.
- *  Using code from Yves Raimond as a basis.
- *  Copyright 2007 Queen Mary, University of London. All rights reserved.
- *
- */
+    Sonic Annotator
+    A utility for batch feature extraction from audio files.
+    Mark Levy, Chris Sutton and Chris Cannam, Queen Mary, University of London.
+    Copyright 2007-2008 QMUL.
 
+    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>
 #include <map>
 using namespace std;

Modified: runner/trunk/SimpleRDFFeatureWriter.h
===================================================================
--- runner/trunk/SimpleRDFFeatureWriter.h	2008-03-19 13:54:37 UTC (rev 1020)
+++ runner/trunk/SimpleRDFFeatureWriter.h	2008-03-19 16:23:47 UTC (rev 1021)
@@ -1,13 +1,18 @@
 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
 /*
- *  SimpleRDFFeatureWriter.h
- *  vamphost
- *
- *  Created by Chris Sutton on 01/11/2007.
- *  Copyright 2007 Queen Mary, University of London. All rights reserved.
- *
- */
+    Sonic Annotator
+    A utility for batch feature extraction from audio files.
+    Mark Levy, Chris Sutton and Chris Cannam, Queen Mary, University of London.
+    Copyright 2007-2008 QMUL.
 
+    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 _SIMPLE_RDF_FEATURE_WRITER_H_
 #define _SIMPLE_RDF_FEATURE_WRITER_H_
 

Modified: runner/trunk/main.cpp
===================================================================
--- runner/trunk/main.cpp	2008-03-19 13:54:37 UTC (rev 1020)
+++ runner/trunk/main.cpp	2008-03-19 16:23:47 UTC (rev 1021)
@@ -1,13 +1,18 @@
 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
 /*
- *  main.cpp
- *  vamphost
- *
- *  Created by Mark Levy on 02/11/2007.
- *  Copyright 2007 Queen Mary, University of London. All rights reserved.
- *
- */
+    Sonic Annotator
+    A utility for batch feature extraction from audio files.
+    Mark Levy, Chris Sutton and Chris Cannam, Queen Mary, University of London.
+    Copyright 2007-2008 QMUL.
 
+    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>
 #include <string>
 #include <iostream>
@@ -15,15 +20,21 @@
 
 #include <QCoreApplication>
 #include <QStringList>
+#include <QString>
 
-using std::cout; using std::endl;
+using std::cout;
+using std::cerr;
+using std::endl;
 using std::vector;
 using std::string;
 
+#include "data/fileio/AudioFileReaderFactory.h"
+
+#include "transform/Transform.h"
+#include "transform/TransformFactory.h"
+
 #include "FeatureExtractionManager.h"
-//#include "DefaultFeatureWriter.h"
-//#include "RDFFeatureWriter.h"
-//#include "AudioDBFeatureWriter.h"
+#include "FeatureWriter.h"
 #include "FeatureWriterFactory.h"
 
 // Desired options:
@@ -81,7 +92,128 @@
 //   - supply file names or URIs on command line
 //   - use all files in a given directory or tree
 
+void usage()
+{
+    set<string> writers = FeatureWriterFactory::getWriterTags();
+        
+    cerr << endl;
+    cerr << "Sonic Annotator" << endl;
+    cerr << "A utility for batch feature extraction from audio files." << endl;
+    cerr << "Mark Levy, Chris Sutton and Chris Cannam, Queen Mary, University of London." << endl;
+    cerr << "Copyright 2007-2008 QMUL.  Distributed under the GNU General Public License." << endl;
+    cerr << endl;
+    cerr << "  Usage: runner [options] <audiofile ...> <transformfile ...>" << endl;
+    cerr << endl;
+    cerr << "Where <audiofile> is an audio file to use as input, and <transformfile> is a " << endl;
+    cerr << "file containing an XML description of a transform to be applied.  Either of" << endl;
+    cerr << "these may alternatively be an M3U-format playlist file containing a list of" << endl;
+    cerr << "audio and/or transform files.  Files may be given using either local file" << endl;
+    cerr << "paths, local \"file://\" URLs, or remote \"http://\" or \"ftp://\" URLs." << endl;
+    cerr << endl;
+    cerr << "Any number of audio and transform files may be provided in any order.  All" << endl;
+    cerr << "transforms will be applied to all input files regardless of the given order." << endl;
+    cerr << endl;
 
+    QString extensions = AudioFileReaderFactory::getKnownExtensions();
+    QStringList extlist = extensions.split(" ", QString::SkipEmptyParts);
+    if (!extlist.empty()) {
+        cerr << "The following audio file types are supported:" << endl;
+        cerr << "  * ";
+        int c = 4;
+        for (int i = 0; i < extlist.size(); ++i) {
+            QString ext = extlist[i];
+            if (ext.startsWith("*.")) ext = ext.right(ext.length()-2);
+            c += ext.length() + 2;
+            if (c >= 80) {
+                cerr << "\n    ";
+                c -= 76;
+            }
+            cerr << ext.toStdString();
+            if (i + 1 == extlist.size()) cerr << ".";
+            else cerr << ", ";
+        }
+        cerr << endl;
+    }
+
+    cerr << endl;
+    cerr << "General options:" << endl;
+    cerr << endl;
+    cerr << "  -w, --writer <W>    Write output using writer type <W>." << endl;
+    cerr << "                      Supported writer types are: ";
+    for (set<string>::const_iterator i = writers.begin();
+         i != writers.end(); ) {
+        cerr << *i;
+        if (++i != writers.end()) cerr << ", ";
+        else cerr << ".";
+    }
+    cerr << endl;
+    cerr << "                      You may supply this option multiple times." << endl;
+    cerr << endl;
+    cerr << "  -m, --multiplex     If multiple input audio files are given, use mono" << endl;
+    cerr << "                      mixdowns of all files as the input channels for a single" << endl;
+    cerr << "                      invocation of each transform, instead of running the" << endl;
+    cerr << "                      transform against all files separately." << endl;
+    cerr << endl;
+    cerr << "  -L, --list          List all known transform ids to standard output." << endl;
+    cerr << endl;
+    cerr << "  -S, --skeleton <T>  Generate a skeleton transform file for transform id <T>" << endl;
+    cerr << "                      and write it to standard output." << endl;
+    
+    cerr << endl;
+    cerr << "If no -w or --writer options are supplied, exactly one of the -L or -S options" << endl;
+    cerr << "must be given instead." << endl;
+
+    for (set<string>::const_iterator i = writers.begin();
+         i != writers.end(); ++i) {
+        FeatureWriter *w = FeatureWriterFactory::createWriter(*i);
+        if (!w) {
+            cerr << "  (Internal error: failed to create writer of this type)" << endl;
+            continue;
+        }
+        map<string, string> params = w->getSupportedParameters();
+        delete w;
+        if (params.empty()) {
+            continue;
+        }
+        cerr << endl;
+        cerr << "Additional options for writer type \"" << *i << "\":" << endl;
+        cerr << endl;
+        for (map<string, string>::const_iterator j = params.begin();
+             j != params.end(); ++j) {
+            cerr << "  --" << *i << "-" << j->first << " ";
+            for (int k = 0; k < 16 - int(i->length()) - int(j->first.length()); ++k) cerr << " ";
+            QString s(j->second.c_str());
+            s.replace("\n", "\n                        ");
+            cerr << s.toStdString() << endl;
+        }
+    }
+
+    cerr << endl;
+    exit(2);
+}
+
+void
+listTransforms()
+{
+    TransformList transforms =
+        TransformFactory::getInstance()->getAllTransformDescriptions();
+
+    for (TransformList::const_iterator iter = transforms.begin();
+         iter != transforms.end(); ++iter) {
+        const TransformDescription &transform = *iter;
+        cout << transform.identifier.toStdString() << endl;
+    }
+}    
+
+void
+printSkeleton(QString id)
+{
+    Transform transform =
+        TransformFactory::getInstance()->getDefaultTransformFor(id);
+    QString xml = transform.toXmlString();
+    cout << xml.toStdString();
+}    
+
 int main(int argc, char **argv)
 {
     QCoreApplication application(argc, argv);
@@ -92,6 +224,15 @@
 
     QStringList args = application.arguments();
 
+    //!!!
+    listTransforms();
+    
+    //!!!
+    printSkeleton("vamp:qm-vamp-plugins:qm-mfcc:coefficients");
+
+    //!!!
+    usage();
+
     FeatureExtractionManager manager;
     
     // the manager dictates the sample rate and number of channels
@@ -124,14 +265,6 @@
     if (writer) writers.push_back(writer);
     
     /*
-     // list all the available plugins as transforms
-     TransformList transforms = TransformFactory::getInstance()->getAllTransformDescriptions();
-     for (TransformList::iterator iter = transforms.begin(); iter != transforms.end(); ++iter)
-     {
-         TransformDescription transform = *iter;
-         
-         cerr << transform.identifier.toStdString() << endl << endl;
-     }
      */
     
     // we may want to work from saved transforms here if we


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1022
          http://sv1.svn.sourceforge.net/sv1/?rev=1022&view=rev
Author:   cannam
Date:     2008-03-19 10:19:35 -0700 (Wed, 19 Mar 2008)

Log Message:
-----------

* More options stuff

Modified Paths:
--------------
    runner/trunk/FeatureWriterFactory.cpp
    runner/trunk/main.cpp

Modified: runner/trunk/FeatureWriterFactory.cpp
===================================================================
--- runner/trunk/FeatureWriterFactory.cpp	2008-03-19 16:23:47 UTC (rev 1021)
+++ runner/trunk/FeatureWriterFactory.cpp	2008-03-19 17:19:35 UTC (rev 1022)
@@ -16,6 +16,7 @@
 
 #include "FeatureWriterFactory.h"
 
+#include "DefaultFeatureWriter.h"
 #include "RDFFeatureWriter.h"
 #include "AudioDBFeatureWriter.h"
 
@@ -23,6 +24,7 @@
 FeatureWriterFactory::getWriterTags()
 {
     set<string> tags;
+    tags.insert("default");
     tags.insert("rdf");
     tags.insert("audiodb");
 //    tags.insert("csv");
@@ -32,7 +34,9 @@
 FeatureWriter *
 FeatureWriterFactory::createWriter(string tag)
 {
-    if (tag == "rdf") {
+    if (tag == "default") {
+        return new DefaultFeatureWriter();
+    } else if (tag == "rdf") {
         return new RDFFeatureWriter();
     } else if (tag == "audiodb") {
         return new AudioDBFeatureWriter();

Modified: runner/trunk/main.cpp
===================================================================
--- runner/trunk/main.cpp	2008-03-19 16:23:47 UTC (rev 1021)
+++ runner/trunk/main.cpp	2008-03-19 17:19:35 UTC (rev 1022)
@@ -17,10 +17,10 @@
 #include <string>
 #include <iostream>
 
-
 #include <QCoreApplication>
 #include <QStringList>
 #include <QString>
+#include <QFileInfo>
 
 using std::cout;
 using std::cerr;
@@ -92,7 +92,7 @@
 //   - supply file names or URIs on command line
 //   - use all files in a given directory or tree
 
-void usage()
+void usage(QString myname)
 {
     set<string> writers = FeatureWriterFactory::getWriterTags();
         
@@ -100,18 +100,23 @@
     cerr << "Sonic Annotator" << endl;
     cerr << "A utility for batch feature extraction from audio files." << endl;
     cerr << "Mark Levy, Chris Sutton and Chris Cannam, Queen Mary, University of London." << endl;
-    cerr << "Copyright 2007-2008 QMUL.  Distributed under the GNU General Public License." << endl;
+    cerr << "Copyright 2007-2008 Queen Mary, University of London." << endl;
     cerr << endl;
-    cerr << "  Usage: runner [options] <audiofile ...> <transformfile ...>" << endl;
+    cerr << "This program is free software.  You may redistribute copies of it under the" << endl;
+    cerr << "terms of the GNU General Public License <http://www.gnu.org/licenses/gpl.html>." << endl;
+    cerr << "This program is supplied with NO WARRANTY, to the extent permitted by law." << endl;
     cerr << endl;
-    cerr << "Where <audiofile> is an audio file to use as input, and <transformfile> is a " << endl;
+    cerr << "  Usage: " << myname.toStdString()
+         << " [options] <audiofile ...> <transformfile ...>" << endl;
+    cerr << endl;
+    cerr << "Where <audiofile> is an audio file to use as input and <transformfile> is a " << endl;
     cerr << "file containing an XML description of a transform to be applied.  Either of" << endl;
     cerr << "these may alternatively be an M3U-format playlist file containing a list of" << endl;
     cerr << "audio and/or transform files.  Files may be given using either local file" << endl;
     cerr << "paths, local \"file://\" URLs, or remote \"http://\" or \"ftp://\" URLs." << endl;
     cerr << endl;
-    cerr << "Any number of audio and transform files may be provided in any order.  All" << endl;
-    cerr << "transforms will be applied to all input files regardless of the given order." << endl;
+    cerr << "Any number of audio and transform files may be provided in any order: all" << endl;
+    cerr << "of the transforms will be applied to all of the input files." << endl;
     cerr << endl;
 
     QString extensions = AudioFileReaderFactory::getKnownExtensions();
@@ -136,7 +141,7 @@
     }
 
     cerr << endl;
-    cerr << "General options:" << endl;
+    cerr << "Transformation options:" << endl;
     cerr << endl;
     cerr << "  -w, --writer <W>    Write output using writer type <W>." << endl;
     cerr << "                      Supported writer types are: ";
@@ -154,15 +159,24 @@
     cerr << "                      invocation of each transform, instead of running the" << endl;
     cerr << "                      transform against all files separately." << endl;
     cerr << endl;
-    cerr << "  -L, --list          List all known transform ids to standard output." << endl;
+    cerr << "  -r, --recursive     If any of the <audiofile> arguments is found to be a" << endl;
+    cerr << "                      directory, search the tree starting at that directory" << endl;
+    cerr << "                      for all supported audio files and take all of those as" << endl;
+    cerr << "                      input instead." << endl;
     cerr << endl;
-    cerr << "  -S, --skeleton <T>  Generate a skeleton transform file for transform id <T>" << endl;
+    cerr << "Housekeeping options:" << endl;
+    cerr << endl;
+    cerr << "  -l, --list          List all known transform ids to standard output." << endl;
+    cerr << endl;
+    cerr << "  -s, --skeleton <T>  Generate a skeleton transform file for transform id <T>" << endl;
     cerr << "                      and write it to standard output." << endl;
-    
     cerr << endl;
-    cerr << "If no -w or --writer options are supplied, exactly one of the -L or -S options" << endl;
-    cerr << "must be given instead." << endl;
+    cerr << "  -h, --help          Show this help." << endl;
 
+    cerr << endl;
+    cerr << "If no -w (or --writer) options are supplied, either the -l or -s option (or" << endl;
+    cerr << "long equivalent) must be given instead." << endl;
+
     for (set<string>::const_iterator i = writers.begin();
          i != writers.end(); ++i) {
         FeatureWriter *w = FeatureWriterFactory::createWriter(*i);
@@ -220,19 +234,94 @@
 
     QCoreApplication::setOrganizationName("QMUL");
     QCoreApplication::setOrganizationDomain("qmul.ac.uk");
-    QCoreApplication::setApplicationName("runner");
+    QCoreApplication::setApplicationName("Sonic Annotator");
 
     QStringList args = application.arguments();
+    vector<string> requestedWriterTags;
+    bool multiplex = false;
+    bool recursive = false;
+    bool list = false;
+    QString skeletonFor;
+    QString myname = args[0];
+    myname = QFileInfo(myname).baseName();
 
-    //!!!
-    listTransforms();
-    
-    //!!!
-    printSkeleton("vamp:qm-vamp-plugins:qm-mfcc:coefficients");
+    QString helpStr = myname + ": use --help option for help";
 
-    //!!!
-    usage();
+    for (int i = 1; i < args.size(); ++i) {
 
+        QString arg = args[i];
+        bool last = ((i + 1) == args.size());
+        
+        if (arg == "-h" || arg == "--help" || arg == "-?") {
+            usage(myname);
+        }
+
+        if (arg == "-w" || arg == "--writer") {
+            if (last || args[i+1].startsWith("-")) {
+                cerr << myname.toStdString() << ": Usage: "
+                     << myname.toStdString() << " [" << arg.toStdString()
+                     << " <writer>] <audiofile> <transformfile>" << endl;
+                cerr << helpStr.toStdString() << endl;
+                exit(2);
+            } else {
+                requestedWriterTags.push_back(args[++i].toStdString());
+                continue;
+            }
+        } else if (arg == "-m" || arg == "--multiplex") {
+            multiplex = true;
+            cerr << myname.toStdString()
+                 << ": WARNING: Multiplex argument not yet implemented" << endl; //!!!
+            continue;
+        } else if (arg == "-r" || arg == "--recursive") {
+            recursive = true;
+            cerr << myname.toStdString()
+                 << ": WARNING: Recursive argument not yet implemented" << endl; //!!!
+            continue;
+        } else if (arg == "-l" || arg == "--list") {
+            list = true;
+            continue;
+        } else if (arg == "-s" || arg == "--skeleton") {
+            if (last || args[i+1].startsWith("-")) {
+                cerr << myname.toStdString() << ": Usage: "
+                     << myname.toStdString() << " " << arg.toStdString()
+                     << " <transform>" << endl;
+                cerr << helpStr.toStdString() << endl;
+                exit(2);
+            } else {
+                skeletonFor = args[++i];
+                continue;
+            }
+        } else {
+            //...
+        }
+    }
+
+    if (list) {
+        if (!requestedWriterTags.empty() || skeletonFor != "") {
+            cerr << helpStr.toStdString() << endl;
+            exit(2);
+        }
+        listTransforms();
+        exit(0);
+    }
+    if (skeletonFor != "") {
+        if (!requestedWriterTags.empty()) {
+            cerr << helpStr.toStdString() << endl;
+            exit(2);
+        }
+        printSkeleton(skeletonFor);
+        exit(0);
+    }
+
+    if (requestedWriterTags.empty()) {
+        cerr << myname.toStdString()
+             << ": No writer(s) specified" << endl;
+        cerr << helpStr.toStdString() << endl;
+        exit(2);
+    }
+
+    exit(-1);
+
     FeatureExtractionManager manager;
     
     // the manager dictates the sample rate and number of channels


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1024
          http://sv1.svn.sourceforge.net/sv1/?rev=1024&view=rev
Author:   cannam
Date:     2008-03-19 13:37:24 -0700 (Wed, 19 Mar 2008)

Log Message:
-----------

...

Modified Paths:
--------------
    runner/trunk/RDFFeatureWriter.cpp
    runner/trunk/main.cpp

Modified: runner/trunk/RDFFeatureWriter.cpp
===================================================================
--- runner/trunk/RDFFeatureWriter.cpp	2008-03-19 20:23:26 UTC (rev 1023)
+++ runner/trunk/RDFFeatureWriter.cpp	2008-03-19 20:37:24 UTC (rev 1024)
@@ -43,11 +43,10 @@
 RDFFeatureWriter::getSupportedParameters() const
 {
     map<string, string> params;
-    params["one-file"] = "Create one output file only:\nall transforms for all inputs written to the same file";
-    params["per-input"] = "Create one output file for each input file:\nall transforms for that input written to the same file";
-    params["per-transform"] = "Create output file for each transform on each input";
-    params["plain"] = "Use \"plain\" RDF even if transform metadata is available";
-    params["basedir"] = "Base output directory path (default same as input file)";
+    params["one-file"] = "Create one output file only, and write all transform\nresults for all input files into it.";
+    params["many-files"] = "Create a separate output file for every combination of\ninput file and transform.\n(The default is to create one output file per input\naudio file, and write all transform results for that\ninput file into it.)";
+    params["plain"] = "Use \"plain\" RDF even if transform metadata is available.";
+    params["basedir"] = "Base output directory path.\n(The default is the same directory as the input file.)";
     return params;
 }
 

Modified: runner/trunk/main.cpp
===================================================================
--- runner/trunk/main.cpp	2008-03-19 20:23:26 UTC (rev 1023)
+++ runner/trunk/main.cpp	2008-03-19 20:37:24 UTC (rev 1024)
@@ -122,16 +122,16 @@
     QString extensions = AudioFileReaderFactory::getKnownExtensions();
     QStringList extlist = extensions.split(" ", QString::SkipEmptyParts);
     if (!extlist.empty()) {
-        cerr << "The following audio file types are supported:" << endl;
-        cerr << "  * ";
-        int c = 4;
+        cerr << "The following audio file extensions are recognised:" << endl;
+        cerr << "  ";
+        int c = 2;
         for (int i = 0; i < extlist.size(); ++i) {
             QString ext = extlist[i];
             if (ext.startsWith("*.")) ext = ext.right(ext.length()-2);
             c += ext.length() + 2;
             if (c >= 80) {
-                cerr << "\n    ";
-                c -= 76;
+                cerr << "\n  ";
+                c -= 78;
             }
             cerr << ext.toStdString();
             if (i + 1 == extlist.size()) cerr << ".";
@@ -245,7 +245,7 @@
     QString myname = args[0];
     myname = QFileInfo(myname).baseName();
 
-    QString helpStr = myname + ": use --help option for help";
+    QString helpStr = myname + ": use -h or --help option for help";
 
     for (int i = 1; i < args.size(); ++i) {
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1025
          http://sv1.svn.sourceforge.net/sv1/?rev=1025&view=rev
Author:   cannam
Date:     2008-03-20 08:59:00 -0700 (Thu, 20 Mar 2008)

Log Message:
-----------

* overhaul options again a bit: have explicit -t for transforms
* flesh out implementation a bit more

Modified Paths:
--------------
    runner/trunk/AudioDBFeatureWriter.cpp
    runner/trunk/AudioDBFeatureWriter.h
    runner/trunk/FeatureWriter.h
    runner/trunk/RDFFeatureWriter.cpp
    runner/trunk/RDFFeatureWriter.h
    runner/trunk/main.cpp

Modified: runner/trunk/AudioDBFeatureWriter.cpp
===================================================================
--- runner/trunk/AudioDBFeatureWriter.cpp	2008-03-19 20:37:24 UTC (rev 1024)
+++ runner/trunk/AudioDBFeatureWriter.cpp	2008-03-20 15:59:00 UTC (rev 1025)
@@ -50,25 +50,35 @@
     // TODO: error handling on close
 }
 
-map<string, string>
+AudioDBFeatureWriter::ParameterList
 AudioDBFeatureWriter::getSupportedParameters() const
 {
-    map<string, string> params;
-    params[catalogueIdParam] = "Catalogue ID";
-    params[baseDirParam] = "Base output directory path";
-    return params;
+    ParameterList pl;
+    Parameter p;
+
+    p.name = catalogueIdParam;
+    p.description = "Catalogue ID";
+    p.hasArg = true;
+    pl.push_back(p);
+
+    p.name = baseDirParam;
+    p.description = "Base output directory path";
+    p.hasArg = true;
+    pl.push_back(p);
+
+    return pl;
 }
 
 void
 AudioDBFeatureWriter::setParameters(map<string, string> &params)
 {
-    if (params.find("catalogue") != params.end()) {
-        setCatalogueId(params["catalogue"]);
-        params.erase("catalogue");
+    if (params.find(catalogueIdParam) != params.end()) {
+        setCatalogueId(params[catalogueIdParam]);
+        params.erase(catalogueIdParam);
     }
-    if (params.find("basedir") != params.end()) {
-        setCatalogueId(params["basedir"]);
-        params.erase("basedir");
+    if (params.find(baseDirParam) != params.end()) {
+        setCatalogueId(params[baseDirParam]);
+        params.erase(baseDirParam);
     }
 }
 

Modified: runner/trunk/AudioDBFeatureWriter.h
===================================================================
--- runner/trunk/AudioDBFeatureWriter.h	2008-03-19 20:37:24 UTC (rev 1024)
+++ runner/trunk/AudioDBFeatureWriter.h	2008-03-20 15:59:00 UTC (rev 1025)
@@ -30,7 +30,7 @@
     AudioDBFeatureWriter();
     virtual ~AudioDBFeatureWriter();
 
-    virtual map<string, string> getSupportedParameters() const;
+    virtual ParameterList getSupportedParameters() const;
     virtual void setParameters(map<string, string> &params);
 
     virtual void setCatalogueId(const string &);

Modified: runner/trunk/FeatureWriter.h
===================================================================
--- runner/trunk/FeatureWriter.h	2008-03-19 20:37:24 UTC (rev 1024)
+++ runner/trunk/FeatureWriter.h	2008-03-20 15:59:00 UTC (rev 1025)
@@ -18,19 +18,27 @@
 
 #include <string>
 #include <map>
+#include <vector>
 
 #include <vamp-sdk/Plugin.h>
 
 using std::string;
 using std::map;
+using std::vector;
 
 class FeatureWriter
 {
 public:
     virtual ~FeatureWriter() { }
 
-    virtual map<string, string> getSupportedParameters() const {
-        return map<string, string>();
+    struct Parameter {
+        string name;
+        string description;
+        bool hasArg;
+    };
+    typedef vector<Parameter> ParameterList;
+    virtual ParameterList getSupportedParameters() const {
+        return ParameterList();
     }
 
     virtual void setParameters(map<string, string> &params) {

Modified: runner/trunk/RDFFeatureWriter.cpp
===================================================================
--- runner/trunk/RDFFeatureWriter.cpp	2008-03-19 20:37:24 UTC (rev 1024)
+++ runner/trunk/RDFFeatureWriter.cpp	2008-03-20 15:59:00 UTC (rev 1025)
@@ -39,21 +39,43 @@
     }
 }
 
-map<string, string>
+RDFFeatureWriter::ParameterList
 RDFFeatureWriter::getSupportedParameters() const
 {
-    map<string, string> params;
-    params["one-file"] = "Create one output file only, and write all transform\nresults for all input files into it.";
-    params["many-files"] = "Create a separate output file for every combination of\ninput file and transform.\n(The default is to create one output file per input\naudio file, and write all transform results for that\ninput file into it.)";
-    params["plain"] = "Use \"plain\" RDF even if transform metadata is available.";
-    params["basedir"] = "Base output directory path.\n(The default is the same directory as the input file.)";
-    return params;
+    ParameterList pl;
+    Parameter p;
+
+    p.name = "basedir";
+    p.description = "Base output directory path.\n(The default is the same directory as the input file.)";
+    p.hasArg = true;
+    pl.push_back(p);
+
+    p.name = "many-files";
+    p.description = "Create a separate output file for every combination of\ninput file and transform.\n(The default is to create one output file per input\naudio file, and write all transform results for that\ninput file into it.)";
+    p.hasArg = false;
+    pl.push_back(p);
+
+    p.name = "one-file";
+    p.description = "Create one output file only, and write all transform\nresults for all input files into it.";
+    p.hasArg = false;
+    pl.push_back(p);
+
+    p.name = "plain";
+    p.description = "Use \"plain\" RDF even if transform metadata is available.";
+    p.hasArg = false;
+    pl.push_back(p);
+
+    return pl;
 }
 
 void
 RDFFeatureWriter::setParameters(map<string, string> &params)
 {
-    //!!! implement
+    cerr << "RDFFeatureWriter::setParameters" << endl;
+    for (map<string, string>::iterator i = params.begin();
+         i != params.end(); ++i) {
+        cerr << i->first << " -> " << i->second << endl;
+    }
 }
 
 void RDFFeatureWriter::write(const string& trackid,

Modified: runner/trunk/RDFFeatureWriter.h
===================================================================
--- runner/trunk/RDFFeatureWriter.h	2008-03-19 20:37:24 UTC (rev 1024)
+++ runner/trunk/RDFFeatureWriter.h	2008-03-20 15:59:00 UTC (rev 1025)
@@ -31,7 +31,7 @@
     RDFFeatureWriter();
     virtual ~RDFFeatureWriter();
 
-    virtual map<string, string> getSupportedParameters() const;
+    virtual ParameterList getSupportedParameters() const;
     virtual void setParameters(map<string, string> &params);
 
     virtual void write(const string& trackid,

Modified: runner/trunk/main.cpp
===================================================================
--- runner/trunk/main.cpp	2008-03-19 20:37:24 UTC (rev 1024)
+++ runner/trunk/main.cpp	2008-03-20 15:59:00 UTC (rev 1025)
@@ -29,6 +29,7 @@
 using std::string;
 
 #include "data/fileio/AudioFileReaderFactory.h"
+#include "data/fileio/PlaylistFileReader.h"
 
 #include "transform/Transform.h"
 #include "transform/TransformFactory.h"
@@ -107,17 +108,17 @@
     cerr << "This program is supplied with NO WARRANTY, to the extent permitted by law." << endl;
     cerr << endl;
     cerr << "  Usage: " << myname.toStdString()
-         << " [options] <audiofile ...> <transformfile ...>" << endl;
+         << " [-mr] -t trans.xml [...] -w <writer> [...] <audio> [...]" << endl;
+    cerr << "         " << myname.toStdString()
+         << " [-mr] -T trans.txt [...] -w <writer> [...] <audio> [...]" << endl;
+    cerr << "         " << myname.toStdString()
+         << " -s <transform>" << endl;
+    cerr << "         " << myname.toStdString()
+         << " [-lh]" << endl;
     cerr << endl;
-    cerr << "Where <audiofile> is an audio file to use as input and <transformfile> is a " << endl;
-    cerr << "file containing an XML description of a transform to be applied.  Either of" << endl;
-    cerr << "these may alternatively be an M3U-format playlist file containing a list of" << endl;
-    cerr << "audio and/or transform files.  Files may be given using either local file" << endl;
-    cerr << "paths, local \"file://\" URLs, or remote \"http://\" or \"ftp://\" URLs." << endl;
+    cerr << "Where <audio> is an audio file or URL to use as input: either a local file" << endl;
+    cerr << "path, local \"file://\" URL, or remote \"http://\" or \"ftp://\" URL." << endl;
     cerr << endl;
-    cerr << "Any number of audio and transform files may be provided in any order: all" << endl;
-    cerr << "of the transforms will be applied to all of the input files." << endl;
-    cerr << endl;
 
     QString extensions = AudioFileReaderFactory::getKnownExtensions();
     QStringList extlist = extensions.split(" ", QString::SkipEmptyParts);
@@ -140,9 +141,19 @@
         cerr << endl;
     }
 
+    cerr << "Playlist files in M3U format are also supported." << endl;
     cerr << endl;
     cerr << "Transformation options:" << endl;
     cerr << endl;
+    cerr << "  -t, --transform <T> Apply transform described in transform XML file <T> to" << endl;
+    cerr << "                      all input audio files.  You may supply this option" << endl;
+    cerr << "                      multiple times.  You must supply this option or -T at" << endl;
+    cerr << "                      least once for any work to be done." << endl;
+    cerr << endl;
+    cerr << "  -T, --transforms <T> Apply all transforms described in transform XML files" << endl;
+    cerr << "                      whose names are listed in text file <T>.  You may supply" << endl;
+    cerr << "                      this option multiple times." << endl;
+    cerr << endl;
     cerr << "  -w, --writer <W>    Write output using writer type <W>." << endl;
     cerr << "                      Supported writer types are: ";
     for (set<string>::const_iterator i = writers.begin();
@@ -152,14 +163,15 @@
         else cerr << ".";
     }
     cerr << endl;
-    cerr << "                      You may supply this option multiple times." << endl;
+    cerr << "                      You may supply this option multiple times.  You must" << endl;
+    cerr << "                      supply this option at least once for any work to be done." << endl;
     cerr << endl;
     cerr << "  -m, --multiplex     If multiple input audio files are given, use mono" << endl;
     cerr << "                      mixdowns of all files as the input channels for a single" << endl;
     cerr << "                      invocation of each transform, instead of running the" << endl;
     cerr << "                      transform against all files separately." << endl;
     cerr << endl;
-    cerr << "  -r, --recursive     If any of the <audiofile> arguments is found to be a" << endl;
+    cerr << "  -r, --recursive     If any of the <audio> arguments is found to be a local" << endl;
     cerr << "                      directory, search the tree starting at that directory" << endl;
     cerr << "                      for all supported audio files and take all of those as" << endl;
     cerr << "                      input instead." << endl;
@@ -184,7 +196,7 @@
             cerr << "  (Internal error: failed to create writer of this type)" << endl;
             continue;
         }
-        map<string, string> params = w->getSupportedParameters();
+        FeatureWriter::ParameterList params = w->getSupportedParameters();
         delete w;
         if (params.empty()) {
             continue;
@@ -192,11 +204,13 @@
         cerr << endl;
         cerr << "Additional options for writer type \"" << *i << "\":" << endl;
         cerr << endl;
-        for (map<string, string>::const_iterator j = params.begin();
+        for (FeatureWriter::ParameterList::const_iterator j = params.begin();
              j != params.end(); ++j) {
-            cerr << "  --" << *i << "-" << j->first << " ";
-            for (int k = 0; k < 16 - int(i->length()) - int(j->first.length()); ++k) cerr << " ";
-            QString s(j->second.c_str());
+            cerr << "  --" << *i << "-" << j->name << " ";
+            int spaceage = 16 - int(i->length()) - int(j->name.length());
+            if (j->hasArg) { cerr << "<X> "; spaceage -= 4; }
+            for (int k = 0; k < spaceage; ++k) cerr << " ";
+            QString s(j->description.c_str());
             s.replace("\n", "\n                        ");
             cerr << s.toStdString() << endl;
         }
@@ -237,13 +251,16 @@
     QCoreApplication::setApplicationName("Sonic Annotator");
 
     QStringList args = application.arguments();
-    vector<string> requestedWriterTags;
+    set<string> requestedWriterTags;
+    set<string> requestedTransformFiles;
+    set<string> requestedTransformListFiles;
     bool multiplex = false;
     bool recursive = false;
     bool list = false;
     QString skeletonFor;
     QString myname = args[0];
     myname = QFileInfo(myname).baseName();
+    QStringList otherArgs;
 
     QString helpStr = myname + ": use -h or --help option for help";
 
@@ -258,15 +275,51 @@
 
         if (arg == "-w" || arg == "--writer") {
             if (last || args[i+1].startsWith("-")) {
-                cerr << myname.toStdString() << ": Usage: "
-                     << myname.toStdString() << " [" << arg.toStdString()
-                     << " <writer>] <audiofile> <transformfile>" << endl;
+                cerr << myname.toStdString() << ": argument expected for \""
+                     << arg.toStdString() << "\" option" << endl;
                 cerr << helpStr.toStdString() << endl;
                 exit(2);
             } else {
-                requestedWriterTags.push_back(args[++i].toStdString());
+                string tag = args[++i].toStdString();
+                if (requestedWriterTags.find(tag) != requestedWriterTags.end()) {
+                    cerr << myname.toStdString() << ": NOTE: duplicate specification of writer type \"" << tag << "\" ignored" << endl;
+                } else {
+                    requestedWriterTags.insert(tag);
+                }
                 continue;
             }
+        } else if (arg == "-t" || arg == "--transform") {
+            if (last || args[i+1].startsWith("-")) {
+                cerr << myname.toStdString() << ": argument expected for \""
+                     << arg.toStdString() << "\" option" << endl;
+                cerr << helpStr.toStdString() << endl;
+                exit(2);
+            } else {
+                string transform = args[++i].toStdString();
+                if (requestedTransformFiles.find(transform) !=
+                    requestedTransformFiles.end()) {
+                    cerr << myname.toStdString() << ": NOTE: duplicate specification of transform file \"" << transform << "\" ignored" << endl;
+                } else {
+                    requestedTransformFiles.insert(transform);
+                }
+                continue;
+            }
+        } else if (arg == "-T" || arg == "--transforms") {
+            if (last || args[i+1].startsWith("-")) {
+                cerr << myname.toStdString() << ": argument expected for \""
+                     << arg.toStdString() << "\" option" << endl;
+                cerr << helpStr.toStdString() << endl;
+                exit(2);
+            } else {
+                string transform = args[++i].toStdString();
+                if (requestedTransformListFiles.find(transform) !=
+                    requestedTransformListFiles.end()) {
+                    cerr << myname.toStdString() << ": NOTE: duplicate specification of transform list file \"" << transform << "\" ignored" << endl;
+                } else {
+                    requestedTransformListFiles.insert(transform);
+                }
+                continue;
+            }
         } else if (arg == "-m" || arg == "--multiplex") {
             multiplex = true;
             cerr << myname.toStdString()
@@ -282,7 +335,7 @@
             continue;
         } else if (arg == "-s" || arg == "--skeleton") {
             if (last || args[i+1].startsWith("-")) {
-                cerr << myname.toStdString() << ": Usage: "
+                cerr << myname.toStdString() << ": usage: "
                      << myname.toStdString() << " " << arg.toStdString()
                      << " <transform>" << endl;
                 cerr << helpStr.toStdString() << endl;
@@ -292,7 +345,7 @@
                 continue;
             }
         } else {
-            //...
+            otherArgs.push_back(args[i]);
         }
     }
 
@@ -313,15 +366,21 @@
         exit(0);
     }
 
+    if (requestedTransformFiles.empty() &&
+        requestedTransformListFiles.empty()) {
+        cerr << myname.toStdString()
+             << ": no transform(s) specified" << endl;
+        cerr << helpStr.toStdString() << endl;
+        exit(2);
+    }
+
     if (requestedWriterTags.empty()) {
         cerr << myname.toStdString()
-             << ": No writer(s) specified" << endl;
+             << ": no writer(s) specified" << endl;
         cerr << helpStr.toStdString() << endl;
         exit(2);
     }
 
-    exit(-1);
-
     FeatureExtractionManager manager;
     
     // the manager dictates the sample rate and number of channels
@@ -335,26 +394,93 @@
     manager.setSampleRate(22050);    // always work at this rate
     manager.setChannels(1);
     
-    vector<FeatureWriter*> writers;
-    //    writers.push_back(new DefaultFeatureWriter());    // for debug
-    
-    if (argc <= 1) // no args supplied
-    {
-        cout<<" Usage : runner writertype audiofile transformfile"<<endl;
-        cout<<"   eg. runner rdf test.mp3 transforms/tempotracker.xml"<<endl;
-        exit(-1);
+    vector<FeatureWriter *> writers;
+
+    for (set<string>::const_iterator i = requestedWriterTags.begin();
+         i != requestedWriterTags.end(); ++i) {
+
+        FeatureWriter *writer = FeatureWriterFactory::createWriter(*i);
+
+        if (!writer) {
+            cerr << myname.toStdString() << ": unknown feature writer \""
+                 << *i << "\"" << endl;
+            cerr << helpStr.toStdString() << endl;
+            exit(2);
+        }
+
+        map<string, string> writerArgs;
+        FeatureWriter::ParameterList pl(writer->getSupportedParameters());
+
+        for (int k = 0; k < pl.size(); ++k) {
+            
+            string argbase = pl[k].name;
+            QString literal = QString("--%1-%2")
+                .arg(i->c_str()).arg(argbase.c_str());
+            
+            for (int j = 0; j < otherArgs.size(); ) {
+                
+                if (otherArgs[j] != literal) {
+                    ++j;
+                    continue;
+                }
+                    
+                otherArgs.removeAt(j);
+                    
+                if (pl[k].hasArg) {
+                    if (j < otherArgs.size()) {
+                        writerArgs[argbase] = otherArgs[j].toStdString();
+                        otherArgs.removeAt(j);
+                    } else {
+                        cerr << myname.toStdString() << ": "
+                             << "argument required for \""
+                             << literal.toStdString() << "\" option"
+                             << endl;
+                        cerr << helpStr.toStdString() << endl;
+                        exit(2);
+                    }
+                } else {
+                    writerArgs[argbase] = "";
+                }
+            }
+        }
+        
+        writer->setParameters(writerArgs);
+        
+        writers.push_back(writer);
     }
-    
 
-    string writerType = "";
-    if (args.size() > 1)
-        writerType = args[1].toStdString();
+    for (int i = 0; i < otherArgs.size(); ++i) {
+        if (otherArgs[i].startsWith("-")) {
+            cerr << myname.toStdString() << ": unknown option \""
+                 << otherArgs[i].toStdString() << "\"" << endl;
+            cerr << helpStr.toStdString() << endl;
+            exit(2);
+        }
+    }
 
-    FeatureWriter *writer = FeatureWriterFactory::createWriter(writerType);
-    if (writer) writers.push_back(writer);
+    if (otherArgs.empty()) {
+        cerr << myname.toStdString() << ": no input(s) specified" << endl;
+        cerr << helpStr.toStdString() << endl;
+        exit(2);
+    }    
+
+    for (set<string>::const_iterator i = requestedTransformListFiles.begin();
+         i != requestedTransformListFiles.end(); ++i) {
+        PlaylistFileReader reader(i->c_str());
+        if (reader.isOK()) {
+            vector<QString> files = reader.load();
+            for (int j = 0; j < files.size(); ++j) {
+                requestedTransformFiles.insert(files[j].toStdString());
+            }
+        } else {
+            cerr << myname.toStdString() << ": failed to read template list file \"" << *i << "\"" << endl;
+            exit(2);
+        }
+    }
     
-    /*
-     */
+
+    //!!!
+    exit (-1);
     
     // we may want to work from saved transforms here if we
     // already know what features we want


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1030
          http://sv1.svn.sourceforge.net/sv1/?rev=1030&view=rev
Author:   cannam
Date:     2008-03-26 07:38:38 -0700 (Wed, 26 Mar 2008)

Log Message:
-----------

* implement --recursive

Modified Paths:
--------------
    runner/trunk/FeatureExtractionManager.cpp
    runner/trunk/main.cpp

Modified: runner/trunk/FeatureExtractionManager.cpp
===================================================================
--- runner/trunk/FeatureExtractionManager.cpp	2008-03-26 14:35:03 UTC (rev 1029)
+++ runner/trunk/FeatureExtractionManager.cpp	2008-03-26 14:38:38 UTC (rev 1030)
@@ -154,7 +154,8 @@
     
     cerr << "Opening and/or decoding audio file..." << endl;
     
-    AudioFileReader *reader = AudioFileReaderFactory::createReader(source, m_sampleRate);
+    AudioFileReader *reader =
+        AudioFileReaderFactory::createReader(source, m_sampleRate, &printer);
     
     if (!reader) 
     {

Modified: runner/trunk/main.cpp
===================================================================
--- runner/trunk/main.cpp	2008-03-26 14:35:03 UTC (rev 1029)
+++ runner/trunk/main.cpp	2008-03-26 14:38:38 UTC (rev 1030)
@@ -21,6 +21,7 @@
 #include <QStringList>
 #include <QString>
 #include <QFileInfo>
+#include <QDir>
 
 using std::cout;
 using std::cerr;
@@ -242,6 +243,34 @@
     cout << xml.toStdString();
 }    
 
+void
+findSourcesRecursive(QString dirname, QStringList &addTo, int &found)
+{
+    QDir dir(dirname);
+
+    QString printable = dir.dirName().left(20);
+    cerr << "\rScanning \"" << printable.toStdString() << "\"..."
+         << QString("                    ").left(20 - printable.length()).toStdString()
+         << " [" << found << " audio file(s)]";
+
+    QString extensions = AudioFileReaderFactory::getKnownExtensions();
+    QStringList extlist = extensions.split(" ", QString::SkipEmptyParts);
+
+    QStringList files = dir.entryList
+        (extlist, QDir::Files | QDir::Readable);
+    for (int i = 0; i < files.size(); ++i) {
+        addTo.push_back(dir.filePath(files[i]));
+        ++found;
+    }
+
+    QStringList subdirs = dir.entryList
+        (QStringList(), QDir::Dirs | QDir::NoSymLinks | QDir::NoDotAndDotDot);
+    for (int i = 0; i < subdirs.size(); ++i) {
+        findSourcesRecursive(dir.filePath(subdirs[i]), addTo, found);
+    }
+}
+
+
 int main(int argc, char **argv)
 {
     QCoreApplication application(argc, argv);
@@ -327,8 +356,6 @@
             continue;
         } else if (arg == "-r" || arg == "--recursive") {
             recursive = true;
-            cerr << myname.toStdString()
-                 << ": WARNING: Recursive argument not yet implemented" << endl; //!!!
             continue;
         } else if (arg == "-l" || arg == "--list") {
             list = true;
@@ -483,8 +510,26 @@
         manager.addFeatureExtractor(*i, writers);
     }
 
-    for (QStringList::const_iterator i = otherArgs.begin();
-         i != otherArgs.end(); ++i) {
+    QStringList sources;
+    if (!recursive) {
+        sources = otherArgs;
+    } else {
+        for (QStringList::const_iterator i = otherArgs.begin();
+             i != otherArgs.end(); ++i) {
+            if (QDir(*i).exists()) {
+                cerr << "Directory found and recursive flag set, scanning for audio files..." << endl;
+                int found = 0;
+                findSourcesRecursive(*i, sources, found);
+                cerr << "\rDone, found " << found << " supported audio file(s)                    " << endl;
+            } else {
+                sources.push_back(*i);
+            }
+        }
+    }
+
+    for (QStringList::const_iterator i = sources.begin();
+         i != sources.end(); ++i) {
+        std::cerr << "Extracting features for: \"" << i->toStdString() << "\"" << std::endl;
         manager.extractFeatures(i->toStdString());
     }
     


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1031
          http://sv1.svn.sourceforge.net/sv1/?rev=1031&view=rev
Author:   cannam
Date:     2008-03-27 03:15:26 -0700 (Thu, 27 Mar 2008)

Log Message:
-----------

* some work on overhauling writer API -- incomplete and does not build

Modified Paths:
--------------
    runner/trunk/AudioDBFeatureWriter.cpp
    runner/trunk/AudioDBFeatureWriter.h
    runner/trunk/DefaultFeatureWriter.cpp
    runner/trunk/DefaultFeatureWriter.h
    runner/trunk/FeatureExtractionManager.cpp
    runner/trunk/FeatureExtractionManager.h
    runner/trunk/FeatureWriter.h
    runner/trunk/RDFFeatureWriter.cpp
    runner/trunk/RDFFeatureWriter.h
    runner/trunk/RDFSinglePluginWriter.h
    runner/trunk/SimpleRDFFeatureWriter.h
    runner/trunk/main.cpp

Modified: runner/trunk/AudioDBFeatureWriter.cpp
===================================================================
--- runner/trunk/AudioDBFeatureWriter.cpp	2008-03-26 14:38:38 UTC (rev 1030)
+++ runner/trunk/AudioDBFeatureWriter.cpp	2008-03-27 10:15:26 UTC (rev 1031)
@@ -28,7 +28,7 @@
 
 struct AudioDBFeatureWriter::TrackStream
 {
-    string trackid;
+    QString trackid;
     ofstream* ofs;
 };
 
@@ -94,10 +94,10 @@
     baseDir = base;
 }
 
-void AudioDBFeatureWriter::write(const string& trackid,
-                                 const string& pluginid,
-                                 const Plugin::OutputList& outputList,
-                                 const Plugin::FeatureSet& featureSet)
+void AudioDBFeatureWriter::write(QString trackid,
+                                 TransformId transformId,
+                                 const Vamp::Plugin::OutputList& outputList, 
+                                 const Vamp::Plugin::FeatureSet& featureSet)
 {
     // binary output for FeatureSet
     
@@ -157,9 +157,10 @@
     }
 }
 
-bool AudioDBFeatureWriter::openDBFile(const string& trackid, const string& identifier)
+bool AudioDBFeatureWriter::openDBFile(QString trackid, const string& identifier)
 {
-    string filepath = baseDir + "/" + catalogueId  + "/" + trackid + "." + identifier;
+    string filepath = baseDir + "/" + catalogueId  + "/"
+        + trackid.toString() + "." + identifier;
     ofstream* ofs = new ofstream(filepath.c_str());
     if (!*ofs)
     {    
@@ -174,7 +175,7 @@
 }
 
 // replace file if no file open for this track, else return false
-bool AudioDBFeatureWriter::replaceDBFile(const string& trackid, 
+bool AudioDBFeatureWriter::replaceDBFile(QString trackid, 
                                          const string& identifier)
 {
     if (dbfiles.find(identifier) != dbfiles.end() && dbfiles[identifier].trackid == trackid)

Modified: runner/trunk/AudioDBFeatureWriter.h
===================================================================
--- runner/trunk/AudioDBFeatureWriter.h	2008-03-26 14:38:38 UTC (rev 1030)
+++ runner/trunk/AudioDBFeatureWriter.h	2008-03-27 10:15:26 UTC (rev 1031)
@@ -36,8 +36,8 @@
     virtual void setCatalogueId(const string &);
     virtual void setBaseDirectory(const string &);
 
-    virtual void write(const string& trackid,
-                       const string& pluginid,
+    virtual void write(QString trackid,
+                       TransformId transformId,
                        const Vamp::Plugin::OutputList& outputList, 
                        const Vamp::Plugin::FeatureSet& featureSet);
     
@@ -51,8 +51,8 @@
     struct TrackStream;
     map<string, TrackStream> dbfiles;
     
-    bool openDBFile(const string& trackid, const string& identifier);
-    bool replaceDBFile(const string& trackid, const string& identifier);
+    bool openDBFile(QString trackid, const string& identifier);
+    bool replaceDBFile(QString trackid, const string& identifier);
 };
 
 #endif

Modified: runner/trunk/DefaultFeatureWriter.cpp
===================================================================
--- runner/trunk/DefaultFeatureWriter.cpp	2008-03-26 14:38:38 UTC (rev 1030)
+++ runner/trunk/DefaultFeatureWriter.cpp	2008-03-27 10:15:26 UTC (rev 1031)
@@ -20,7 +20,10 @@
 
 #include "DefaultFeatureWriter.h"
 
-void DefaultFeatureWriter::write(const string& trackid, const string& pluginid, const Vamp::Plugin::OutputList& outputList, const Vamp::Plugin::FeatureSet& featureSet)
+void DefaultFeatureWriter::write(QString trackid,
+                                 TransformId transformId,
+                                 const Vamp::Plugin::OutputList& outputList,
+                                 const Vamp::Plugin::FeatureSet& featureSet)
 {
     // generic XML output for FeatureSet
     

Modified: runner/trunk/DefaultFeatureWriter.h
===================================================================
--- runner/trunk/DefaultFeatureWriter.h	2008-03-26 14:38:38 UTC (rev 1030)
+++ runner/trunk/DefaultFeatureWriter.h	2008-03-27 10:15:26 UTC (rev 1031)
@@ -23,7 +23,10 @@
 {
 public:
     virtual ~DefaultFeatureWriter() { }
-    virtual void write(const string& trackid, const string& pluginid, const Vamp::Plugin::OutputList& outputList, const Vamp::Plugin::FeatureSet& featureSet);
+    virtual void write(QString trackid,
+                       TransformId transformId,
+                       const Vamp::Plugin::OutputList& outputList,
+                       const Vamp::Plugin::FeatureSet& featureSet);
 };
 
 #endif

Modified: runner/trunk/FeatureExtractionManager.cpp
===================================================================
--- runner/trunk/FeatureExtractionManager.cpp	2008-03-26 14:38:38 UTC (rev 1030)
+++ runner/trunk/FeatureExtractionManager.cpp	2008-03-27 10:15:26 UTC (rev 1031)
@@ -23,6 +23,7 @@
 #include <vamp-sdk/hostext/PluginLoader.h>
 
 using Vamp::Plugin;
+using Vamp::PluginBase;
 using Vamp::HostExt::PluginLoader;
 using Vamp::HostExt::PluginChannelAdapter;
 using Vamp::HostExt::PluginBufferingAdapter;
@@ -61,71 +62,72 @@
     m_sampleRate = sampleRate;
 }
 
-bool FeatureExtractionManager::addFeatureExtractor(string library, string plugname, vector<FeatureWriter*> writers)
+bool FeatureExtractionManager::addDefaultFeatureExtractor
+(TransformId transformId, const vector<FeatureWriter*> &writers)
 {
-    PluginLoader *loader = PluginLoader::getInstance();
-    
-    PluginLoader::PluginKey key = loader->composePluginKey(library, plugname);
-    
-    Plugin* plugin = loader->loadPlugin(key, m_sampleRate, PluginLoader::ADAPT_ALL);
+    TransformFactory *tf = TransformFactory::getInstance();
+
+    transform = tf->getDefaultTransformFor(transformId, m_sampleRate);
+
+    PluginBase *pb = tf->instantiatePluginFor(transform);
+    Plugin *plugin = tf->downcastVampPlugin(pb);
     if (!plugin) {
-        cerr << "ERROR: Failed to load plugin \"" << plugin << "\" from library \"" << library << "\"" << endl;
+        //!!! todo: handle non-Vamp plugins too, or make the main --list
+        // option print out only Vamp transforms
+        cerr << "ERROR: Failed to load plugin for transform \""
+             << transformId.toStdString() << "\"" << endl;
+        delete pb;
         return false;
     }
-    
+
     plugins.push_back(plugin);
     pluginWriters.push_back(writers);
-    
-    // create a Transform recording all the parameter settings etc.
-    Transform transform;
-    TransformFactory *tf = TransformFactory::getInstance();
-
-    transform = tf->getDefaultTransformFor
-        (Transform::getIdentifierForPluginOutput(key.c_str(), ""),
-         m_sampleRate);
-
-    tf->setParametersFromPlugin(transform, plugin);
     transforms.push_back(transform);
     
     return true;
 }
 
-bool FeatureExtractionManager::addFeatureExtractor(string transformXmlFile, vector<FeatureWriter*> writers)
+bool FeatureExtractionManager::addFeatureExtractorFromFile
+(QString transformXmlFile, const vector<FeatureWriter*> &writers)
 {
-    FILE* file = fopen(transformXmlFile.c_str(),"r");
-    if (!file) {
+    QFile file(transformXmlFile);
+    if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
         cerr << "ERROR: Failed to open transform XML file \""
-             << transformXmlFile << "\" for reading" << endl;
-        perror("Failed to open transform file");
+             << transformXmlFile.toStdString() << "\" for reading" << endl;
         return false;
     }
 
     QTextStream *qts = new QTextStream(file);
     QString qs = qts->readAll();
     delete qts;
-    fclose(file);
+    file.close();
 
     Transform transform(qs);
     
-    if (transform.getSampleRate() != m_sampleRate)
-    {
+    if (transform.getSampleRate() != m_sampleRate) {
         cerr << "ERROR: transform sample rate " << transform.getSampleRate() << " doesn't match the one you set for audio extraction " << m_sampleRate << endl;
         print(transform);
         cerr << endl;
         return false;
     }
     
-    Plugin* plugin = TransformFactory::getInstance()->downcastVampPlugin(TransformFactory::getInstance()->instantiatePluginFor(transform));
+    TransformFactory *tf = TransformFactory::getInstance();
+
+    PluginBase *pb = tf->instantiatePluginFor(transform);
+    Plugin *plugin = tf->downcastVampPlugin(pb);
     if (!plugin) {
-        cerr << "ERROR: Failed to load plugin from transform " << transformXmlFile << endl;
-        print(transform);
-        cerr << endl;
+        //!!! todo: handle non-Vamp plugins too, or make the main --list
+        // option print out only Vamp transforms
+        cerr << "ERROR: Failed to load plugin for transform \""
+             << transform.getIdentifier().toStdString() << "\"" << endl;
+        delete pb;
         return false;
     }
     
     // adapt the plugin for buffering, channels, etc.
-    if (plugin->getInputDomain() == Plugin::FrequencyDomain) 
-        plugin = new PluginInputDomainAdapter(plugin);    
+    if (plugin->getInputDomain() == Plugin::FrequencyDomain) {
+        plugin = new PluginInputDomainAdapter(plugin);
+    }
     plugin = new PluginBufferingAdapter(plugin);
     plugin = new PluginChannelAdapter(plugin);
     
@@ -136,39 +138,34 @@
     return true;
 }
 
-void FeatureExtractionManager::extractFeatures(string audioSource)
+void FeatureExtractionManager::extractFeatures(QString audioSource)
 {
-    cerr << "Creating FileSource..." << endl;
-    
-    ProgressPrinter printer("Retrieving data...");
-    FileSource source(audioSource.c_str(), &printer);
-    if (!source.isAvailable()) 
-    {
-        cerr << "ERROR: File or URL \"" << audioSource << "\" could not be located" << endl;
+    ProgressPrinter printer("Retrieving audio data...");
+
+    FileSource source(audioSource, &printer);
+    if (!source.isAvailable()) {
+        cerr << "ERROR: File or URL \"" << audioSource.toStdString()
+             << "\" could not be located" << endl;
         exit(1);
     }
     
-    cerr << "Retrieving or locating \"" << audioSource << "\"..." << endl;
-    
     source.waitForData();
     
-    cerr << "Opening and/or decoding audio file..." << endl;
-    
     AudioFileReader *reader =
         AudioFileReaderFactory::createReader(source, m_sampleRate, &printer);
     
-    if (!reader) 
-    {
-        cerr << "ERROR: File or URL \"" << audioSource << "\" could not be opened" << endl;
+    if (!reader) {
+        cerr << "ERROR: File or URL \"" << audioSource.toStdString()
+             << "\" could not be opened" << endl;
         exit(1);
     }
     
-    // read using an arbitrary fixed block size
-    int blockSize = 2048;
-    int stepSize = 2048;
+    // We can read using an arbitrary fixed block size --
+    // PluginBufferingAdapter handles this for us.  It's likely to be
+    // quicker to use larger sizes than smallish ones like 1024
+    int blockSize = 16384;
+    int stepSize = blockSize;
     
-    cerr << "Using block size = " << blockSize << ", step size = " << stepSize << endl;
-    
     size_t channels = reader->getChannelCount();
     
     // reject file if it has too few channels, plugin will handle if it has too many
@@ -193,7 +190,7 @@
         if (!plugins[i]->initialise(m_channels, stepSize, blockSize)) {
             cerr << "ERROR: Plugin initialise (channels = " << m_channels << ", stepSize = " << stepSize << ", blockSize = " << blockSize << ") failed." << endl;    
             
-            // TODO:
+            //!!! TODO:
             // decide how to handle this error...
         }
     }
@@ -229,9 +226,15 @@
         
         for (int k = 0; k < plugins.size(); ++k)
         {
-            Vamp::Plugin::FeatureSet featureSet = plugins[k]->process(data, timestamp);    
-            for (int j = 0; j < pluginWriters[k].size(); ++j)
-                pluginWriters[k][j]->write(audioSource.c_str(), plugins[k]->getIdentifier(), plugins[k]->getOutputDescriptors(), featureSet);
+            Vamp::Plugin::FeatureSet featureSet =
+                plugins[k]->process(data, timestamp);    
+            for (int j = 0; j < pluginWriters[k].size(); ++j) {
+                pluginWriters[k][j]->write
+                    (audioSource,
+                     transforms[k].getIdentifier(),
+                     plugins[k]->getOutputDescriptors(), //!!! inefficient
+                     featureSet);
+            }
         }
     }
     
@@ -240,8 +243,9 @@
         // we may want to set the start and duration times for extraction
         // in the transform record (defaults of zero indicate extraction
         // from the whole file)
-        transforms[k].setStartTime(RealTime());
-        transforms[k].setDuration(RealTime::frame2RealTime(reader->getFrameCount(), m_sampleRate));                                       
+        transforms[k].setStartTime(RealTime::zeroTime);
+        transforms[k].setDuration
+            (RealTime::frame2RealTime(reader->getFrameCount(), m_sampleRate));
         
         print(transforms[k]);            
         
@@ -249,8 +253,13 @@
         // in case they wanted to add header information
         // or even rename files according to some convention
         
-        for (int j = 0; j < pluginWriters[k].size(); ++j)
-            pluginWriters[k][j]->write(audioSource.c_str(), plugins[k]->getIdentifier(), plugins[k]->getOutputDescriptors(), plugins[k]->getRemainingFeatures());
+        for (int j = 0; j < pluginWriters[k].size(); ++j) {
+            pluginWriters[k][j]->write
+                (audioSource,
+                 transforms[k].getIdentifier(),
+                 plugins[k]->getOutputDescriptors(), //!!! inefficient
+                 plugins[k]->getRemainingFeatures());
+        }
     }
     
     TempDirectory::getInstance()->cleanup();

Modified: runner/trunk/FeatureExtractionManager.h
===================================================================
--- runner/trunk/FeatureExtractionManager.h	2008-03-26 14:38:38 UTC (rev 1030)
+++ runner/trunk/FeatureExtractionManager.h	2008-03-27 10:15:26 UTC (rev 1031)
@@ -32,15 +32,26 @@
 public:
     FeatureExtractionManager();
     virtual ~FeatureExtractionManager();
+
     void setChannels(int channels);
     void setSampleRate(int sampleRate);
-    bool addFeatureExtractor(string transformXmlFile, vector<FeatureWriter*> writers);
-    bool addFeatureExtractor(string library, string plugname, vector<FeatureWriter*> writers);
-    void extractFeatures(string audioSource);
+
+    bool addFeatureExtractorFromFile(QString transformXmlFile,
+                                     const vector<FeatureWriter*> &writers);
+    bool addDefaultFeatureExtractor(TransformId transformId,
+                                    const vector<FeatureWriter*> &writers);
+
+    void extractFeatures(QString audioSource);
+
 private:
     vector<Vamp::Plugin*> plugins;
-    vector<vector<FeatureWriter*> > pluginWriters;    // parallel vector of writers for each plugin
-    vector<Transform> transforms;    // parallel vector of transform records for each plugin
+
+    // parallel vector of writers for each plugin
+    vector<vector<FeatureWriter*> > pluginWriters;
+
+    // parallel vector of transform records for each plugin
+    vector<Transform> transforms;
+
     int m_sampleRate;
     int m_channels;
     

Modified: runner/trunk/FeatureWriter.h
===================================================================
--- runner/trunk/FeatureWriter.h	2008-03-26 14:38:38 UTC (rev 1030)
+++ runner/trunk/FeatureWriter.h	2008-03-27 10:15:26 UTC (rev 1031)
@@ -20,6 +20,10 @@
 #include <map>
 #include <vector>
 
+#include <QString>
+
+#include "transform/Transform.h"
+
 #include <vamp-sdk/Plugin.h>
 
 using std::string;
@@ -31,7 +35,7 @@
 public:
     virtual ~FeatureWriter() { }
 
-    struct Parameter {
+    struct Parameter { // parameter of the writer, not the plugin
         string name;
         string description;
         bool hasArg;
@@ -45,8 +49,8 @@
         return;
     }
 
-    virtual void write(const string& trackid,
-                       const string& pluginid,
+    virtual void write(QString trackid,
+                       TransformId transformId,
                        const Vamp::Plugin::OutputList& outputList,
                        const Vamp::Plugin::FeatureSet& featureSet) = 0;
 };

Modified: runner/trunk/RDFFeatureWriter.cpp
===================================================================
--- runner/trunk/RDFFeatureWriter.cpp	2008-03-26 14:38:38 UTC (rev 1030)
+++ runner/trunk/RDFFeatureWriter.cpp	2008-03-27 10:15:26 UTC (rev 1031)
@@ -23,10 +23,8 @@
 using namespace std;
 using namespace Vamp;
 
-RDFFeatureWriter::RDFFeatureWriter() : 
-    catalogueId("."), baseDir(".") //!!!
+RDFFeatureWriter::RDFFeatureWriter() 
 {
-    
 }
 
 RDFFeatureWriter::~RDFFeatureWriter()
@@ -78,8 +76,8 @@
     }
 }
 
-void RDFFeatureWriter::write(const string& trackid,
-                             const string& pluginid,
+void RDFFeatureWriter::write(QString trackid,
+                             TransformId transformId,
                              const Plugin::OutputList& outputList,
                              const Plugin::FeatureSet& featureSet)
 {
@@ -93,38 +91,38 @@
         for (unsigned int i = 0; i < featureList.size(); ++i)
         {
             // replace output files if necessary
-            replaceFeatureWriter(trackid, pluginid);
-            featureWriters[pluginid]->write(trackid, pluginid, outputList, featureSet);
+            replaceFeatureWriter(trackid, transformId);
+            featureWriters[transformId]->write
+                (trackid, transformId, outputList, featureSet);
         }
     }
 }
 
-bool RDFFeatureWriter::newFeatureWriter(const string& trackid, const string& identifier)
+bool RDFFeatureWriter::newFeatureWriter(QString trackid, TransformId transformId)
 {
     string filepath = baseDir + "/" + catalogueId  + "/" + trackid + "." + identifier + ".rdf";
     featureWriters[identifier] = new RDFSinglePluginWriter(trackid, filepath);
-    if (!(featureWriters[identifier]->out))
-        return false;
+    if (!(featureWriters[identifier]->out)) return false;
     return true;
 }
 
-// replace writer if no writer open for this track&plugin, else return false
-bool RDFFeatureWriter::replaceFeatureWriter(const string& trackid, const string& pluginid)
+// replace writer if no writer open for this track/transform, else return false
+bool RDFFeatureWriter::replaceFeatureWriter(QString trackid, TransformId transformId)
 {
-    if (featureWriters.find(pluginid) != featureWriters.end())
+    if (featureWriters.find(transformId) != featureWriters.end())
     {
-        if (featureWriters[pluginid]->trackid == trackid)
+        if (featureWriters[transformId]->trackid == trackid)
             return false;    // have a feature writer for this track & plugin
         else    // track has changed
         {
             cerr<<"found feature writer with old track"<<endl;
-            cerr<<"new : "<<trackid<<", old : "<<featureWriters[pluginid]->trackid<<endl;
-            delete featureWriters[pluginid];
-            featureWriters.erase(pluginid);
+            cerr<<"new : "<<trackid<<", old : "<<featureWriters[transformId]->trackid<<endl;
+            delete featureWriters[transformId];
+            featureWriters.erase(transformId);
         }
     }
     cerr<<"allocating new RDFSinglePluginWriter"<<endl;
-    newFeatureWriter(trackid, pluginid);
+    newFeatureWriter(trackid, transformId);
     return true;
 }
 
@@ -134,53 +132,56 @@
     return (fin != NULL);
 }
 
-string RDFFeatureWriter::getDescriptionFileForPlugin(const string& pluginid)
+QString RDFFeatureWriter::getDescriptionFileForTransform(TransformId transformId)
 {
-    string path = "";
+    QString type, soname, label;
+    QString pluginIdentifier;
+    Transform transform;
+    transform.setIdentifier(transformId);
+    pluginIdentifier = transformId.getPluginIdentifier();
+    PluginIdentifier::parseIdentifier(identifier, type, soname, label);
+
     vector<string> paths = PluginHostAdapter::getPluginPath();
+    paths.push_back("."); // look in current directory as well
 
-    paths.push_back("."); //!!!
+    QStringList filters;
+    filters << "*.rdf";
+    filters << "*.RDF";
+    filters << "*.n3";
+    filters << "*.N3";
 
-    vector<string> rdf_exts;
-    rdf_exts.push_back("rdf"); rdf_exts.push_back("RDF");
-    rdf_exts.push_back("n3");  rdf_exts.push_back("N3");
+    // Search each Vamp plugin path for a .rdf file that either has
+    // name "soname_label" or "soname/label" plus RDF extension
 
-    HostExt::PluginLoader *loader = HostExt::PluginLoader::getInstance();
-    vector<string> keys = loader->listPlugins();    
-    string libname = "";
-    for (vector<string>::iterator kitr = keys.begin(); kitr != keys.end(); kitr++)
-    {
-        string::size_type ci = (*kitr).find(':');
-        if (ci != string::npos && (*kitr).substr(ci + 1) == pluginid)
-        {
-            libname = (*kitr).substr(0,ci);
-            cerr<<"Found library name for plugin : "<<libname<<endl;
+    for (vector<string>::const_iterator i = paths.begin(); i != paths.end(); ++i) {
+
+        QDir dir(i->c_str());
+        if (!dir.exists()) continue;
+
+        QDir subdir = QDir(dir.filePath(soname));
+        if (subdir.exists()) {
+            QStringList entries = subdir.entryList
+                (filters, QDir::Files | QDir::Readable);
+            for (QStringList::const_iterator j = entries.begin();
+                 j != entries.end(); ++j) {
+                QFileInfo fi(subdir.filePath(*j));
+                if (fi.baseName().compare(label, Qt::CaseInsensitive) == 0) {
+                    return fi.filePath();
+                }
+            }
         }
+       
+        QStringList entries = dir.entryList
+            (filters, QDir::Files | QDir::Readable);
+        for (QStringList::const_iterator j = entries.begin();
+             j != entries.end(); ++j) {
+            QFileInfo fi(subdir.filePath(*j));
+            if (fi.baseName().compare(QString("%1_%2").arg(soname).arg(label),
+                                      Qt::CaseInsensitive) == 0) {
+                return fi.filePath();
+            }
+        }
     }
-    if (libname == "")
-        cerr<<"Couldn't find library name for plugin "<<pluginid<<" !"<<endl;
-    
-    // Search each Vamp plugin path for a .rdf file matching the plugin identifier
-    // (possibly in a library-named directory)
-    
-    for (vector<string>::const_iterator pitr = paths.begin(); pitr != paths.end(); pitr++)
-    {
-        for (vector<string>::const_iterator eitr = rdf_exts.begin(); eitr != rdf_exts.end(); eitr++)
-        {
-            path = *pitr + "/" + pluginid + "." + *eitr;
-            cerr<<"Looking for "<<path<<endl;
-            // Check for file
-            if (fileExists(path))
-                return path;
 
-            path = *pitr + "/" + libname + "/" + pluginid + "." + *eitr; // is dir delimiter "/" portable ?
-            cerr<<"Looking for "<<path<<endl;
-            // Check for file
-            if (fileExists(path))
-                return path;
-        }
-    }
-    
-    cerr<<"Couldn't find description of plugin !"<<endl;
     return "";
 }

Modified: runner/trunk/RDFFeatureWriter.h
===================================================================
--- runner/trunk/RDFFeatureWriter.h	2008-03-26 14:38:38 UTC (rev 1030)
+++ runner/trunk/RDFFeatureWriter.h	2008-03-27 10:15:26 UTC (rev 1031)
@@ -34,22 +34,19 @@
     virtual ParameterList getSupportedParameters() const;
     virtual void setParameters(map<string, string> &params);
 
-    virtual void write(const string& trackid,
-                       const string& pluginid,
+    virtual void write(QString trackid,
+                       TransformId transformId,
                        const Vamp::Plugin::OutputList& outputList,
                        const Vamp::Plugin::FeatureSet& featureSet);
 
-    static string getDescriptionFileForPlugin(const string& pluginid);
+    static QString getDescriptionFileForTransform(TransformId transformId);
     
 private:
-    string catalogueId;
-    string baseDir;
-
-    typedef map<string, RDFSinglePluginWriter*> WriterMap;
+    typedef map<TransformId, RDFSinglePluginWriter*> WriterMap;
     WriterMap featureWriters;
     
-    bool newFeatureWriter(const string& trackid, const string& identifier);
-    bool replaceFeatureWriter(const string& trackid, const string& identifier);
+    bool newFeatureWriter(QString trackid, TransformId transformId);
+    bool replaceFeatureWriter(QString trackid, TransformId transformId);
 };
 
 #endif

Modified: runner/trunk/RDFSinglePluginWriter.h
===================================================================
--- runner/trunk/RDFSinglePluginWriter.h	2008-03-26 14:38:38 UTC (rev 1030)
+++ runner/trunk/RDFSinglePluginWriter.h	2008-03-27 10:15:26 UTC (rev 1031)
@@ -34,10 +34,18 @@
 class RDFSinglePluginWriter : public FeatureWriter
 {
 public:
-    RDFSinglePluginWriter(const string& trackid, const string& outfilename);
+    RDFSinglePluginWriter(QString trackid, QString outfilename);
     virtual ~RDFSinglePluginWriter() { }
-    virtual void init(const string& trackid, const string& pluginid, const Vamp::Plugin::OutputList& outputList);
-    virtual void write(const string& trackid, const string& pluginid, const Vamp::Plugin::OutputList& outputList, const Vamp::Plugin::FeatureSet& featureSet);
+
+    virtual void init(QString trackid,
+                      TransformId transformId,
+                      const Vamp::Plugin::OutputList& outputList);
+
+    virtual void write(QString trackid,
+                       TransformId transformId,
+                       const Vamp::Plugin::OutputList& outputList,
+                       const Vamp::Plugin::FeatureSet& featureSet);
+
     bool am_initialised;
     string trackid;
     int fe_count;

Modified: runner/trunk/SimpleRDFFeatureWriter.h
===================================================================
--- runner/trunk/SimpleRDFFeatureWriter.h	2008-03-26 14:38:38 UTC (rev 1030)
+++ runner/trunk/SimpleRDFFeatureWriter.h	2008-03-27 10:15:26 UTC (rev 1031)
@@ -23,8 +23,15 @@
 {
 public:
     virtual ~SimpleRDFFeatureWriter() { }
-    virtual void init(const string& trackid, const Vamp::Plugin::OutputList& outputList);
-    virtual void write(const string& trackid, const string& pluginid, const Vamp::Plugin::OutputList& outputList, const Vamp::Plugin::FeatureSet& featureSet);
+
+    virtual void init(QString trackid,
+                      TransformId transformId,
+                      const Vamp::Plugin::OutputList& outputList);
+
+    virtual void write(QString trackid,
+                       TransformId transformId,
+                       const Vamp::Plugin::OutputList& outputList,
+                       const Vamp::Plugin::FeatureSet& featureSet);
 };
 
 #endif

Modified: runner/trunk/main.cpp
===================================================================
--- runner/trunk/main.cpp	2008-03-26 14:38:38 UTC (rev 1030)
+++ runner/trunk/main.cpp	2008-03-27 10:15:26 UTC (rev 1031)
@@ -507,7 +507,7 @@
     
     for (set<string>::const_iterator i = requestedTransformFiles.begin();
          i != requestedTransformFiles.end(); ++i) {
-        manager.addFeatureExtractor(*i, writers);
+        manager.addFeatureExtractorFromFile(i->c_str(), writers);
     }
 
     QStringList sources;
@@ -530,7 +530,7 @@
     for (QStringList::const_iterator i = sources.begin();
          i != sources.end(); ++i) {
         std::cerr << "Extracting features for: \"" << i->toStdString() << "\"" << std::endl;
-        manager.extractFeatures(i->toStdString());
+        manager.extractFeatures(*i);
     }
     
     return 0;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1032
          http://sv1.svn.sourceforge.net/sv1/?rev=1032&view=rev
Author:   cannam
Date:     2008-03-28 09:48:51 -0700 (Fri, 28 Mar 2008)

Log Message:
-----------

* New class that reads RDF descriptions (will be moving this out of
  RDFSinglePluginWriter).
  This revision still does not compile.

Modified Paths:
--------------
    runner/trunk/RDFFeatureWriter.cpp
    runner/trunk/RDFFeatureWriter.h
    runner/trunk/runner.pro

Added Paths:
-----------
    runner/trunk/PluginRDFDescription.cpp
    runner/trunk/PluginRDFDescription.h

Added: runner/trunk/PluginRDFDescription.cpp
===================================================================
--- runner/trunk/PluginRDFDescription.cpp	                        (rev 0)
+++ runner/trunk/PluginRDFDescription.cpp	2008-03-28 16:48:51 UTC (rev 1032)
@@ -0,0 +1,340 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
+/*
+    Sonic Annotator
+    A utility for batch feature extraction from audio files.
+    Mark Levy, Chris Sutton and Chris Cannam, Queen Mary, University of London.
+    Copyright 2007-2008 QMUL.
+
+    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 "PluginRDFDescription.h"
+
+#include "plugin/PluginIdentifier.h"
+
+#include <vamp-sdk/Plugin.h>
+#include <vamp-sdk/PluginHostAdapter.h>
+#include <vamp-sdk/hostext/PluginLoader.h>
+
+#include <redland.h>
+
+#include <QString>
+#include <QDir>
+#include <QFileInfo>
+
+using namespace std;
+using namespace Vamp;
+
+PluginRDFDescription::PluginRDFDescription(QString pluginId) :
+    m_haveDescription(false)
+{
+    QString descFile = getDescriptionFileForPlugin(pluginId);
+    if (descFile == "") return;
+
+    auto_ptr<Plugin> plugin
+        (HostExt::PluginLoader::getInstance()->loadPlugin
+         (pluginId.toStdString(), 48000, HostExt::PluginLoader::ADAPT_ALL));
+    if (!plugin.get()) return;
+
+    cerr << "PluginRDFDescription: Loading description from file: \""
+         << descFile.toStdString() << "\"" << endl << endl;
+
+    QString descURI = "file://" + descFile;
+        
+    librdf_world* world = librdf_new_world();
+    librdf_world_open(world);
+
+    typedef const unsigned char *STR; // redland's expected string type
+
+    librdf_uri *uri = librdf_new_uri(world, (STR)descURI.toUtf8().data());
+    librdf_storage* storage = librdf_new_storage(world, "memory", "test", NULL);
+    librdf_parser* parser = librdf_new_parser(world, "guess", NULL, NULL);
+    librdf_model* model = librdf_new_model(world, storage, NULL);
+
+    if (librdf_parser_parse_into_model(parser, uri, uri, model)) {
+        cerr << "PluginRDFDescription: Failed to parse RDF from file \""
+             << descFile.toStdString() << "\" into model" << endl;
+    }
+
+    librdf_free_parser(parser);
+        
+    // Find our plugin :
+
+    librdf_node* n_rdf_type = librdf_new_node_from_uri_string
+        (world, (STR)"http://www.w3.org/1999/02/22-rdf-syntax-ns#type");
+
+    librdf_node* n_rdfs_subClassOf = librdf_new_node_from_uri_string
+        (world, (STR)"http://www.w3.org/2000/01/rdf-schema#subClassOf");
+
+    librdf_node* n_vamp_Plugin = librdf_new_node_from_uri_string
+        (world, (STR)"http://www.vamp-plugins.org/ontology/Plugin");
+
+    librdf_node* n_vamp_identifier = librdf_new_node_from_uri_string
+        (world, (STR)"http://www.vamp-plugins.org/ontology/identifier");
+
+    librdf_node* n_vamp_computes = librdf_new_node_from_uri_string
+        (world, (STR)"http://www.vamp-plugins.org/ontology/computes");
+
+    librdf_node* n_vamp_computes_feature_type = librdf_new_node_from_uri_string
+        (world, (STR)"http://www.vamp-plugins.org/ontology/computes_feature_type");
+
+    librdf_node* n_vamp_computes_event_type = librdf_new_node_from_uri_string
+        (world, (STR)"http://www.vamp-plugins.org/ontology/computes_event_type");
+
+    librdf_node* n_af_Feature = librdf_new_node_from_uri_string
+        (world, (STR)"http://purl.org/ontology/af/Feature");
+
+    librdf_node* n_af_FeatureEvent = librdf_new_node_from_uri_string
+        (world, (STR)"http://purl.org/ontology/af/FeatureEvent");
+        
+    librdf_iterator* itr = librdf_model_get_sources
+        (model, n_rdf_type, n_vamp_Plugin);
+
+    librdf_node* n_plugin = NULL;
+
+    if (!itr || librdf_iterator_end(itr)) {
+        cerr << "PluginRDFDescription: No plugins found in the RDF file !" << endl;
+    } else {
+
+        while (!librdf_iterator_end(itr)) {
+            
+            librdf_node* this_plugin =
+                (librdf_node*)librdf_iterator_get_object(itr);
+
+            // Check identifier :
+            librdf_node* n_identifier = librdf_model_get_target
+                (model, this_plugin, n_vamp_identifier);
+
+            QString identifier = (const char *)
+                librdf_node_get_literal_value(n_identifier);
+            if (identifier == pluginId) {
+                n_plugin = this_plugin;
+                break;
+            }
+
+            librdf_iterator_next(itr);            
+        }
+
+        librdf_free_iterator(itr);  
+    }
+
+    if (!n_plugin) {
+        cerr << "PluginRDFDescription: Couldn't find plugin with matching identifier (\"" << pluginId.toStdString() << "\") in RDF file !" << endl;
+        librdf_free_world(world);
+        return;
+    }
+        
+    Plugin::OutputList outputs = plugin->getOutputDescriptors();
+
+    /*
+     * Describe feature events and features. 
+     */
+
+    for (Plugin::OutputList::const_iterator i = outputs.begin();
+         i != outputs.end(); ++i) {
+
+        const Plugin::OutputDescriptor &od = *i;
+        string oid = od.identifier;
+
+        m_odTypes[oid] = OT_UNKNOWN;
+        m_odFeatureTypeURIs[oid] = "<http://purl.org/ontology/af/Feature>";
+        m_odEventTypeURIs[oid] = "<http://purl.org/ontology/af/FeatureEvent>";
+
+        // Find the RDF about this output descriptor
+
+        librdf_node* n_od = librdf_model_get_source
+            (model, n_vamp_identifier,
+             librdf_new_node_from_literal(world, (STR)oid.c_str(), NULL, 0));
+
+        if (!n_od) {
+            cerr << "PluginRDFDescription: NOTE: Couldn't find RDF description of output descriptor " << oid << " !" << endl;
+        }
+
+        // Does it compute features, events, or both ?
+
+        itr = librdf_model_get_targets(model, n_od,
+                                       n_vamp_computes_feature_type);
+
+        if (itr && !librdf_iterator_end(itr)) {
+            
+            // it computes features (at least)
+
+            while (!librdf_iterator_end(itr)) {
+
+                librdf_node* n_computes_obj = (librdf_node*)
+                    librdf_iterator_get_object(itr);
+
+                if (m_odTypes[oid] == OT_BOTH ||
+                    m_odTypes[oid] == OT_FEATURE) {
+
+                    cerr << "PluginRDFDescription: NOTE: Too many vamp:computes_feature_type statements for output descriptor " << od.identifier << " !" << endl;
+                    
+                } else {
+                    
+                    if (m_odTypes[oid] == OT_UNKNOWN) {
+                        m_odTypes[oid] = OT_FEATURE;
+                    } else {
+                        m_odTypes[oid] = OT_BOTH;
+                    }
+                    
+                    m_odFeatureTypeURIs[oid] =
+                        "<" +
+                        (string)(const char*)librdf_uri_as_string
+                        (librdf_node_get_uri(n_computes_obj)) + 
+                        ">";
+                }
+                
+                librdf_iterator_next(itr);
+            }
+        }
+
+        if (itr) librdf_free_iterator(itr);
+
+        itr = librdf_model_get_targets(model, n_od,
+                                       n_vamp_computes_event_type);
+
+        if (itr && !librdf_iterator_end(itr)) {
+
+            // it computes events, at least
+
+            while (!librdf_iterator_end(itr)) {
+                
+                librdf_node* n_computes_obj = (librdf_node*)
+                    librdf_iterator_get_object(itr);
+
+                if (m_odTypes[oid] == OT_BOTH ||
+                    m_odTypes[oid] == OT_EVENT) {
+
+                    cerr << "PluginRDFDescription: NOTE: Too many vamp:computes_event_type statements for output descriptor " << oid << " !" << endl;
+
+                } else {
+
+                    if (m_odTypes[oid] == OT_UNKNOWN) {
+                        m_odTypes[oid] = OT_EVENT;
+                    } else {
+                        m_odTypes[oid] = OT_BOTH;
+                    }
+
+                    m_odEventTypeURIs[oid] =
+                        "<" + 
+                        (string)(const char*)librdf_uri_as_string
+                        (librdf_node_get_uri(n_computes_obj)) + 
+                        ">";
+                }
+
+                librdf_iterator_next(itr);
+            }
+        }
+
+        if (itr) librdf_free_iterator(itr);
+    }
+
+    for (Plugin::OutputList::const_iterator i = outputs.begin();
+         i != outputs.end(); ++i) {
+
+        /*
+         * Fallback to local names if accompanying RDF doesn't satisfy
+         */
+
+        const Plugin::OutputDescriptor &od = *i;
+        string oid = od.identifier;
+        
+        if (m_odTypes[oid] != OT_UNKNOWN) continue;
+
+        m_odLocalFeatureTypes[oid] +=
+            string(":fetype_") + oid +
+            " rdfs:subClassOf af:FeatureEvent;\n" +
+            "    dc:title \"" + od.name + "\"; \n" +
+            "    dc:description \"" + od.description + " event\".\n";
+
+        m_odEventTypeURIs[oid] = ":fetype_" + oid;
+
+        m_odLocalFeatureTypes[oid] +=
+            string(":ftype_") + oid +
+            " rdfs:subClassOf af:Feature;\n" +
+            "    dc:title \"" + od.name + "\"; \n" +
+            "    dc:description \"" + od.description + "\";\n" +
+            "    dc:format \"" + od.unit + "\".\n\n";
+
+        m_odFeatureTypeURIs[oid] = ":ftype_" + od.identifier;
+    }
+        
+    /*
+     * TODO : Add any relevant info about the Transform being used (eg. frame size, hop size)
+     */
+
+
+    // I'm gonna presume freeing the world frees nodes too - otherwise we're gonna need these and more :    
+    //    librdf_free_node(n_rdf_type);
+    //    librdf_free_node(n_vamp_plugin);
+
+    librdf_free_uri(uri);
+    librdf_free_model(model);
+    librdf_free_storage(storage);
+    librdf_free_world(world);
+
+    m_haveDescription = true;
+}
+
+
+QString
+PluginRDFDescription::getDescriptionFileForPlugin(QString pluginId)
+{
+    QString type, soname, label;
+    PluginIdentifier::parseIdentifier(pluginId, type, soname, label);
+
+    if (soname == "" || label == "") {
+        cerr << "PluginRDFDescription: ERROR: Ill-formed plugin ID \""
+             << pluginId.toStdString() << "\"" << endl;
+        return "";
+    }
+
+    vector<string> paths = PluginHostAdapter::getPluginPath();
+    paths.push_back("."); // look in current directory as well
+
+    QStringList filters;
+    filters << "*.rdf";
+    filters << "*.RDF";
+    filters << "*.n3";
+    filters << "*.N3";
+
+    // Search each Vamp plugin path for a .rdf file that either has
+    // name "soname_label" or "soname/label" plus RDF extension
+
+    for (vector<string>::const_iterator i = paths.begin(); i != paths.end(); ++i) {
+
+        QDir dir(i->c_str());
+        if (!dir.exists()) continue;
+
+        QDir subdir = QDir(dir.filePath(soname));
+        if (subdir.exists()) {
+            QStringList entries = subdir.entryList
+                (filters, QDir::Files | QDir::Readable);
+            for (QStringList::const_iterator j = entries.begin();
+                 j != entries.end(); ++j) {
+                QFileInfo fi(subdir.filePath(*j));
+                if (fi.baseName().compare(label, Qt::CaseInsensitive) == 0) {
+                    return fi.canonicalFilePath();
+                }
+            }
+        }
+       
+        QStringList entries = dir.entryList
+            (filters, QDir::Files | QDir::Readable);
+        for (QStringList::const_iterator j = entries.begin();
+             j != entries.end(); ++j) {
+            QFileInfo fi(subdir.filePath(*j));
+            if (fi.baseName().compare(QString("%1_%2").arg(soname).arg(label),
+                                      Qt::CaseInsensitive) == 0) {
+                return fi.canonicalFilePath();
+            }
+        }
+    }
+
+    return "";
+}

Added: runner/trunk/PluginRDFDescription.h
===================================================================
--- runner/trunk/PluginRDFDescription.h	                        (rev 0)
+++ runner/trunk/PluginRDFDescription.h	2008-03-28 16:48:51 UTC (rev 1032)
@@ -0,0 +1,65 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
+/*
+    Sonic Annotator
+    A utility for batch feature extraction from audio files.
+    Mark Levy, Chris Sutton and Chris Cannam, Queen Mary, University of London.
+    Copyright 2007-2008 QMUL.
+
+    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 _PLUGIN_RDF_DESCRIPTION_H_
+#define _PLUGIN_RDF_DESCRIPTION_H_
+
+#include <map>
+#include <string>
+
+#include <QString>
+
+class PluginRDFDescription
+{
+public:
+    PluginRDFDescription(QString pluginId);
+    ~PluginRDFDescription();
+
+    enum OutputType
+    {
+        OT_UNKNOWN,
+        OT_FEATURE,
+        OT_EVENT,
+        OT_BOTH
+    };
+
+    bool haveDescription() const {
+        return m_haveDescription;
+    }
+
+    typedef std::map<std::string, int> OutputTypeMap;
+    typedef std::map<std::string, std::string> OutputStringMap;
+
+    const OutputTypeMap &getOutputTypes() const {
+        return m_odTypes;
+    }
+    const OutputStringMap &getOutputFeatureTypeURIs() const {
+        return m_odFeatureTypeURIs;
+    }
+    const OutputStringMap &getOutputEventTypeURIs() const {
+        return m_odEventTypeURIs; 
+    }
+    
+private:
+    QString getDescriptionFileForPlugin(QString pluginId);
+    
+    bool m_haveDescription;
+    OutputTypeMap m_odTypes;
+    OutputStringMap m_odFeatureTypeURIs;
+    OutputStringMap m_odEventTypeURIs;
+    OutputStringMap m_odLocalFeatureTypes;
+};
+
+#endif

Modified: runner/trunk/RDFFeatureWriter.cpp
===================================================================
--- runner/trunk/RDFFeatureWriter.cpp	2008-03-27 10:15:26 UTC (rev 1031)
+++ runner/trunk/RDFFeatureWriter.cpp	2008-03-28 16:48:51 UTC (rev 1032)
@@ -23,7 +23,9 @@
 using namespace std;
 using namespace Vamp;
 
-RDFFeatureWriter::RDFFeatureWriter() 
+RDFFeatureWriter::RDFFeatureWriter() :
+    m_manyFiles(false),
+    m_plain(false)
 {
 }
 
@@ -73,6 +75,15 @@
     for (map<string, string>::iterator i = params.begin();
          i != params.end(); ++i) {
         cerr << i->first << " -> " << i->second << endl;
+        if (i->first == "basedir") {
+            m_baseDir = i->second.c_str();
+        } else if (i->first == "many-files") {
+            m_manyFiles = true;
+        } else if (i->first == "one-file") {
+            m_singleFileName = i->second.c_str();
+        } else if (i->first == "plain") {
+            m_plain = true;
+        }
     }
 }
 

Modified: runner/trunk/RDFFeatureWriter.h
===================================================================
--- runner/trunk/RDFFeatureWriter.h	2008-03-27 10:15:26 UTC (rev 1031)
+++ runner/trunk/RDFFeatureWriter.h	2008-03-28 16:48:51 UTC (rev 1032)
@@ -39,11 +39,14 @@
                        const Vamp::Plugin::OutputList& outputList,
                        const Vamp::Plugin::FeatureSet& featureSet);
 
-    static QString getDescriptionFileForTransform(TransformId transformId);
-    
 private:
     typedef map<TransformId, RDFSinglePluginWriter*> WriterMap;
     WriterMap featureWriters;
+
+    QString m_baseDir;
+    bool m_manyFiles;
+    QString m_singleFileName;
+    bool m_plain;
     
     bool newFeatureWriter(QString trackid, TransformId transformId);
     bool replaceFeatureWriter(QString trackid, TransformId transformId);

Modified: runner/trunk/runner.pro
===================================================================
--- runner/trunk/runner.pro	2008-03-27 10:15:26 UTC (rev 1031)
+++ runner/trunk/runner.pro	2008-03-28 16:48:51 UTC (rev 1032)
@@ -29,8 +29,8 @@
 MOC_DIR = tmp_moc
 
 # Input
-HEADERS += AudioDBFeatureWriter.h      FeatureWriterFactory.h  RDFSinglePluginWriter.h DefaultFeatureWriter.h      FeatureWriter.h         SimpleRDFFeatureWriter.h FeatureExtractionManager.h  RDFFeatureWriter.h
-SOURCES += main.cpp DefaultFeatureWriter.cpp RDFFeatureWriter.cpp RDFSinglePluginWriter.cpp FeatureExtractionManager.cpp AudioDBFeatureWriter.cpp FeatureWriterFactory.cpp
+HEADERS += AudioDBFeatureWriter.h      FeatureWriterFactory.h  RDFSinglePluginWriter.h DefaultFeatureWriter.h      FeatureWriter.h         SimpleRDFFeatureWriter.h FeatureExtractionManager.h  RDFFeatureWriter.h PluginRDFDescription.h
+SOURCES += main.cpp DefaultFeatureWriter.cpp RDFFeatureWriter.cpp RDFSinglePluginWriter.cpp FeatureExtractionManager.cpp AudioDBFeatureWriter.cpp FeatureWriterFactory.cpp PluginRDFDescription.cpp
 
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1033
          http://sv1.svn.sourceforge.net/sv1/?rev=1033&view=rev
Author:   cannam
Date:     2008-03-28 10:44:04 -0700 (Fri, 28 Mar 2008)

Log Message:
-----------

* OK, now it compiles, and it loads plugin descriptions from RDF.
  Doesn't do anything else yet though.

Modified Paths:
--------------
    runner/trunk/AudioDBFeatureWriter.cpp
    runner/trunk/FeatureExtractionManager.cpp
    runner/trunk/PluginRDFDescription.cpp
    runner/trunk/PluginRDFDescription.h
    runner/trunk/RDFFeatureWriter.cpp
    runner/trunk/RDFFeatureWriter.h
    runner/trunk/main.cpp
    runner/trunk/runner.pro

Added Paths:
-----------
    runner/trunk/vamp-example-plugins:percussiononsets.n3

Removed Paths:
-------------
    runner/trunk/percussiononsets.n3

Modified: runner/trunk/AudioDBFeatureWriter.cpp
===================================================================
--- runner/trunk/AudioDBFeatureWriter.cpp	2008-03-28 16:48:51 UTC (rev 1032)
+++ runner/trunk/AudioDBFeatureWriter.cpp	2008-03-28 17:44:04 UTC (rev 1033)
@@ -160,7 +160,7 @@
 bool AudioDBFeatureWriter::openDBFile(QString trackid, const string& identifier)
 {
     string filepath = baseDir + "/" + catalogueId  + "/"
-        + trackid.toString() + "." + identifier;
+        + trackid.toStdString() + "." + identifier;
     ofstream* ofs = new ofstream(filepath.c_str());
     if (!*ofs)
     {    

Modified: runner/trunk/FeatureExtractionManager.cpp
===================================================================
--- runner/trunk/FeatureExtractionManager.cpp	2008-03-28 16:48:51 UTC (rev 1032)
+++ runner/trunk/FeatureExtractionManager.cpp	2008-03-28 17:44:04 UTC (rev 1033)
@@ -67,7 +67,7 @@
 {
     TransformFactory *tf = TransformFactory::getInstance();
 
-    transform = tf->getDefaultTransformFor(transformId, m_sampleRate);
+    Transform transform = tf->getDefaultTransformFor(transformId, m_sampleRate);
 
     PluginBase *pb = tf->instantiatePluginFor(transform);
     Plugin *plugin = tf->downcastVampPlugin(pb);
@@ -97,7 +97,7 @@
         return false;
     }
 
-    QTextStream *qts = new QTextStream(file);
+    QTextStream *qts = new QTextStream(&file);
     QString qs = qts->readAll();
     delete qts;
     file.close();
@@ -171,7 +171,7 @@
     // reject file if it has too few channels, plugin will handle if it has too many
     if (channels < m_channels)
     {
-        cerr << "ERROR: File or URL \"" << audioSource << "\" has less than " << m_channels << " channels" << endl;
+        cerr << "ERROR: File or URL \"" << audioSource.toStdString() << "\" has less than " << m_channels << " channels" << endl;
         exit(1);
     }
     

Modified: runner/trunk/PluginRDFDescription.cpp
===================================================================
--- runner/trunk/PluginRDFDescription.cpp	2008-03-28 16:48:51 UTC (rev 1032)
+++ runner/trunk/PluginRDFDescription.cpp	2008-03-28 17:44:04 UTC (rev 1033)
@@ -34,12 +34,23 @@
     m_haveDescription(false)
 {
     QString descFile = getDescriptionFileForPlugin(pluginId);
-    if (descFile == "") return;
+    if (descFile == "") {
+        cerr << "PluginRDFDescription: No description file found" << endl;
+        return;
+    }
 
+    QString type, soname, label;
+    PluginIdentifier::parseIdentifier(pluginId, type, soname, label);
     auto_ptr<Plugin> plugin
         (HostExt::PluginLoader::getInstance()->loadPlugin
-         (pluginId.toStdString(), 48000, HostExt::PluginLoader::ADAPT_ALL));
-    if (!plugin.get()) return;
+         (HostExt::PluginLoader::getInstance()->composePluginKey
+          (soname.toStdString(), label.toStdString()),
+          48000, HostExt::PluginLoader::ADAPT_ALL));
+    if (!plugin.get()) {
+        cerr << "PluginRDFDescription: Failed to load plugin \""
+             << pluginId.toStdString() << "\"" << endl;
+        return;
+    }
 
     cerr << "PluginRDFDescription: Loading description from file: \""
          << descFile.toStdString() << "\"" << endl << endl;
@@ -112,7 +123,7 @@
 
             QString identifier = (const char *)
                 librdf_node_get_literal_value(n_identifier);
-            if (identifier == pluginId) {
+            if (identifier == label) {
                 n_plugin = this_plugin;
                 break;
             }
@@ -124,7 +135,7 @@
     }
 
     if (!n_plugin) {
-        cerr << "PluginRDFDescription: Couldn't find plugin with matching identifier (\"" << pluginId.toStdString() << "\") in RDF file !" << endl;
+        cerr << "PluginRDFDescription: Couldn't find plugin with matching identifier (\"" << label.toStdString() << "\") in RDF file !" << endl;
         librdf_free_world(world);
         return;
     }
@@ -281,6 +292,9 @@
     m_haveDescription = true;
 }
 
+PluginRDFDescription::~PluginRDFDescription()
+{
+}
 
 QString
 PluginRDFDescription::getDescriptionFileForPlugin(QString pluginId)
@@ -304,7 +318,7 @@
     filters << "*.N3";
 
     // Search each Vamp plugin path for a .rdf file that either has
-    // name "soname_label" or "soname/label" plus RDF extension
+    // name "soname:label" or "soname/label" plus RDF extension
 
     for (vector<string>::const_iterator i = paths.begin(); i != paths.end(); ++i) {
 
@@ -319,19 +333,19 @@
                  j != entries.end(); ++j) {
                 QFileInfo fi(subdir.filePath(*j));
                 if (fi.baseName().compare(label, Qt::CaseInsensitive) == 0) {
-                    return fi.canonicalFilePath();
+                    return fi.absoluteFilePath();
                 }
             }
         }
        
         QStringList entries = dir.entryList
             (filters, QDir::Files | QDir::Readable);
+        QString comparator = QString("%1:%2").arg(soname).arg(label);
         for (QStringList::const_iterator j = entries.begin();
              j != entries.end(); ++j) {
-            QFileInfo fi(subdir.filePath(*j));
-            if (fi.baseName().compare(QString("%1_%2").arg(soname).arg(label),
-                                      Qt::CaseInsensitive) == 0) {
-                return fi.canonicalFilePath();
+            QFileInfo fi(dir.filePath(*j));
+            if (fi.baseName().compare(comparator, Qt::CaseInsensitive) == 0) {
+                return fi.absoluteFilePath();
             }
         }
     }

Modified: runner/trunk/PluginRDFDescription.h
===================================================================
--- runner/trunk/PluginRDFDescription.h	2008-03-28 16:48:51 UTC (rev 1032)
+++ runner/trunk/PluginRDFDescription.h	2008-03-28 17:44:04 UTC (rev 1033)
@@ -24,6 +24,7 @@
 class PluginRDFDescription
 {
 public:
+    PluginRDFDescription() : m_haveDescription(false) { }
     PluginRDFDescription(QString pluginId);
     ~PluginRDFDescription();
 

Modified: runner/trunk/RDFFeatureWriter.cpp
===================================================================
--- runner/trunk/RDFFeatureWriter.cpp	2008-03-28 16:48:51 UTC (rev 1032)
+++ runner/trunk/RDFFeatureWriter.cpp	2008-03-28 17:44:04 UTC (rev 1033)
@@ -31,12 +31,14 @@
 
 RDFFeatureWriter::~RDFFeatureWriter()
 {
+    /*!!!
     // close all open files
     for (WriterMap::iterator iter = featureWriters.begin();
          iter != featureWriters.end(); ++iter)
     {
         delete iter->second;
     }
+    */
 }
 
 RDFFeatureWriter::ParameterList
@@ -92,6 +94,23 @@
                              const Plugin::OutputList& outputList,
                              const Plugin::FeatureSet& featureSet)
 {
+    Transform t;
+    t.setIdentifier(transformId);
+    QString pluginId = t.getPluginIdentifier();
+    if (m_rdfDescriptions.find(pluginId) == m_rdfDescriptions.end()) {
+
+        m_rdfDescriptions[pluginId] = PluginRDFDescription(pluginId);
+
+        if (m_rdfDescriptions[pluginId].haveDescription()) {
+            cerr << "NOTE: Have RDF description for plugin ID \""
+                 << pluginId.toStdString() << "\"" << endl;
+        } else {
+            cerr << "NOTE: Do not have RDF description for plugin ID \""
+                 << pluginId.toStdString() << "\"" << endl;
+        }
+    }
+
+/*!!!
     // iterate through FeatureLists    
     for (Plugin::FeatureSet::const_iterator iter = featureSet.begin();
          iter != featureSet.end(); ++iter)
@@ -107,8 +126,10 @@
                 (trackid, transformId, outputList, featureSet);
         }
     }
+*/
 }
 
+/*!!!
 bool RDFFeatureWriter::newFeatureWriter(QString trackid, TransformId transformId)
 {
     string filepath = baseDir + "/" + catalogueId  + "/" + trackid + "." + identifier + ".rdf";
@@ -137,62 +158,5 @@
     return true;
 }
 
-static bool fileExists(string filepath)
-{
-    std::ifstream fin(filepath.c_str());
-    return (fin != NULL);
-}
+*/
 
-QString RDFFeatureWriter::getDescriptionFileForTransform(TransformId transformId)
-{
-    QString type, soname, label;
-    QString pluginIdentifier;
-    Transform transform;
-    transform.setIdentifier(transformId);
-    pluginIdentifier = transformId.getPluginIdentifier();
-    PluginIdentifier::parseIdentifier(identifier, type, soname, label);
-
-    vector<string> paths = PluginHostAdapter::getPluginPath();
-    paths.push_back("."); // look in current directory as well
-
-    QStringList filters;
-    filters << "*.rdf";
-    filters << "*.RDF";
-    filters << "*.n3";
-    filters << "*.N3";
-
-    // Search each Vamp plugin path for a .rdf file that either has
-    // name "soname_label" or "soname/label" plus RDF extension
-
-    for (vector<string>::const_iterator i = paths.begin(); i != paths.end(); ++i) {
-
-        QDir dir(i->c_str());
-        if (!dir.exists()) continue;
-
-        QDir subdir = QDir(dir.filePath(soname));
-        if (subdir.exists()) {
-            QStringList entries = subdir.entryList
-                (filters, QDir::Files | QDir::Readable);
-            for (QStringList::const_iterator j = entries.begin();
-                 j != entries.end(); ++j) {
-                QFileInfo fi(subdir.filePath(*j));
-                if (fi.baseName().compare(label, Qt::CaseInsensitive) == 0) {
-                    return fi.filePath();
-                }
-            }
-        }
-       
-        QStringList entries = dir.entryList
-            (filters, QDir::Files | QDir::Readable);
-        for (QStringList::const_iterator j = entries.begin();
-             j != entries.end(); ++j) {
-            QFileInfo fi(subdir.filePath(*j));
-            if (fi.baseName().compare(QString("%1_%2").arg(soname).arg(label),
-                                      Qt::CaseInsensitive) == 0) {
-                return fi.filePath();
-            }
-        }
-    }
-
-    return "";
-}

Modified: runner/trunk/RDFFeatureWriter.h
===================================================================
--- runner/trunk/RDFFeatureWriter.h	2008-03-28 16:48:51 UTC (rev 1032)
+++ runner/trunk/RDFFeatureWriter.h	2008-03-28 17:44:04 UTC (rev 1033)
@@ -23,7 +23,8 @@
 using std::map;
 
 #include "FeatureWriter.h"
-#include "RDFSinglePluginWriter.h"
+//!!!#include "RDFSinglePluginWriter.h"
+#include "PluginRDFDescription.h"
 
 class RDFFeatureWriter : public FeatureWriter
 {
@@ -40,16 +41,21 @@
                        const Vamp::Plugin::FeatureSet& featureSet);
 
 private:
+    typedef map<QString, PluginRDFDescription> RDFDescriptionMap;
+    RDFDescriptionMap m_rdfDescriptions;
+
+/*!!!
     typedef map<TransformId, RDFSinglePluginWriter*> WriterMap;
     WriterMap featureWriters;
-
+*/
     QString m_baseDir;
     bool m_manyFiles;
     QString m_singleFileName;
     bool m_plain;
-    
+    /*!!!  
     bool newFeatureWriter(QString trackid, TransformId transformId);
     bool replaceFeatureWriter(QString trackid, TransformId transformId);
+    */
 };
 
 #endif

Modified: runner/trunk/main.cpp
===================================================================
--- runner/trunk/main.cpp	2008-03-28 16:48:51 UTC (rev 1032)
+++ runner/trunk/main.cpp	2008-03-28 17:44:04 UTC (rev 1033)
@@ -286,7 +286,7 @@
     bool multiplex = false;
     bool recursive = false;
     bool list = false;
-    QString skeletonFor;
+    QString skeletonFor = "";
     QString myname = args[0];
     myname = QFileInfo(myname).baseName();
     QStringList otherArgs;

Deleted: runner/trunk/percussiononsets.n3
===================================================================
--- runner/trunk/percussiononsets.n3	2008-03-28 16:48:51 UTC (rev 1032)
+++ runner/trunk/percussiononsets.n3	2008-03-28 17:44:04 UTC (rev 1033)
@@ -1,70 +0,0 @@
-@... rdfs:   <http://www.w3.org/2000/01/rdf-schema#>.
-@... xsd:    <http://www.w3.org/2001/XMLSchema#>.
-@... vamp:   <http://www.vamp-plugins.org/ontology/> .
-@... vampex: <http://www.vamp-plugins.org/examples/> .
-@... owl:    <http://www.w3.org/2002/07/owl#> .
-@... dc:     <http://purl.org/dc/elements/1.1/> .
-@... af:     <http://purl.org/ontology/af/> .
-@... foaf:   <http://xmlns.com/foaf/0.1/> .
-@... cc:     <http://web.resource.org/cc/> .
-@... thisplug: <http://www.vamp-plugins.org/examples/percussiononsets#>.
-@... :       <> .
-
-<>  a   vamp:PluginDescription ;
-    foaf:maker          <http://chrissutton.org/me> ;
-    foaf:primaryTopic   vampex:percussiononsets .
-
-vampex:percussiononsets a   vamp:Plugin ;
-    dc:title                "Simple Percussion Onset Detector" ;
-    dc:description          "Detect percussive note onsets by identifying broadband energy rises";
-    foaf:maker              <http://www.all-day-breakfast.com/cannam> ; #we'll pretend this is his URI
-    cc:license              <http://creativecommons.org/licenses/BSD/> ;
-    vamp:identifier         "percussiononsets" ; # The Vamp identifier for the plugin
-    vamp:vamp_API_version   vamp:version_v1.1b ; # Made up - this plugin doesn't actually specify it
-    owl:versionInfo         "2" ;
-    vamp:input_domain       vamp:TimeDomain ; # Made up - this plugin doesn't actually specify it
-
-    vamp:parameter_descriptor   thisplug:pd1 ;
-    vamp:parameter_descriptor   thisplug:pd2 ;
-    vamp:output_descriptor      thisplug:od1 ;
-    vamp:output_descriptor      thisplug:od2 .
-
-
-thisplug:pd1    a       vamp:ParameterDescriptor ;
-    vamp:identifier     "threshold" ;
-    dc:title            "Energy Rise threshold" ;
-    dc:description      "Energy rise within a frequency bin necessary to count toward broadband total" ;
-    dc:format           "dB" ;
-    vamp:minValue       0 ; #might be useful when interpreting plugin output
-    vamp:maxValue       20 ;
-    vamp:defaultValue   3 .
-
-
-thisplug:pd2    a       vamp:ParameterDescriptor ;
-    vamp:identifier     "sensitivity" ;
-    dc:title            "Sensitivity" ;
-    dc:description      "Sensitivity of peak detector applied to broadband detection function" ;
-    dc:format           "%" ;
-    vamp:minValue       0 ; #might be useful when interpreting plugin output
-    vamp:maxValue       100 ;
-    vamp:defaultValue   40 .
-    
-thisplug:od1    a       vamp:OutputDescriptor ;
-    vamp:identifier     "onsets" ;
-    dc:title            "Onsets" ;
-    dc:description      "Percussive note onset locations" ;
-    dc:format           "" ;
-    vamp:fixed_bin_count "true" ;
-    vamp:bin_count      0 ;
-    vamp:sample_type    vamp:VariableSampleRate ;
-    vamp:computes_event_type    af:Onset . # af:Onset is pending some thought
-
-thisplug:od2    a       vamp:OutputDescriptor ;
-    vamp:identifier     "detectionfunction" ;
-    dc:title            "Detection Function" ;
-    dc:description      "Broadband energy rise detection function";
-    dc:format           "" ;
-    vamp:fixed_bin_count "true" ;
-    vamp:bin_count      1 ;
-    vamp:sample_type    vamp:OneSamplePerStep ;
-    vamp:computes_feature_type  af:OnsetDetectionFunction .

Modified: runner/trunk/runner.pro
===================================================================
--- runner/trunk/runner.pro	2008-03-28 16:48:51 UTC (rev 1032)
+++ runner/trunk/runner.pro	2008-03-28 17:44:04 UTC (rev 1033)
@@ -29,8 +29,8 @@
 MOC_DIR = tmp_moc
 
 # Input
-HEADERS += AudioDBFeatureWriter.h      FeatureWriterFactory.h  RDFSinglePluginWriter.h DefaultFeatureWriter.h      FeatureWriter.h         SimpleRDFFeatureWriter.h FeatureExtractionManager.h  RDFFeatureWriter.h PluginRDFDescription.h
-SOURCES += main.cpp DefaultFeatureWriter.cpp RDFFeatureWriter.cpp RDFSinglePluginWriter.cpp FeatureExtractionManager.cpp AudioDBFeatureWriter.cpp FeatureWriterFactory.cpp PluginRDFDescription.cpp
+HEADERS += AudioDBFeatureWriter.h      FeatureWriterFactory.h  DefaultFeatureWriter.h      FeatureWriter.h         SimpleRDFFeatureWriter.h FeatureExtractionManager.h  RDFFeatureWriter.h PluginRDFDescription.h
+SOURCES += main.cpp DefaultFeatureWriter.cpp RDFFeatureWriter.cpp  FeatureExtractionManager.cpp AudioDBFeatureWriter.cpp FeatureWriterFactory.cpp PluginRDFDescription.cpp
 
 
 

Copied: runner/trunk/vamp-example-plugins:percussiononsets.n3 (from rev 1031, runner/trunk/percussiononsets.n3)
===================================================================
--- runner/trunk/vamp-example-plugins:percussiononsets.n3	                        (rev 0)
+++ runner/trunk/vamp-example-plugins:percussiononsets.n3	2008-03-28 17:44:04 UTC (rev 1033)
@@ -0,0 +1,70 @@
+@prefix rdfs:   <http://www.w3.org/2000/01/rdf-schema#>.
+@prefix xsd:    <http://www.w3.org/2001/XMLSchema#>.
+@prefix vamp:   <http://www.vamp-plugins.org/ontology/> .
+@prefix vampex: <http://www.vamp-plugins.org/examples/> .
+@prefix owl:    <http://www.w3.org/2002/07/owl#> .
+@prefix dc:     <http://purl.org/dc/elements/1.1/> .
+@prefix af:     <http://purl.org/ontology/af/> .
+@prefix foaf:   <http://xmlns.com/foaf/0.1/> .
+@prefix cc:     <http://web.resource.org/cc/> .
+@prefix thisplug: <http://www.vamp-plugins.org/examples/percussiononsets#>.
+@prefix :       <> .
+
+<>  a   vamp:PluginDescription ;
+    foaf:maker          <http://chrissutton.org/me> ;
+    foaf:primaryTopic   vampex:percussiononsets .
+
+vampex:percussiononsets a   vamp:Plugin ;
+    dc:title                "Simple Percussion Onset Detector" ;
+    dc:description          "Detect percussive note onsets by identifying broadband energy rises";
+    foaf:maker              <http://www.all-day-breakfast.com/cannam> ; #we'll pretend this is his URI
+    cc:license              <http://creativecommons.org/licenses/BSD/> ;
+    vamp:identifier         "percussiononsets" ; # The Vamp identifier for the plugin
+    vamp:vamp_API_version   vamp:version_v1.1b ; # Made up - this plugin doesn't actually specify it
+    owl:versionInfo         "2" ;
+    vamp:input_domain       vamp:TimeDomain ; # Made up - this plugin doesn't actually specify it
+
+    vamp:parameter_descriptor   thisplug:pd1 ;
+    vamp:parameter_descriptor   thisplug:pd2 ;
+    vamp:output_descriptor      thisplug:od1 ;
+    vamp:output_descriptor      thisplug:od2 .
+
+
+thisplug:pd1    a       vamp:ParameterDescriptor ;
+    vamp:identifier     "threshold" ;
+    dc:title            "Energy Rise threshold" ;
+    dc:description      "Energy rise within a frequency bin necessary to count toward broadband total" ;
+    dc:format           "dB" ;
+    vamp:minValue       0 ; #might be useful when interpreting plugin output
+    vamp:maxValue       20 ;
+    vamp:defaultValue   3 .
+
+
+thisplug:pd2    a       vamp:ParameterDescriptor ;
+    vamp:identifier     "sensitivity" ;
+    dc:title            "Sensitivity" ;
+    dc:description      "Sensitivity of peak detector applied to broadband detection function" ;
+    dc:format           "%" ;
+    vamp:minValue       0 ; #might be useful when interpreting plugin output
+    vamp:maxValue       100 ;
+    vamp:defaultValue   40 .
+    
+thisplug:od1    a       vamp:OutputDescriptor ;
+    vamp:identifier     "onsets" ;
+    dc:title            "Onsets" ;
+    dc:description      "Percussive note onset locations" ;
+    dc:format           "" ;
+    vamp:fixed_bin_count "true" ;
+    vamp:bin_count      0 ;
+    vamp:sample_type    vamp:VariableSampleRate ;
+    vamp:computes_event_type    af:Onset . # af:Onset is pending some thought
+
+thisplug:od2    a       vamp:OutputDescriptor ;
+    vamp:identifier     "detectionfunction" ;
+    dc:title            "Detection Function" ;
+    dc:description      "Broadband energy rise detection function";
+    dc:format           "" ;
+    vamp:fixed_bin_count "true" ;
+    vamp:bin_count      1 ;
+    vamp:sample_type    vamp:OneSamplePerStep ;
+    vamp:computes_feature_type  af:OnsetDetectionFunction .


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1013
          http://sv1.svn.sourceforge.net/sv1/?rev=1013&view=rev
Author:   cannam
Date:     2008-03-14 10:24:42 -0700 (Fri, 14 Mar 2008)

Log Message:
-----------

...

Modified Paths:
--------------
    sonic-visualiser/trunk/base/ProgressPrinter.cpp
    sonic-visualiser/trunk/base/ProgressPrinter.h
    sonic-visualiser/trunk/widgets/ProgressDialog.cpp

Modified: sonic-visualiser/trunk/base/ProgressPrinter.cpp
===================================================================
--- sonic-visualiser/trunk/base/ProgressPrinter.cpp	2008-03-14 17:16:56 UTC (rev 1012)
+++ sonic-visualiser/trunk/base/ProgressPrinter.cpp	2008-03-14 17:24:42 UTC (rev 1013)
@@ -33,6 +33,12 @@
 }
 
 void
+ProgressPrinter::setMessage(QString message)
+{
+    m_prefix = message;
+}
+
+void
 ProgressPrinter::setProgress(int progress)
 {
     if (progress == m_lastProgress) return;

Modified: sonic-visualiser/trunk/base/ProgressPrinter.h
===================================================================
--- sonic-visualiser/trunk/base/ProgressPrinter.h	2008-03-14 17:16:56 UTC (rev 1012)
+++ sonic-visualiser/trunk/base/ProgressPrinter.h	2008-03-14 17:24:42 UTC (rev 1013)
@@ -27,6 +27,7 @@
     virtual ~ProgressPrinter();
     
 public slots:
+    virtual void setMessage(QString);
     virtual void setProgress(int);
 
 protected:

Modified: sonic-visualiser/trunk/widgets/ProgressDialog.cpp
===================================================================
--- sonic-visualiser/trunk/widgets/ProgressDialog.cpp	2008-03-14 17:16:56 UTC (rev 1012)
+++ sonic-visualiser/trunk/widgets/ProgressDialog.cpp	2008-03-14 17:24:42 UTC (rev 1013)
@@ -59,8 +59,6 @@
 ProgressDialog::showTimerElapsed()
 {
     m_timerElapsed = true;
-    delete m_showTimer;
-    m_showTimer = 0;
     if (m_dialog->value() > 0) {
         m_dialog->show();
     }
@@ -75,8 +73,6 @@
         m_dialog->setValue(percentage);
 
         if (percentage >= 100) {
-            delete m_showTimer;
-            m_showTimer = 0;
             m_dialog->hide();
         } else if (m_timerElapsed && !m_dialog->isVisible()) {
             m_dialog->show();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1023
          http://sv1.svn.sourceforge.net/sv1/?rev=1023&view=rev
Author:   cannam
Date:     2008-03-19 13:23:26 -0700 (Wed, 19 Mar 2008)

Log Message:
-----------

...

Modified Paths:
--------------
    sonic-visualiser/trunk/base/ViewManagerBase.h
    sonic-visualiser/trunk/base/base.pro
    sonic-visualiser/trunk/transform/Transform.cpp

Modified: sonic-visualiser/trunk/base/ViewManagerBase.h
===================================================================
--- sonic-visualiser/trunk/base/ViewManagerBase.h	2008-03-19 17:19:35 UTC (rev 1022)
+++ sonic-visualiser/trunk/base/ViewManagerBase.h	2008-03-19 20:23:26 UTC (rev 1023)
@@ -33,6 +33,8 @@
     Q_OBJECT
 
 public:
+    virtual ~ViewManagerBase();
+
     virtual void setAudioPlaySource(AudioPlaySource *source) = 0;
 
     virtual size_t alignPlaybackFrameToReference(size_t) const = 0;

Modified: sonic-visualiser/trunk/base/base.pro
===================================================================
--- sonic-visualiser/trunk/base/base.pro	2008-03-19 17:19:35 UTC (rev 1022)
+++ sonic-visualiser/trunk/base/base.pro	2008-03-19 20:23:26 UTC (rev 1023)
@@ -69,4 +69,5 @@
            TempDirectory.cpp \
            Thread.cpp \
            UnitDatabase.cpp \
+           ViewManagerBase.cpp \
            XmlExportable.cpp

Modified: sonic-visualiser/trunk/transform/Transform.cpp
===================================================================
--- sonic-visualiser/trunk/transform/Transform.cpp	2008-03-19 17:19:35 UTC (rev 1022)
+++ sonic-visualiser/trunk/transform/Transform.cpp	2008-03-19 20:23:26 UTC (rev 1023)
@@ -340,7 +340,7 @@
     bool haveContent = true;
     if (m_parameters.empty() && m_configuration.empty()) haveContent = false;
 
-    out << QString("<transform id=\"%1\" pluginVersion=\"%2\" program=\"%3\" stepSize=\"%4\" blockSize=\"%5\" windowType=\"%6\" startTime=\"%7\" duration=\"%8\" sampleRate=\"%9\"")
+    out << QString("<transform\n    id=\"%1\"\n    pluginVersion=\"%2\"\n    program=\"%3\"\n    stepSize=\"%4\"\n    blockSize=\"%5\"\n    windowType=\"%6\"\n    startTime=\"%7\"\n    duration=\"%8\"\n    sampleRate=\"%9\"")
         .arg(encodeEntities(m_id))
         .arg(encodeEntities(m_pluginVersion))
         .arg(encodeEntities(m_program))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1029
          http://sv1.svn.sourceforge.net/sv1/?rev=1029&view=rev
Author:   cannam
Date:     2008-03-26 07:35:03 -0700 (Wed, 26 Mar 2008)

Log Message:
-----------

* Fix hang when using more than one consecutive coded audio file reader in
  decode-at-once mode

Modified Paths:
--------------
    sonic-visualiser/trunk/base/Serialiser.cpp
    sonic-visualiser/trunk/data/fileio/CodedAudioFileReader.cpp
    sonic-visualiser/trunk/data/fileio/FileSource.cpp
    sonic-visualiser/trunk/data/fileio/MP3FileReader.cpp
    sonic-visualiser/trunk/data/fileio/OggVorbisFileReader.cpp
    sonic-visualiser/trunk/data/fileio/QuickTimeFileReader.cpp
    sonic-visualiser/trunk/data/fileio/ResamplingWavFileReader.cpp

Modified: sonic-visualiser/trunk/base/Serialiser.cpp
===================================================================
--- sonic-visualiser/trunk/base/Serialiser.cpp	2008-03-26 11:18:17 UTC (rev 1028)
+++ sonic-visualiser/trunk/base/Serialiser.cpp	2008-03-26 14:35:03 UTC (rev 1029)
@@ -31,12 +31,17 @@
     }
 
     m_mutexMap[m_id]->lock();
+
     m_mapMutex.unlock();
 }
 
 Serialiser::~Serialiser()
 {
+    m_mapMutex.lock();
+    
     m_mutexMap[m_id]->unlock();
+
+    m_mapMutex.unlock();
 }
 
 

Modified: sonic-visualiser/trunk/data/fileio/CodedAudioFileReader.cpp
===================================================================
--- sonic-visualiser/trunk/data/fileio/CodedAudioFileReader.cpp	2008-03-26 11:18:17 UTC (rev 1028)
+++ sonic-visualiser/trunk/data/fileio/CodedAudioFileReader.cpp	2008-03-26 14:35:03 UTC (rev 1029)
@@ -79,7 +79,7 @@
 void
 CodedAudioFileReader::endSerialised()
 {
-//    std::cerr << "CodedAudioFileReader::endSerialised" << std::endl;
+    std::cerr << "CodedAudioFileReader::endSerialised" << std::endl;
 
     delete m_serialiser;
     m_serialiser = 0;
@@ -107,7 +107,7 @@
                                     m_cacheWriteBufferSize);
         float ratio = float(m_sampleRate) / float(m_fileRate);
         m_resampleBuffer = new float
-            [lrintf(ceilf(m_cacheWriteBufferSize * m_channelCount * ratio))];
+            [lrintf(ceilf(m_cacheWriteBufferSize * m_channelCount * ratio + 1))];
     }
 
     m_cacheWriteBuffer = new float[m_cacheWriteBufferSize * m_channelCount];

Modified: sonic-visualiser/trunk/data/fileio/FileSource.cpp
===================================================================
--- sonic-visualiser/trunk/data/fileio/FileSource.cpp	2008-03-26 11:18:17 UTC (rev 1028)
+++ sonic-visualiser/trunk/data/fileio/FileSource.cpp	2008-03-26 14:35:03 UTC (rev 1029)
@@ -28,7 +28,7 @@
 
 #include <iostream>
 
-#define DEBUG_FILE_SOURCE 1
+//#define DEBUG_FILE_SOURCE 1
 
 int
 FileSource::m_count = 0;

Modified: sonic-visualiser/trunk/data/fileio/MP3FileReader.cpp
===================================================================
--- sonic-visualiser/trunk/data/fileio/MP3FileReader.cpp	2008-03-26 11:18:17 UTC (rev 1028)
+++ sonic-visualiser/trunk/data/fileio/MP3FileReader.cpp	2008-03-26 14:35:03 UTC (rev 1029)
@@ -121,6 +121,7 @@
         m_filebuffer = 0;
 
         if (isDecodeCacheInitialised()) finishDecodeCache();
+        endSerialised();
 
     } else {
 

Modified: sonic-visualiser/trunk/data/fileio/OggVorbisFileReader.cpp
===================================================================
--- sonic-visualiser/trunk/data/fileio/OggVorbisFileReader.cpp	2008-03-26 11:18:17 UTC (rev 1028)
+++ sonic-visualiser/trunk/data/fileio/OggVorbisFileReader.cpp	2008-03-26 14:35:03 UTC (rev 1029)
@@ -85,6 +85,7 @@
         m_oggz = 0;
 
         if (isDecodeCacheInitialised()) finishDecodeCache();
+        endSerialised();
 
     } else {
 

Modified: sonic-visualiser/trunk/data/fileio/QuickTimeFileReader.cpp
===================================================================
--- sonic-visualiser/trunk/data/fileio/QuickTimeFileReader.cpp	2008-03-26 11:18:17 UTC (rev 1028)
+++ sonic-visualiser/trunk/data/fileio/QuickTimeFileReader.cpp	2008-03-26 14:35:03 UTC (rev 1029)
@@ -246,6 +246,7 @@
         }
         
         finishDecodeCache();
+        endSerialised();
 
         m_d->err = MovieAudioExtractionEnd(m_d->extractionSessionRef);
         if (m_d->err) {

Modified: sonic-visualiser/trunk/data/fileio/ResamplingWavFileReader.cpp
===================================================================
--- sonic-visualiser/trunk/data/fileio/ResamplingWavFileReader.cpp	2008-03-26 11:18:17 UTC (rev 1028)
+++ sonic-visualiser/trunk/data/fileio/ResamplingWavFileReader.cpp	2008-03-26 14:35:03 UTC (rev 1029)
@@ -80,6 +80,7 @@
         }
 
         if (isDecodeCacheInitialised()) finishDecodeCache();
+        endSerialised();
 
         delete m_original;
         m_original = 0;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1026
          http://sv1.svn.sourceforge.net/sv1/?rev=1026&view=rev
Author:   cannam
Date:     2008-03-20 09:59:13 -0700 (Thu, 20 Mar 2008)

Log Message:
-----------

* And actually add the extractors and run extractFeatures.  Plenty to do still
  here though.

Modified Paths:
--------------
    runner/trunk/main.cpp

Modified: runner/trunk/main.cpp
===================================================================
--- runner/trunk/main.cpp	2008-03-20 15:59:00 UTC (rev 1025)
+++ runner/trunk/main.cpp	2008-03-20 16:59:13 UTC (rev 1026)
@@ -478,58 +478,16 @@
         }
     }
     
+    for (set<string>::const_iterator i = requestedTransformFiles.begin();
+         i != requestedTransformFiles.end(); ++i) {
+        manager.addFeatureExtractor(*i, writers);
+    }
 
-    //!!!
-    exit (-1);
-    
-    // we may want to work from saved transforms here if we
-    // already know what features we want
-    // - this is the audioDB scenario
-    if (argc>3)
-        manager.addFeatureExtractor(argv[3], writers);
-    else
-    {
-        manager.addFeatureExtractor("transforms/percussiononsets.xml", writers);
-        manager.addFeatureExtractor("transforms/chromagram.xml", writers);
-        manager.addFeatureExtractor("transforms/spectralcentroid.xml", writers);
+    for (QStringList::const_iterator i = otherArgs.begin();
+         i != otherArgs.end(); ++i) {
+        manager.extractFeatures(i->toStdString());
     }
     
-    // note that the default writer dumps everything to cerr
-    // but real writers can write to feature-specific and/or track-specific files    
-    
-    /*
-    manager.addFeatureExtractor("vamp-example-plugins", "percussiononsets", writers);
-    manager.addFeatureExtractor("qm-vamp-plugins", "qm-chromagram", writers);
-    manager.addFeatureExtractor("vamp-example-plugins", "spectralcentroid", writers);
-    //manager.addFeatureExtractor("vamp-example-plugins", "amplitudefollower", writers);
-    //manager.addFeatureExtractor("vamp-example-plugins", "spectralcentroid", writers);
-     */
-    
-    // here we could easily iterate over a generic TrackCollection
-    // - this gives flexibility e.g. to gather tracks from iTunes using existing SB code
-    // - it should not be hard to extend this so that you can import a playlist for extraction
-    // this makes a simple practical tool with no need to build a new user interface
-    
-    // manager.setTrackCollection(new ITunesPlaylistTrackCollection("jazz playlist"));
-    // manager.extractFeaturesForCollection() {
-    //    while (collection.hasMoreTrackUris()) {
-    //        string trackUri = collection.nextTrackUri();
-    //        extractFeaturesFromStream(trackUri);
-    //    }
-    //    while (collection.hasMoreTrackFilepaths()) {
-    //        string filepath = collection.nextTrackFilepath();
-    //        extractFeaturesFromFile(filepath);
-    //    }
-    // }
-    
-    //string trackUri = "./test.mp3";
-//    string trackUri = "/home/studio/sunset_overseas.mp3";
-    string trackUri = "http://dsp-cluster/music/yvesr/2%20MANY%20DJs/Soulwax%20Radio%20Session%20Part%201%20CD%202/00.%20As%20Heard%20On%20Radio%20Soulwax%20pt.%203.mp3";        
-    //string trackUri = "/users/mark/documents/tags/audio/999.mp3";
-    if (argc > 2)
-        trackUri = argv[2];
-    manager.extractFeatures(trackUri);
-    
     return 0;
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.