comparison plugin/DSSIPluginInstance.cpp @ 66:7afcfe666910

* 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).

 #ifdef DEBUG_DSSI_PROCESS
     std::cerr << "DSSIPluginInstance::getLatency(): m_latencyPort " << m_latencyPort << ", m_run " << m_run << std::endl;
 #endif
 
     if (m_latencyPort) {
-	if (!m_run) run(RealTime::zeroTime);
+	if (!m_run) run(Vamp::RealTime::zeroTime);
 	latency = (size_t)(*m_latencyPort + 0.1);
     }
     
 #ifdef DEBUG_DSSI_PROCESS
     std::cerr << "DSSIPluginInstance::getLatency(): latency is " << latency << std::endl;

 
     return qm;
 }
 
 void
-DSSIPluginInstance::sendEvent(const RealTime &eventTime,
+DSSIPluginInstance::sendEvent(const Vamp::RealTime &eventTime,
 			      const void *e)
 {
 #ifdef DEBUG_DSSI_PROCESS
     std::cerr << "DSSIPluginInstance::sendEvent: last was " << m_lastEventSendTime << " (valid " << m_haveLastEventSendTime << "), this is " << eventTime << std::endl;
 #endif

 
     return false;
 }
 
 void
-DSSIPluginInstance::run(const RealTime &blockTime)
+DSSIPluginInstance::run(const Vamp::RealTime &blockTime)
 {
     static snd_seq_event_t localEventBuffer[EVENT_BUFFER_SIZE];
     int evCount = 0;
 
     bool needLock = false;

 
 	snd_seq_event_t *ev = localEventBuffer + evCount;
 	*ev = m_eventBuffer.peekOne();
 	bool accept = true;
 
-	RealTime evTime(ev->time.time.tv_sec, ev->time.time.tv_nsec);
+	Vamp::RealTime evTime(ev->time.time.tv_sec, ev->time.time.tv_nsec);
 
 	int frameOffset = 0;
 	if (evTime > blockTime) {
-	    frameOffset = RealTime::realTime2Frame(evTime - blockTime, m_sampleRate);
+	    frameOffset = Vamp::RealTime::realTime2Frame(evTime - blockTime, m_sampleRate);
 	}
 
 #ifdef DEBUG_DSSI_PROCESS
 	std::cerr << "DSSIPluginInstance::run: evTime " << evTime << ", blockTime " << blockTime << ", frameOffset " << frameOffset
 		  << ", blockSize " << m_blockSize << std::endl;

     m_lastRunTime = blockTime;
     m_run = true;
 }
 
 void
-DSSIPluginInstance::runGrouped(const RealTime &blockTime)
+DSSIPluginInstance::runGrouped(const Vamp::RealTime &blockTime)
 {
     // If something else in our group has just been called for this
     // block time (but we haven't) then we should just write out the
     // results and return; if we have just been called for this block
     // time or nothing else in the group has been, we should run the

 
 	    snd_seq_event_t *ev = m_groupLocalEventBuffers[index] + counts[index];
 	    *ev = instance->m_eventBuffer.peekOne();
 	    bool accept = true;
 
-	    RealTime evTime(ev->time.time.tv_sec, ev->time.time.tv_nsec);
+	    Vamp::RealTime evTime(ev->time.time.tv_sec, ev->time.time.tv_nsec);
 
 	    int frameOffset = 0;
 	    if (evTime > blockTime) {
-		frameOffset = RealTime::realTime2Frame(evTime - blockTime, m_sampleRate);
+		frameOffset = Vamp::RealTime::realTime2Frame(evTime - blockTime, m_sampleRate);
 	    }
 
 #ifdef DEBUG_DSSI_PROCESS
 	    std::cerr << "DSSIPluginInstance::runGrouped: evTime " << evTime << ", frameOffset " << frameOffset
 		      << ", block size " << m_blockSize << std::endl;