[Sv1-commits] SF.net SVN: sv1: [1016] rdf_descriptions/trunk

[<ca...@us...>]

Revision: 1016
          http://sv1.svn.sourceforge.net/sv1/?rev=1016&view=rev
Author:   cannam
Date:     2008-03-17 05:30:23 -0700 (Mon, 17 Mar 2008)

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

* Remove Qt dependencies; remove qmake project file and add plain Makefile

Modified Paths:
--------------
    rdf_descriptions/trunk/template_generator.cpp

Added Paths:
-----------
    rdf_descriptions/trunk/Makefile.linux

Removed Paths:
-------------
    rdf_descriptions/trunk/template_generator.pro

Added: rdf_descriptions/trunk/Makefile.linux
===================================================================
--- rdf_descriptions/trunk/Makefile.linux	                        (rev 0)
+++ rdf_descriptions/trunk/Makefile.linux	2008-03-17 12:30:23 UTC (rev 1016)
@@ -0,0 +1,9 @@
+
+CXXFLAGS	:= -I../vamp-plugin-sdk -O2 -Wall
+
+template_generator:	template_generator.o
+	g++ $^ -o $@ -L../vamp-plugin-sdk/vamp-sdk -Wl,-Bstatic -lvamp-hostsdk -Wl,-Bdynamic -ldl
+
+clean:	
+	rm *.o
+

Modified: rdf_descriptions/trunk/template_generator.cpp
===================================================================
--- rdf_descriptions/trunk/template_generator.cpp	2008-03-17 10:12:35 UTC (rev 1015)
+++ rdf_descriptions/trunk/template_generator.cpp	2008-03-17 12:30:23 UTC (rev 1016)
@@ -13,17 +13,6 @@
 
 #include <cmath>
 
-#include <QCoreApplication>
-#include <QStringList>
-#include <QString>
-#include <QTime>
-
-#include "data/fileio/FileSource.h"
-#include "data/fileio/AudioFileReader.h"
-#include "data/fileio/AudioFileReaderFactory.h"
-
-#include "base/TempDirectory.h"
-
 using std::cout;
 using std::cin;
 using std::cerr;
@@ -44,8 +33,9 @@
    template-generator vamp:aubioonset:onsets
 
 */
-	string programURI = "http://www.vamp-plugins.org/doap.rdf#template-generator";
 
+string programURI = "http://www.vamp-plugins.org/doap.rdf#template-generator";
+
 void usage()
 {
     cerr << "usage: template-generator [PLUGIN_BASE_URI YOUR_URI] vamp:soname:plugin[:output]" << endl;
@@ -55,9 +45,9 @@
 template <class T>
 inline string to_string (const T& t)
 {
-	std::stringstream ss;
-	ss << t;
-	return ss.str();
+    std::stringstream ss;
+    ss << t;
+    return ss.str();
 }
 
 string describe_namespaces(Plugin* plugin, string pluginBundleBaseURI)
@@ -201,53 +191,40 @@
 
 int main(int argc, char **argv)
 {
-    QCoreApplication application(argc, argv);
+    if (argc != 2 && argc != 4) usage();
 
-    QTime time;
-    time.start();
+    std::string pluginName = argv[argc-1];
 
-    QStringList args = application.arguments();
-
-    QCoreApplication::setOrganizationName("sonic-visualiser");
-    QCoreApplication::setOrganizationDomain("sonicvisualiser.org");
-    QCoreApplication::setApplicationName("template-generator");
-
-    if (args.size() != 2 && args.size() != 4) usage();
-
-    QString pluginName = args.last();
-
-    if (pluginName.startsWith("vamp:")) {
-        pluginName = pluginName.right(pluginName.length()-5);
+    if (pluginName.substr(0, 5) == "vamp:") {
+        pluginName = pluginName.substr(5);
     }
 
     Vamp::Plugin *plugin = PluginLoader::getInstance()->loadPlugin
-        (pluginName.toStdString(), size_t(44100), PluginLoader::ADAPT_ALL_SAFE);
+        (pluginName, size_t(44100), PluginLoader::ADAPT_ALL_SAFE);
 
     if (!plugin) {
-        cerr << "ERROR: Plugin \"" << pluginName.toStdString() << "\" could not be loaded" << endl;
+        cerr << "ERROR: Plugin \"" << pluginName << "\" could not be loaded" << endl;
         exit(1);
     }
 
-
-	string pluginBundleBaseURI, describerURI;
+    string pluginBundleBaseURI, describerURI;
 	
-	if (args.size() == 4)
-	{
-		pluginBundleBaseURI = args[1].toStdString();
-		describerURI = args[2].toStdString();
-	}
-	else
-	{
-		cerr << "Please enter the base URI for the plugin bundle : ";
-		getline(cin, pluginBundleBaseURI);
-		cerr << "Please enter your URI : ";
-		getline(cin, describerURI);
-	}
+    if (argc == 4)
+    {
+        pluginBundleBaseURI = argv[1];
+        describerURI = argv[2];
+    }
+    else
+    {
+        cerr << "Please enter the base URI for the plugin bundle : ";
+        getline(cin, pluginBundleBaseURI);
+        cerr << "Please enter your URI : ";
+        getline(cin, describerURI);
+    }
 	
-	cout << describe(plugin, pluginBundleBaseURI, describerURI) << endl;
+    cout << describe(plugin, pluginBundleBaseURI, describerURI) << endl;
 
     return 0;
-
 }
 
 

Deleted: rdf_descriptions/trunk/template_generator.pro
===================================================================
--- rdf_descriptions/trunk/template_generator.pro	2008-03-17 10:12:35 UTC (rev 1015)
+++ rdf_descriptions/trunk/template_generator.pro	2008-03-17 12:30:23 UTC (rev 1016)
@@ -1,33 +0,0 @@
-TEMPLATE = app
-
-SV_UNIT_PACKAGES = vamp vamp-hostsdk samplerate mad id3tag oggz fishsound sndfile
-load(../sonic-visualiser/sv.prf)
-
-CONFIG += sv qt thread warn_on stl rtti exceptions console
-QT += xml network
-
-TARGET = template_generator
-
-DEPENDPATH += . ../sonic-visualiser i18n main
-INCLUDEPATH += . ../sonic-visualiser main
-LIBPATH = ../sonic-visualiser/audioio ../sonic-visualiser/data ../sonic-visualiser/plugin ../sonic-visualiser/base ../sonic-visualiser/system $$LIBPATH
-
-contains(DEFINES, BUILD_STATIC):LIBS -= -ljack
-
-LIBS = -lsvaudioio -lsvdata -lsvplugin -lsvbase -lsvsystem $$LIBS
-
-PRE_TARGETDEPS += ../sonic-visualiser/audioio/libsvaudioio.a \
-                  ../sonic-visualiser/data/libsvdata.a \
-                  ../sonic-visualiser/plugin/libsvplugin.a \
-                  ../sonic-visualiser/base/libsvbase.a \
-                  ../sonic-visualiser/system/libsvsystem.a
-
-OBJECTS_DIR = tmp_obj
-MOC_DIR = tmp_moc
-
-# Input
-HEADERS += 
-SOURCES += template_generator.cpp 
-
-
-


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