comparison plugin/DSSIPluginInstance.cpp @ 10:ec6886f0e673

* Fix update and play limits for play-selection mode when not looping
* Fix playback in loop mode when no selection -- but the GUI update for
  this is still wrong on the flyback
* Various fixes and improvements to making selections, particularly during
  playback
* Draw selection under non-opaque non-scrollable layers, so as to improve
  cacheing
* Show selection limits as text when drawing selection
* Allow user to find missing audio files when loading session
* Cross-fade selections when in play-selection mode -- mostly.  We don't
  cross-fade on a processing block boundary, and unfortunately with short
  selections the selection boundary is quite likely to coincide with a block
  boundary.

     m_idealChannelCount(idealChannelCount),
     m_sampleRate(sampleRate),
     m_latencyPort(0),
     m_run(false),
     m_bypassed(false),
-    m_grouped(false)
+    m_grouped(false),
+    m_haveLastEventSendTime(false)
 {
 #ifdef DEBUG_DSSI
     std::cerr << "DSSIPluginInstance::DSSIPluginInstance(" << identifier << ")"
 	      << std::endl;
 #endif

 
 void
 DSSIPluginInstance::sendEvent(const RealTime &eventTime,
 			      const void *e)
 {
+    if (m_haveLastEventSendTime &&
+	m_lastEventSendTime > eventTime) {
+	clearEvents();
+    }
+
     snd_seq_event_t *event = (snd_seq_event_t *)e;
 #ifdef DEBUG_DSSI_PROCESS
     std::cerr << "DSSIPluginInstance::sendEvent at " << eventTime << std::endl;
 #endif
     snd_seq_event_t ev(*event);

 
     // DSSI doesn't use MIDI channels, it uses run_multiple_synths instead.
     ev.data.note.channel = 0;
 
     m_eventBuffer.write(&ev, 1);
+}
+
+void
+DSSIPluginInstance::clearEvents()
+{
+    m_haveLastEventSendTime = false;
+    m_eventBuffer.reset();
 }
 
 bool
 DSSIPluginInstance::handleController(snd_seq_event_t *ev)
 {

 	goto done;
     }
 
     if (!m_descriptor || !m_descriptor->run_synth) {
 	m_eventBuffer.skip(m_eventBuffer.getReadSpace());
+	m_haveLastEventSendTime = false;
 	if (m_descriptor->LADSPA_Plugin->run) {
 	    m_descriptor->LADSPA_Plugin->run(m_instanceHandle, m_blockSize);
 	} else {
 	    for (size_t ch = 0; ch < m_audioPortsOut.size(); ++ch) {
 		memset(m_outputBuffers[ch], 0, m_blockSize * sizeof(sample_t));

 		  << ", blockSize " << m_blockSize << std::endl;
 	std::cerr << "Type: " << int(ev->type) << ", pitch: " << int(ev->data.note.note) << ", velocity: " << int(ev->data.note.velocity) << std::endl;
 #endif
 
 	if (frameOffset >= int(m_blockSize)) break;
-	if (frameOffset < 0) frameOffset = 0;
+	if (frameOffset < 0) {
+	    frameOffset = 0;
+	    if (ev->type == SND_SEQ_EVENT_NOTEON) {
+		m_eventBuffer.skip(1);
+		continue;
+	    }
+	}
 
 	ev->time.tick = frameOffset;
 	m_eventBuffer.skip(1);
 
 	if (ev->type == SND_SEQ_EVENT_CONTROLLER) {