git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2935 0c269be4-1314-0410-8aa9-9f06e86f4224tags/1.90
| @@ -87,7 +87,7 @@ class JackClientChannelInterface | |||||
| virtual void ClientDeactivate(int refnum, int* result) | virtual void ClientDeactivate(int refnum, int* result) | ||||
| {} | {} | ||||
| virtual void PortRegister(int refnum, const char* name, const char* type, unsigned int flags, unsigned int buffer_size, unsigned int* port_index, int* result) | |||||
| virtual 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) | |||||
| {} | {} | ||||
| virtual void PortUnRegister(int refnum, jack_port_id_t port_index, int* result) | virtual void PortUnRegister(int refnum, jack_port_id_t port_index, int* result) | ||||
| {} | {} | ||||
| @@ -25,13 +25,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | |||||
| #include "JackThread.h" | #include "JackThread.h" | ||||
| #include "JackConstants.h" | #include "JackConstants.h" | ||||
| #include "JackSynchro.h" | #include "JackSynchro.h" | ||||
| #include "JackPlatformPlug.h" | |||||
| #include "JackChannel.h" | |||||
| #include "types.h" | #include "types.h" | ||||
| #include "varargs.h" | #include "varargs.h" | ||||
| #include <list> | #include <list> | ||||
| #include "JackPlatformPlug.h" | |||||
| #include "JackChannel.h" | |||||
| namespace Jack | namespace Jack | ||||
| { | { | ||||
| @@ -175,7 +175,7 @@ void JackMachClientChannel::ClientDeactivate(int refnum, int* result) | |||||
| } | } | ||||
| } | } | ||||
| void JackMachClientChannel::PortRegister(int refnum, const char* name, const char* type, unsigned int flags, unsigned int buffer_size, unsigned int* port_index, int* result) | |||||
| void JackMachClientChannel::PortRegister(int refnum, const char* name, const char* type, unsigned int flags, unsigned int buffer_size, jack_port_id_t* port_index, int* result) | |||||
| { | { | ||||
| kern_return_t res = rpc_jack_port_register(fPrivatePort, refnum, (char*)name, (char*)type, flags, buffer_size, port_index, result); | kern_return_t res = rpc_jack_port_register(fPrivatePort, refnum, (char*)name, (char*)type, flags, buffer_size, port_index, result); | ||||
| if (res != KERN_SUCCESS) { | if (res != KERN_SUCCESS) { | ||||
| @@ -64,7 +64,7 @@ class JackMachClientChannel : public detail::JackClientChannelInterface, public | |||||
| void ClientActivate(int refnum, int state, int* result); | void ClientActivate(int refnum, int state, 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, unsigned int* port_index, 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 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); | ||||
| @@ -34,7 +34,7 @@ type objet_data_t = c_string[1024]; | |||||
| routine rpc_jack_client_open( | routine rpc_jack_client_open( | ||||
| server_port : mach_port_t; | server_port : mach_port_t; | ||||
| client_name : client_name_t; | client_name : client_name_t; | ||||
| pid : int; | |||||
| pid : int; | |||||
| out private_port : mach_port_make_send_t; | out private_port : mach_port_make_send_t; | ||||
| out shared_engine : int; | out shared_engine : int; | ||||
| out shared_client : int; | out shared_client : int; | ||||
| @@ -58,7 +58,7 @@ routine rpc_jack_client_close( | |||||
| routine rpc_jack_client_activate( | routine rpc_jack_client_activate( | ||||
| server_port : mach_port_t; | server_port : mach_port_t; | ||||
| refnum : int; | refnum : int; | ||||
| state : int; | |||||
| state : int; | |||||
| out result : int); | out result : int); | ||||
| routine rpc_jack_client_deactivate( | routine rpc_jack_client_deactivate( | ||||
| @@ -186,7 +186,7 @@ void JackSocketClientChannel::ClientDeactivate(int refnum, int* result) | |||||
| ServerSyncCall(&req, &res, result); | ServerSyncCall(&req, &res, result); | ||||
| } | } | ||||
| void JackSocketClientChannel::PortRegister(int refnum, const char* name, const char* type, unsigned int flags, unsigned int buffer_size, unsigned int* port_index, int* result) | |||||
| void JackSocketClientChannel::PortRegister(int refnum, const char* name, const char* type, unsigned int flags, unsigned int buffer_size, jack_port_id_t* port_index, int* result) | |||||
| { | { | ||||
| JackPortRegisterRequest req(refnum, name, type, flags, buffer_size); | JackPortRegisterRequest req(refnum, name, type, flags, buffer_size); | ||||
| JackPortRegisterResult res; | JackPortRegisterResult res; | ||||
| @@ -69,7 +69,7 @@ class JackSocketClientChannel : public detail::JackClientChannelInterface, publi | |||||
| void ClientActivate(int refnum, int state, int* result); | void ClientActivate(int refnum, int state, 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, unsigned int* port_index, 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 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); | ||||
| @@ -186,7 +186,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, unsigned int* port_index, int* 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) | |||||
| { | { | ||||
| JackPortRegisterRequest req(refnum, name, type, flags, buffer_size); | JackPortRegisterRequest req(refnum, name, type, flags, buffer_size); | ||||
| JackPortRegisterResult res; | JackPortRegisterResult res; | ||||
| @@ -67,7 +67,7 @@ class JackWinNamedPipeClientChannel : public detail::JackClientChannelInterface, | |||||
| void ClientActivate(int refnum, int state, int* result); | void ClientActivate(int refnum, int state, 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, unsigned int* port_index, 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 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); | ||||