* move setParameter into the process fd as well (so as to keep param

changes in sync with process)
GomesMarcos · Dec 3, 2004 · 06ebb5b · 06ebb5b
1 parent f734c4e
commit 06ebb5b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 20 deletions.
diff --git a/dssi-vst.cpp b/dssi-vst.cpp
@@ -332,8 +332,8 @@ DSSIVSTPluginInstance::run(unsigned long sampleCount)
 		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;
+//		    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;

diff --git a/remoteplugin.h b/remoteplugin.h
@@ -8,7 +8,7 @@
 #ifndef REMOTE_PLUGIN_H
 #define REMOTE_PLUGIN_H
 
-static const float RemotePluginVersion = 0.98;
+static const float RemotePluginVersion = 0.985;
 
 enum RemotePluginDebugLevel {
     RemotePluginDebugNone,

diff --git a/remotepluginclient.cpp b/remotepluginclient.cpp
@@ -331,9 +331,9 @@ RemotePluginClient::getParameterName(int p)
 void
 RemotePluginClient::setParameter(int p, float v)
 {
-    writeOpcode(m_controlRequestFd, RemotePluginSetParameter);
-    writeInt(m_controlRequestFd, p);
-    writeFloat(m_controlRequestFd, v);
+    writeOpcode(m_processFd, RemotePluginSetParameter);
+    writeInt(m_processFd, p);
+    writeFloat(m_processFd, v);
 }
 
 float

diff --git a/remotepluginserver.cpp b/remotepluginserver.cpp
@@ -280,6 +280,13 @@ RemotePluginServer::dispatchProcessEvents()
 //	std::cerr << "server process: written" << std::endl;
 	break;
     }
+
+    case RemotePluginSetParameter:
+    {
+	int pn(readInt(m_processFd));
+	setParameter(pn, readFloat(m_processFd));
+	break;
+    }
 
     case RemotePluginSetCurrentProgram:
 	setCurrentProgram(readInt(m_processFd));
@@ -330,13 +337,6 @@ RemotePluginServer::dispatchControlEvents()
 
     switch (opcode) {
 
-    case RemotePluginProcess:
-    case RemotePluginSetCurrentProgram:
-    case RemotePluginSendMIDIData:
-	std::cerr << "WARNING: RemotePluginServer: got opcode " << opcode
-		  << " from control fd, should be a process fd opcode" << std::endl;
-	break;
-
     case RemotePluginGetVersion:
 	writeFloat(m_controlResponseFd, getVersion());
 	break;
@@ -370,13 +370,6 @@ RemotePluginServer::dispatchControlEvents()
     case RemotePluginGetParameterName:
 	writeString(m_controlResponseFd, getParameterName(readInt(m_controlRequestFd)));
 	break;
-
-    case RemotePluginSetParameter:
-    {
-	int pn(readInt(m_controlRequestFd));
-	setParameter(pn, readFloat(m_controlRequestFd));
-	break;
-    }
 
     case RemotePluginGetParameter:
 	writeFloat(m_controlResponseFd, getParameter(readInt(m_controlRequestFd)));