diff --git a/common/JackNetAPI.cpp b/common/JackNetAPI.cpp index 300357ac..7e41e8c8 100644 --- a/common/JackNetAPI.cpp +++ b/common/JackNetAPI.cpp @@ -1004,26 +1004,17 @@ SERVER_EXPORT int jack_adapter_pull_output(jack_adapter_t * adapter, int channel SERVER_EXPORT void jack_error(const char *fmt, ...) { - va_list ap; - va_start(ap, fmt); // TODO - va_end(ap); } SERVER_EXPORT void jack_info(const char *fmt, ...) { - va_list ap; - va_start(ap, fmt); - // TODO - va_end(ap); + // TODO } SERVER_EXPORT void jack_log(const char *fmt, ...) { - va_list ap; - va_start(ap, fmt); // TODO - va_end(ap); } //#endif diff --git a/common/wscript b/common/wscript index df784d79..026ec5c8 100644 --- a/common/wscript +++ b/common/wscript @@ -184,11 +184,11 @@ def build(bld): netlib.source = ['JackNetAPI.cpp', 'JackNetInterface.cpp', 'JackNetTool.cpp', 'JackAudioAdapterInterface.cpp', 'JackResampler.cpp', 'ringbuffer.c'] if bld.env['IS_LINUX']: - netlib.source += ['./posix/JackNetUnixSocket.cpp','./posix/JackPosixThread.cpp'] + netlib.source += ['../posix/JackNetUnixSocket.cpp','../posix/JackPosixThread.cpp', '../linux/JackLinuxTime.c'] netlib.env.append_value("CPPFLAGS", "-fvisibility=hidden") if bld.env['IS_SUN']: - netlib.source += ['./posix/JackNetUnixSocket.cpp','./posix/JackPosixThread.cpp'] + netlib.source += ['../posix/JackNetUnixSocket.cpp','../posix/JackPosixThread.cpp', '../solaris/JackSolarisTime.c'] netlib.env.append_value("CPPFLAGS", "-fvisibility=hidden") diff --git a/example-clients/netmaster.c b/example-clients/netmaster.c index 863715df..ebfdfdb6 100644 --- a/example-clients/netmaster.c +++ b/example-clients/netmaster.c @@ -111,6 +111,8 @@ main (int argc, char *argv[]) fprintf(stderr, "jack server not running?\n"); return 1; } + + printf("Slave is running...\n"); /* install a signal handler to properly quits jack client */ #ifdef WIN32 diff --git a/example-clients/netslave.c b/example-clients/netslave.c index 165e334f..7c83ece0 100644 --- a/example-clients/netslave.c +++ b/example-clients/netslave.c @@ -126,6 +126,8 @@ main (int argc, char *argv[]) return 1; } + printf("Slave is found and running...\n"); + jack_set_net_slave_process_callback(net, net_process, NULL); if (jack_net_slave_activate(net) != 0) { fprintf(stderr, "Cannot sactivate client\n");