comparison audioio/AudioGenerator.cpp @ 26:cc48a7189152

* Modify to use Vamp SDK for proper feature extraction plugins.
  Requires that the vamp-plugin-sdk directory tree be present below
  plugin/ (it's separate in Subversion).

 #include "model/SparseOneDimensionalModel.h"
 
 #include "plugin/RealTimePluginFactory.h"
 #include "plugin/RealTimePluginInstance.h"
 #include "plugin/PluginIdentifier.h"
+#include "plugin/PluginXml.h"
 #include "plugin/api/alsa/seq_event.h"
 
 #include <iostream>
 #include <math.h>
 

 {
     if (m_synthMap.find(model) == m_synthMap.end()) return;
 
     RealTimePluginInstance *plugin = m_synthMap[model];
     if (plugin) {
-        plugin->setParametersFromXml(configurationXml);
+        PluginXml(plugin).setParametersFromXml(configurationXml);
     }
 }
 
 QString
 AudioGenerator::getDefaultPlayPluginId(const Model *model)

 
     if (pluginId == "") return 0;
 
     RealTimePluginInstance *plugin = loadPlugin(pluginId, "");
     if (configurationXml != "") {
-        plugin->setParametersFromXml(configurationXml);
+        PluginXml(plugin).setParametersFromXml(configurationXml);
     }
 
     if (parameters) {
         parameters->setPlayPluginId(pluginId);
         parameters->setPlayPluginConfiguration(configurationXml);

 
 	SparseOneDimensionalModel::PointList points =
 	    sodm->getPoints(reqStart + latency,
 			    reqStart + latency + m_pluginBlockSize);
 
-	RealTime blockTime = RealTime::frame2RealTime
+        Vamp::RealTime blockTime = Vamp::RealTime::frame2RealTime
 	    (startFrame + i * m_pluginBlockSize, m_sourceSampleRate);
 
 	for (SparseOneDimensionalModel::PointList::iterator pli =
 		 points.begin(); pli != points.end(); ++pli) {
 

 		pliFrame >= reqStart + m_pluginBlockSize) continue;
 
 	    while (noteOffs.begin() != noteOffs.end() &&
 		   noteOffs.begin()->frame <= pliFrame) {
 
-		RealTime eventTime = RealTime::frame2RealTime
+                Vamp::RealTime eventTime = Vamp::RealTime::frame2RealTime
 		    (noteOffs.begin()->frame, m_sourceSampleRate);
 
 		offEv.data.note.note = noteOffs.begin()->pitch;
 
 #ifdef DEBUG_AUDIO_GENERATOR

 
 		plugin->sendEvent(eventTime, &offEv);
 		noteOffs.erase(noteOffs.begin());
 	    }
 
-	    RealTime eventTime = RealTime::frame2RealTime
+            Vamp::RealTime eventTime = Vamp::RealTime::frame2RealTime
 		(pliFrame, m_sourceSampleRate);
 	    
 	    plugin->sendEvent(eventTime, &onEv);
 
 #ifdef DEBUG_AUDIO_GENERATOR

 
 	while (noteOffs.begin() != noteOffs.end() &&
 	       noteOffs.begin()->frame <=
 	       startFrame + i * m_pluginBlockSize + m_pluginBlockSize) {
 
-	    RealTime eventTime = RealTime::frame2RealTime
+            Vamp::RealTime eventTime = Vamp::RealTime::frame2RealTime
 		(noteOffs.begin()->frame, m_sourceSampleRate);
 
 	    offEv.data.note.note = noteOffs.begin()->pitch;
 
 #ifdef DEBUG_AUDIO_GENERATOR

 
 	NoteModel::PointList points =
 	    nm->getPoints(reqStart + latency,
 			    reqStart + latency + m_pluginBlockSize);
 
-	RealTime blockTime = RealTime::frame2RealTime
+        Vamp::RealTime blockTime = Vamp::RealTime::frame2RealTime
 	    (startFrame + i * m_pluginBlockSize, m_sourceSampleRate);
 
 	for (NoteModel::PointList::iterator pli =
 		 points.begin(); pli != points.end(); ++pli) {
 

 		pliFrame >= reqStart + m_pluginBlockSize) continue;
 
 	    while (noteOffs.begin() != noteOffs.end() &&
 		   noteOffs.begin()->frame <= pliFrame) {
 
-		RealTime eventTime = RealTime::frame2RealTime
+                Vamp::RealTime eventTime = Vamp::RealTime::frame2RealTime
 		    (noteOffs.begin()->frame, m_sourceSampleRate);
 
 		offEv.data.note.note = noteOffs.begin()->pitch;
 
 #ifdef DEBUG_AUDIO_GENERATOR

 
 		plugin->sendEvent(eventTime, &offEv);
 		noteOffs.erase(noteOffs.begin());
 	    }
 
-	    RealTime eventTime = RealTime::frame2RealTime
+            Vamp::RealTime eventTime = Vamp::RealTime::frame2RealTime
 		(pliFrame, m_sourceSampleRate);
 	    
 	    onEv.data.note.note = lrintf(pli->value);
 
 	    plugin->sendEvent(eventTime, &onEv);

 
 	while (noteOffs.begin() != noteOffs.end() &&
 	       noteOffs.begin()->frame <=
 	       startFrame + i * m_pluginBlockSize + m_pluginBlockSize) {
 
-	    RealTime eventTime = RealTime::frame2RealTime
+            Vamp::RealTime eventTime = Vamp::RealTime::frame2RealTime
 		(noteOffs.begin()->frame, m_sourceSampleRate);
 
 	    offEv.data.note.note = noteOffs.begin()->pitch;
 
 #ifdef DEBUG_AUDIO_GENERATOR