Browse Source

Correct PortRegister prototype.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2935 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/1.90
sletz 15 years ago
parent
commit
27b17399e7
9 changed files with 11 additions and 12 deletions
  1. +1
    -1
      common/JackChannel.h
  2. +2
    -3
      common/JackClient.h
  3. +1
    -1
      macosx/JackMachClientChannel.cpp
  4. +1
    -1
      macosx/JackMachClientChannel.h
  5. +2
    -2
      macosx/RPC/JackRPCEngine.defs
  6. +1
    -1
      posix/JackSocketClientChannel.cpp
  7. +1
    -1
      posix/JackSocketClientChannel.h
  8. +1
    -1
      windows/JackWinNamedPipeClientChannel.cpp
  9. +1
    -1
      windows/JackWinNamedPipeClientChannel.h

+ 1
- 1
common/JackChannel.h View File

@@ -87,7 +87,7 @@ class JackClientChannelInterface
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)
{}


+ 2
- 3
common/JackClient.h View File

@@ -25,13 +25,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "JackThread.h"
#include "JackConstants.h"
#include "JackSynchro.h"
#include "JackPlatformPlug.h"
#include "JackChannel.h"
#include "types.h"
#include "varargs.h"
#include <list>

#include "JackPlatformPlug.h"
#include "JackChannel.h"

namespace Jack
{



+ 1
- 1
macosx/JackMachClientChannel.cpp View File

@@ -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);
if (res != KERN_SUCCESS) {


+ 1
- 1
macosx/JackMachClientChannel.h View File

@@ -64,7 +64,7 @@ class JackMachClientChannel : public detail::JackClientChannelInterface, public
void ClientActivate(int refnum, int state, 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 PortConnect(int refnum, const char* src, const char* dst, int* result);


+ 2
- 2
macosx/RPC/JackRPCEngine.defs View File

@@ -34,7 +34,7 @@ type objet_data_t = c_string[1024];
routine rpc_jack_client_open(
server_port : mach_port_t;
client_name : client_name_t;
pid : int;
pid : int;
out private_port : mach_port_make_send_t;
out shared_engine : int;
out shared_client : int;
@@ -58,7 +58,7 @@ routine rpc_jack_client_close(
routine rpc_jack_client_activate(
server_port : mach_port_t;
refnum : int;
state : int;
state : int;
out result : int);

routine rpc_jack_client_deactivate(


+ 1
- 1
posix/JackSocketClientChannel.cpp View File

@@ -186,7 +186,7 @@ void JackSocketClientChannel::ClientDeactivate(int refnum, int* 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);
JackPortRegisterResult res;


+ 1
- 1
posix/JackSocketClientChannel.h View File

@@ -69,7 +69,7 @@ class JackSocketClientChannel : public detail::JackClientChannelInterface, publi
void ClientActivate(int refnum, int state, 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 PortConnect(int refnum, const char* src, const char* dst, int* result);


+ 1
- 1
windows/JackWinNamedPipeClientChannel.cpp View File

@@ -186,7 +186,7 @@ void JackWinNamedPipeClientChannel::ClientDeactivate(int refnum, int* 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);
JackPortRegisterResult res;


+ 1
- 1
windows/JackWinNamedPipeClientChannel.h View File

@@ -67,7 +67,7 @@ class JackWinNamedPipeClientChannel : public detail::JackClientChannelInterface,
void ClientActivate(int refnum, int state, 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 PortConnect(int refnum, const char* src, const char* dst, int* result);


Loading…
Cancel
Save