Browse Source

Now running on Linux.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/branches/libjacknet@3338 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/1.9.8
sletz 16 years ago
parent
commit
f40ead1ba0
4 changed files with 7 additions and 12 deletions
  1. +1
    -10
      common/JackNetAPI.cpp
  2. +2
    -2
      common/wscript
  3. +2
    -0
      example-clients/netmaster.c
  4. +2
    -0
      example-clients/netslave.c

+ 1
- 10
common/JackNetAPI.cpp View File

@@ -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, ...) SERVER_EXPORT void jack_error(const char *fmt, ...)
{ {
va_list ap;
va_start(ap, fmt);
// TODO // TODO
va_end(ap);
} }


SERVER_EXPORT void jack_info(const char *fmt, ...) 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, ...) SERVER_EXPORT void jack_log(const char *fmt, ...)
{ {
va_list ap;
va_start(ap, fmt);
// TODO // TODO
va_end(ap);
} }


//#endif //#endif

+ 2
- 2
common/wscript View File

@@ -184,11 +184,11 @@ def build(bld):
netlib.source = ['JackNetAPI.cpp', 'JackNetInterface.cpp', 'JackNetTool.cpp', 'JackAudioAdapterInterface.cpp', 'JackResampler.cpp', 'ringbuffer.c'] netlib.source = ['JackNetAPI.cpp', 'JackNetInterface.cpp', 'JackNetTool.cpp', 'JackAudioAdapterInterface.cpp', 'JackResampler.cpp', 'ringbuffer.c']


if bld.env['IS_LINUX']: 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") netlib.env.append_value("CPPFLAGS", "-fvisibility=hidden")


if bld.env['IS_SUN']: 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") netlib.env.append_value("CPPFLAGS", "-fvisibility=hidden")




+ 2
- 0
example-clients/netmaster.c View File

@@ -111,6 +111,8 @@ main (int argc, char *argv[])
fprintf(stderr, "jack server not running?\n"); fprintf(stderr, "jack server not running?\n");
return 1; return 1;
} }

printf("Slave is running...\n");
/* install a signal handler to properly quits jack client */ /* install a signal handler to properly quits jack client */
#ifdef WIN32 #ifdef WIN32


+ 2
- 0
example-clients/netslave.c View File

@@ -126,6 +126,8 @@ main (int argc, char *argv[])
return 1; return 1;
} }


printf("Slave is found and running...\n");

jack_set_net_slave_process_callback(net, net_process, NULL); jack_set_net_slave_process_callback(net, net_process, NULL);
if (jack_net_slave_activate(net) != 0) { if (jack_net_slave_activate(net) != 0) {
fprintf(stderr, "Cannot sactivate client\n"); fprintf(stderr, "Cannot sactivate client\n");


Loading…
Cancel
Save