diff --git a/common/JackNetAPI.cpp b/common/JackNetAPI.cpp index ea9fc040..0802c0f3 100644 --- a/common/JackNetAPI.cpp +++ b/common/JackNetAPI.cpp @@ -107,7 +107,7 @@ extern "C" typedef struct _jack_net_master jack_net_master_t; - LIB_EXPORT jack_net_master_t* jack_net_master_open(const char* ip, int port, const char* name, jack_master_t* request, jack_slave_t* result); + LIB_EXPORT jack_net_master_t* jack_net_master_open(const char* ip, int port, jack_master_t* request, jack_slave_t* result); LIB_EXPORT int jack_net_master_close(jack_net_master_t* net); LIB_EXPORT int jack_net_master_recv(jack_net_master_t* net, int audio_input, float** audio_input_buffer, int midi_input, void** midi_input_buffer); @@ -153,7 +153,6 @@ struct JackNetExtMaster : public JackNetMasterInterface { JackNetExtMaster(const char* ip, int port, - const char* name, jack_master_t* request) { fRunning = true; @@ -1121,9 +1120,9 @@ LIB_EXPORT int jack_set_net_slave_error_callback(jack_net_slave_t *net, JackNetS // Master API -LIB_EXPORT jack_net_master_t* jack_net_master_open(const char* ip, int port, const char* name, jack_master_t* request, jack_slave_t* result) +LIB_EXPORT jack_net_master_t* jack_net_master_open(const char* ip, int port, jack_master_t* request, jack_slave_t* result) { - JackNetExtMaster* master = new JackNetExtMaster(ip, port, name, request); + JackNetExtMaster* master = new JackNetExtMaster(ip, port, request); if (master->Open(result) == 0) { return (jack_net_master_t*)master; } else { diff --git a/common/jack/net.h b/common/jack/net.h index 71808a68..73fb1d99 100644 --- a/common/jack/net.h +++ b/common/jack/net.h @@ -90,6 +90,7 @@ typedef struct _jack_net_slave jack_net_slave_t; * * @param ip the multicast address of the master * @param port the connection port + * @param name the JACK client name * @param request a connection request structure * @param result a connection result structure * @@ -289,7 +290,7 @@ typedef struct _jack_net_master jack_net_master_t; * * @return Opaque net handle if successful or NULL in case of error. */ -jack_net_master_t* jack_net_master_open(const char* ip, int port, const char* name, jack_master_t* request, jack_slave_t* result); +jack_net_master_t* jack_net_master_open(const char* ip, int port, jack_master_t* request, jack_slave_t* result); /** * Close the network connection with the slave machine. diff --git a/example-clients/netmaster.c b/example-clients/netmaster.c index ff200ee4..0245fcb6 100644 --- a/example-clients/netmaster.c +++ b/example-clients/netmaster.c @@ -102,7 +102,7 @@ main (int argc, char *argv[]) int i; //jack_master_t request = { 4, 4, -1, -1, buffer_size, sample_rate, "master", -1 }; - jack_master_t request = { -1, -1, -1, -1, buffer_size, sample_rate, "master", 6, true }; + jack_master_t request = { -1, -1, -1, -1, buffer_size, sample_rate, "net_master", 6, true }; jack_slave_t result; float** audio_input_buffer; float** audio_output_buffer; @@ -110,7 +110,7 @@ main (int argc, char *argv[]) printf("Waiting for a slave...\n"); - if ((net = jack_net_master_open(multicast_ip, udp_port, "net_master", &request, &result)) == 0) { + if ((net = jack_net_master_open(multicast_ip, udp_port, &request, &result)) == 0) { fprintf(stderr, "NetJack master can not be opened\n"); return 1; }