From db8485efb97c2d962decaeaf30bfc0de5ff90d70 Mon Sep 17 00:00:00 2001
From: Chris Cannam <cannam@all-day-breakfast.com>
Date: Fri, 3 Dec 2004 15:58:25 +0000
Subject: [PATCH] * Be a bit more circumspect about runSynth when not m_ok

---
 dssi-vst-server.cpp |  1 +
 dssi-vst.cpp        | 52 +++++++++++++++++++++++++--------------------
 2 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/dssi-vst-server.cpp b/dssi-vst-server.cpp
index 3df7a16..332eb1c 100644
--- a/dssi-vst-server.cpp
+++ b/dssi-vst-server.cpp
@@ -1053,6 +1053,7 @@ AudioThreadMain(LPVOID parameter)
     struct sched_param param;
     param.sched_priority = 1;
     HANDLE watchdogThreadHandle;
+
     int result = sched_setscheduler(0, SCHED_FIFO, &param);
 
     if (result < 0) {
diff --git a/dssi-vst.cpp b/dssi-vst.cpp
index bb46767..4fb82c2 100644
--- a/dssi-vst.cpp
+++ b/dssi-vst.cpp
@@ -182,6 +182,8 @@ DSSIVSTPluginInstance::DSSIVSTPluginInstance(std::string dllName,
 	    snd_midi_event_no_status(m_alsaDecoder, 1);
 	}
 
+	std::cerr << "DSSIVSTPluginInstance(" << this << "): setting OK true" << std::endl;
+
 	m_ok = true;
 
     } catch (RemotePluginClosedException) {
@@ -195,6 +197,8 @@ DSSIVSTPluginInstance::DSSIVSTPluginInstance(std::string dllName,
 	delete m_audioIns; m_audioIns = 0;
 	delete m_audioOuts; m_audioOuts = 0;
     }
+
+    std::cerr << "DSSIVSTPluginInstance::DSSIVSTPluginInstance(" << dllName << ") construction complete" << std::endl;
 }
 
 DSSIVSTPluginInstance::~DSSIVSTPluginInstance()
@@ -317,34 +321,34 @@ DSSIVSTPluginInstance::selectProgram(unsigned long bank, unsigned long program)
 void
 DSSIVSTPluginInstance::run(unsigned long sampleCount)
 {
-    if (m_ok) {
-	try {
-	    if (sampleCount != m_lastSampleCount) {
-		m_plugin->setBufferSize(sampleCount);
-		m_lastSampleCount = sampleCount;
-		if (m_latencyOut) *m_latencyOut = sampleCount;
-	    }
-
-	    int modifiedCount = 0;
-
-	    for (unsigned long i = 0; i < m_controlPortCount; ++i) {
-
-		if (!m_controlPorts[i]) continue;
+    if (!m_ok) return;
 
-		if (m_controlPortsSaved[i] != *m_controlPorts[i]) {
+    try {
+	if (sampleCount != m_lastSampleCount) {
+	    m_plugin->setBufferSize(sampleCount);
+	    m_lastSampleCount = sampleCount;
+	    if (m_latencyOut) *m_latencyOut = sampleCount;
+	}
+	
+	int modifiedCount = 0;
+	
+	for (unsigned long i = 0; i < m_controlPortCount; ++i) {
+	    
+	    if (!m_controlPorts[i]) continue;
+	    
+	    if (m_controlPortsSaved[i] != *m_controlPorts[i]) {
 //		    std::cout << "Sending new value " << *m_controlPorts[i]
 //			      << " for control port " << i << std::endl;
-		    m_plugin->setParameter(i, *m_controlPorts[i]);
-		    m_controlPortsSaved[i] =  *m_controlPorts[i];
-		    if (++modifiedCount > 10) break;
-		}
+		m_plugin->setParameter(i, *m_controlPorts[i]);
+		m_controlPortsSaved[i] =  *m_controlPorts[i];
+		if (++modifiedCount > 10) break;
 	    }
-    
-	    m_plugin->process(m_audioIns, m_audioOuts);
-
-	} catch (RemotePluginClosedException) {
-	    m_ok = false;
 	}
+	
+	m_plugin->process(m_audioIns, m_audioOuts);
+	
+    } catch (RemotePluginClosedException) {
+	m_ok = false;
     }
 }
 
@@ -352,6 +356,8 @@ void
 DSSIVSTPluginInstance::runSynth(unsigned long sampleCount,
 				snd_seq_event_t *events, unsigned long eventCount)
 {
+    if (!m_ok) return;
+
     try {
 	if (m_alsaDecoder) {