git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@1813 0c269be4-1314-0410-8aa9-9f06e86f4224tags/0.70
| @@ -28,7 +28,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | |||||
| #include "JackEngineControl.h" | #include "JackEngineControl.h" | ||||
| #include "JackError.h" | #include "JackError.h" | ||||
| #include "JackTime.h" | #include "JackTime.h" | ||||
| #include <iostream> | |||||
| #include <iostream> | |||||
| #include <assert.h> | |||||
| namespace Jack | namespace Jack | ||||
| { | { | ||||
| @@ -182,7 +182,7 @@ void JackWinNamedPipeClientChannel::ClientDeactivate(int refnum, int* result) | |||||
| ServerSyncCall(&req, &res, result); | ServerSyncCall(&req, &res, result); | ||||
| } | } | ||||
| void JackWinNamedPipeClientChannel::PortRegister(int refnum, const char* name, const char* type, unsigned int flags, unsigned int buffer_size, jack_port_id_t* port_index, int* result) | |||||
| void JackWinNamedPipeClientChannel::PortRegister(int refnum, const char* name, const char* type, unsigned int flags, unsigned int buffer_size, unsigned int* port_index, int* result) | |||||
| { | { | ||||
| JackPortRegisterRequest req(refnum, name, type, flags, buffer_size); | JackPortRegisterRequest req(refnum, name, type, flags, buffer_size); | ||||
| JackPortRegisterResult res; | JackPortRegisterResult res; | ||||
| @@ -310,7 +310,7 @@ bool JackWinNamedPipeClientChannel::Execute() | |||||
| goto error; | goto error; | ||||
| } | } | ||||
| res.fResult = fClient->ClientNotify(event.fRefNum, event.fName, event.fNotify, event.fSync, event.fValue); | |||||
| res.fResult = fClient->ClientNotify(event.fRefNum, event.fName, event.fNotify, event.fSync, event.fValue1, event.fValue2); | |||||
| if (event.fSync) { | if (event.fSync) { | ||||
| if (res.Write(&fNotificationListenPipe) < 0) { | if (res.Write(&fNotificationListenPipe) < 0) { | ||||
| @@ -65,7 +65,7 @@ class JackWinNamedPipeClientChannel : public JackClientChannelInterface, public | |||||
| void ClientActivate(int refnum, int* result); | void ClientActivate(int refnum, int* result); | ||||
| void ClientDeactivate(int refnum, int* result); | void ClientDeactivate(int refnum, int* result); | ||||
| void PortRegister(int refnum, const char* name, const char* type, unsigned int flags, unsigned int buffer_size, jack_port_id_t* port_index, int* result); | |||||
| void PortRegister(int refnum, const char* name, const char* type, unsigned int flags, unsigned int buffer_size, unsigned int* port_index, int* result); | |||||
| void PortUnRegister(int refnum, jack_port_id_t port_index, int* result); | void PortUnRegister(int refnum, jack_port_id_t port_index, int* result); | ||||
| void PortConnect(int refnum, const char* src, const char* dst, int* result); | void PortConnect(int refnum, const char* src, const char* dst, int* result); | ||||
| @@ -102,7 +102,9 @@ int JackClientPipeThread::HandleRequest() | |||||
| jack_error("HandleRequest: cannot read header"); | jack_error("HandleRequest: cannot read header"); | ||||
| ClientKill(); | ClientKill(); | ||||
| ret = -1; | ret = -1; | ||||
| } else { | |||||
| } else { | |||||
| JackLog("JackClientPipeThread::HandleRequest fType = %ld\n", header.fType); | |||||
| // Read data | // Read data | ||||
| switch (header.fType) { | switch (header.fType) { | ||||