jackaudio
/
jack2
mirror of https://github.com/jackaudio/jack2
1
0
Fork 0
Code Releases 45 Activity
Browse Source

Correct export settings. 

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4662 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/1.9.9.5
sletz 14 years ago
parent
30442d9f10
commit
9cb495077c
5 changed files with 41 additions and 61 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +40
    -40
      common/JackNetAPI.cpp
  2. +1
    -3
      macosx/Jackdmp.xcodeproj/project.pbxproj
  3. +0
    -6
      windows/libjack.cbp
  4. +0
    -6
      windows/libjacknet.cbp
  5. +0
    -6
      windows/libjackserver.cbp

+ 40
- 40
common/JackNetAPI.cpp View File

@@ -86,41 +86,41 @@ extern "C"
typedef int (*JackNetSlaveSampleRateCallback) (jack_nframes_t nframes, void *arg);
typedef void (*JackNetSlaveShutdownCallback) (void* data);

SERVER_EXPORT jack_net_slave_t* jack_net_slave_open(const char* ip, int port, const char* name, jack_slave_t* request, jack_master_t* result);
SERVER_EXPORT int jack_net_slave_close(jack_net_slave_t* net);
LIB_EXPORT jack_net_slave_t* jack_net_slave_open(const char* ip, int port, const char* name, jack_slave_t* request, jack_master_t* result);
LIB_EXPORT int jack_net_slave_close(jack_net_slave_t* net);

SERVER_EXPORT int jack_net_slave_activate(jack_net_slave_t* net);
SERVER_EXPORT int jack_net_slave_deactivate(jack_net_slave_t* net);
LIB_EXPORT int jack_net_slave_activate(jack_net_slave_t* net);
LIB_EXPORT int jack_net_slave_deactivate(jack_net_slave_t* net);

SERVER_EXPORT int jack_set_net_slave_process_callback(jack_net_slave_t* net, JackNetSlaveProcessCallback net_callback, void *arg);
SERVER_EXPORT int jack_set_net_slave_buffer_size_callback(jack_net_slave_t* net, JackNetSlaveBufferSizeCallback bufsize_callback, void *arg);
SERVER_EXPORT int jack_set_net_slave_sample_rate_callback(jack_net_slave_t* net, JackNetSlaveSampleRateCallback samplerate_callback, void *arg);
SERVER_EXPORT int jack_set_net_slave_shutdown_callback(jack_net_slave_t* net, JackNetSlaveShutdownCallback shutdown_callback, void *arg);
LIB_EXPORT int jack_set_net_slave_process_callback(jack_net_slave_t* net, JackNetSlaveProcessCallback net_callback, void *arg);
LIB_EXPORT int jack_set_net_slave_buffer_size_callback(jack_net_slave_t* net, JackNetSlaveBufferSizeCallback bufsize_callback, void *arg);
LIB_EXPORT int jack_set_net_slave_sample_rate_callback(jack_net_slave_t* net, JackNetSlaveSampleRateCallback samplerate_callback, void *arg);
LIB_EXPORT int jack_set_net_slave_shutdown_callback(jack_net_slave_t* net, JackNetSlaveShutdownCallback shutdown_callback, void *arg);

// NetJack master API

typedef struct _jack_net_master jack_net_master_t;

SERVER_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);
SERVER_EXPORT int jack_net_master_close(jack_net_master_t* net);
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 int jack_net_master_close(jack_net_master_t* net);

SERVER_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);
SERVER_EXPORT int jack_net_master_send(jack_net_master_t* net, int audio_output, float** audio_output_buffer, int midi_output, void** midi_output_buffer);
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);
LIB_EXPORT int jack_net_master_send(jack_net_master_t* net, int audio_output, float** audio_output_buffer, int midi_output, void** midi_output_buffer);

// NetJack adapter API

typedef struct _jack_adapter jack_adapter_t;

SERVER_EXPORT jack_adapter_t* jack_create_adapter(int input, int output,
LIB_EXPORT jack_adapter_t* jack_create_adapter(int input, int output,
jack_nframes_t host_buffer_size,
jack_nframes_t host_sample_rate,
jack_nframes_t adapted_buffer_size,
jack_nframes_t adapted_sample_rate);
SERVER_EXPORT int jack_destroy_adapter(jack_adapter_t* adapter);
SERVER_EXPORT void jack_flush_adapter(jack_adapter_t* adapter);
LIB_EXPORT int jack_destroy_adapter(jack_adapter_t* adapter);
LIB_EXPORT void jack_flush_adapter(jack_adapter_t* adapter);

SERVER_EXPORT int jack_adapter_push_and_pull(jack_adapter_t* adapter, float** input, float** output, unsigned int frames);
SERVER_EXPORT int jack_adapter_pull_and_push(jack_adapter_t* adapter, float** input, float** output, unsigned int frames);
LIB_EXPORT int jack_adapter_push_and_pull(jack_adapter_t* adapter, float** input, float** output, unsigned int frames);
LIB_EXPORT int jack_adapter_pull_and_push(jack_adapter_t* adapter, float** input, float** output, unsigned int frames);

#ifdef __cplusplus
}
@@ -855,7 +855,7 @@ struct JackNetAdapter : public JackAudioAdapterInterface {

using namespace Jack;

SERVER_EXPORT jack_net_slave_t* jack_net_slave_open(const char* ip, int port, const char* name, jack_slave_t* request, jack_master_t* result)
LIB_EXPORT jack_net_slave_t* jack_net_slave_open(const char* ip, int port, const char* name, jack_slave_t* request, jack_master_t* result)
{
JackNetExtSlave* slave = new JackNetExtSlave(ip, port, name, request);
if (slave->Open(result) == 0) {
@@ -866,7 +866,7 @@ SERVER_EXPORT jack_net_slave_t* jack_net_slave_open(const char* ip, int port, co
}
}

SERVER_EXPORT int jack_net_slave_close(jack_net_slave_t* net)
LIB_EXPORT int jack_net_slave_close(jack_net_slave_t* net)
{
JackNetExtSlave* slave = (JackNetExtSlave*)net;
slave->Close();
@@ -874,37 +874,37 @@ SERVER_EXPORT int jack_net_slave_close(jack_net_slave_t* net)
return 0;
}

SERVER_EXPORT int jack_set_net_slave_process_callback(jack_net_slave_t* net, JackNetSlaveProcessCallback net_callback, void *arg)
LIB_EXPORT int jack_set_net_slave_process_callback(jack_net_slave_t* net, JackNetSlaveProcessCallback net_callback, void *arg)
{
JackNetExtSlave* slave = (JackNetExtSlave*)net;
return slave->SetProcessCallback(net_callback, arg);
}

SERVER_EXPORT int jack_net_slave_activate(jack_net_slave_t* net)
LIB_EXPORT int jack_net_slave_activate(jack_net_slave_t* net)
{
JackNetExtSlave* slave = (JackNetExtSlave*)net;
return slave->Start();
}

SERVER_EXPORT int jack_net_slave_deactivate(jack_net_slave_t* net)
LIB_EXPORT int jack_net_slave_deactivate(jack_net_slave_t* net)
{
JackNetExtSlave* slave = (JackNetExtSlave*)net;
return slave->Stop();
}

SERVER_EXPORT int jack_set_net_slave_buffer_size_callback(jack_net_slave_t *net, JackNetSlaveBufferSizeCallback bufsize_callback, void *arg)
LIB_EXPORT int jack_set_net_slave_buffer_size_callback(jack_net_slave_t *net, JackNetSlaveBufferSizeCallback bufsize_callback, void *arg)
{
JackNetExtSlave* slave = (JackNetExtSlave*)net;
return slave->SetBufferSizeCallback(bufsize_callback, arg);
}

SERVER_EXPORT int jack_set_net_slave_sample_rate_callback(jack_net_slave_t *net, JackNetSlaveSampleRateCallback samplerate_callback, void *arg)
LIB_EXPORT int jack_set_net_slave_sample_rate_callback(jack_net_slave_t *net, JackNetSlaveSampleRateCallback samplerate_callback, void *arg)
{
JackNetExtSlave* slave = (JackNetExtSlave*)net;
return slave->SetSampleRateCallback(samplerate_callback, arg);
}

SERVER_EXPORT int jack_set_net_slave_shutdown_callback(jack_net_slave_t *net, JackNetSlaveShutdownCallback shutdown_callback, void *arg)
LIB_EXPORT int jack_set_net_slave_shutdown_callback(jack_net_slave_t *net, JackNetSlaveShutdownCallback shutdown_callback, void *arg)
{
JackNetExtSlave* slave = (JackNetExtSlave*)net;
return slave->SetShutdownCallback(shutdown_callback, arg);
@@ -912,7 +912,7 @@ SERVER_EXPORT int jack_set_net_slave_shutdown_callback(jack_net_slave_t *net, Ja

// Master API

SERVER_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, const char* name, jack_master_t* request, jack_slave_t* result)
{
JackNetExtMaster* master = new JackNetExtMaster(ip, port, name, request);
if (master->Open(result) == 0) {
@@ -923,20 +923,20 @@ SERVER_EXPORT jack_net_master_t* jack_net_master_open(const char* ip, int port,
}
}

SERVER_EXPORT int jack_net_master_close(jack_net_master_t* net)
LIB_EXPORT int jack_net_master_close(jack_net_master_t* net)
{
JackNetExtMaster* master = (JackNetExtMaster*)net;
master->Close();
delete master;
return 0;
}
SERVER_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)
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)
{
JackNetExtMaster* master = (JackNetExtMaster*)net;
return master->Read(audio_input, audio_input_buffer, midi_input, midi_input_buffer);
}

SERVER_EXPORT int jack_net_master_send(jack_net_master_t* net, int audio_output, float** audio_output_buffer, int midi_output, void** midi_output_buffer)
LIB_EXPORT int jack_net_master_send(jack_net_master_t* net, int audio_output, float** audio_output_buffer, int midi_output, void** midi_output_buffer)
{
JackNetExtMaster* master = (JackNetExtMaster*)net;
return master->Write(audio_output, audio_output_buffer, midi_output, midi_output_buffer);
@@ -944,7 +944,7 @@ SERVER_EXPORT int jack_net_master_send(jack_net_master_t* net, int audio_output,

// Adapter API

SERVER_EXPORT jack_adapter_t* jack_create_adapter(int input, int output,
LIB_EXPORT jack_adapter_t* jack_create_adapter(int input, int output,
jack_nframes_t host_buffer_size,
jack_nframes_t host_sample_rate,
jack_nframes_t adapted_buffer_size,
@@ -957,25 +957,25 @@ SERVER_EXPORT jack_adapter_t* jack_create_adapter(int input, int output,
}
}

SERVER_EXPORT int jack_destroy_adapter(jack_adapter_t* adapter)
LIB_EXPORT int jack_destroy_adapter(jack_adapter_t* adapter)
{
delete((JackNetAdapter*)adapter);
return 0;
}

SERVER_EXPORT void jack_flush_adapter(jack_adapter_t* adapter)
LIB_EXPORT void jack_flush_adapter(jack_adapter_t* adapter)
{
JackNetAdapter* slave = (JackNetAdapter*)adapter;
slave->Flush();
}

SERVER_EXPORT int jack_adapter_push_and_pull(jack_adapter_t* adapter, float** input, float** output, unsigned int frames)
LIB_EXPORT int jack_adapter_push_and_pull(jack_adapter_t* adapter, float** input, float** output, unsigned int frames)
{
JackNetAdapter* slave = (JackNetAdapter*)adapter;
return slave->PushAndPull(input, output, frames);
}

SERVER_EXPORT int jack_adapter_pull_and_push(jack_adapter_t* adapter, float** input, float** output, unsigned int frames)
LIB_EXPORT int jack_adapter_pull_and_push(jack_adapter_t* adapter, float** input, float** output, unsigned int frames)
{
JackNetAdapter* slave = (JackNetAdapter*)adapter;
return slave->PullAndPush(input, output, frames);
@@ -1002,7 +1002,7 @@ static void jack_format_and_log(int level, const char *prefix, const char *fmt,
printf("\n");
}

SERVER_EXPORT void jack_error(const char *fmt, ...)
LIB_EXPORT void jack_error(const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
@@ -1010,7 +1010,7 @@ SERVER_EXPORT void jack_error(const char *fmt, ...)
va_end(ap);
}

SERVER_EXPORT void jack_info(const char *fmt, ...)
LIB_EXPORT void jack_info(const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
@@ -1018,7 +1018,7 @@ SERVER_EXPORT void jack_info(const char *fmt, ...)
va_end(ap);
}

SERVER_EXPORT void jack_log(const char *fmt, ...)
LIB_EXPORT void jack_log(const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
@@ -1030,13 +1030,13 @@ SERVER_EXPORT void jack_log(const char *fmt, ...)

// Empty code for now..

SERVER_EXPORT void jack_error(const char *fmt, ...)
LIB_EXPORT void jack_error(const char *fmt, ...)
{}

SERVER_EXPORT void jack_info(const char *fmt, ...)
LIB_EXPORT void jack_info(const char *fmt, ...)
{}

SERVER_EXPORT void jack_log(const char *fmt, ...)
LIB_EXPORT void jack_log(const char *fmt, ...)
{}

#endif


+ 1
- 3
macosx/Jackdmp.xcodeproj/project.pbxproj View File

@@ -16283,10 +16283,9 @@
OTHER_CPLUSPLUSFLAGS = (
"-DHAVE_CELT_API_0_7",
"-DHAVE_CELT",
"-DSERVER_SIDE",
"-DMACH_RPC_MACH_SEMA",
"-D__SMP__",
"-DJACK_32_64",
"-D__SMP__",
);
OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_1 = "-DJACK_LOCATION=\\\"/usr/local/bin\\\"";
OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_2 = "-DADDON_DIR=\\\"/usr/local/lib/jackmp\\\"";
@@ -16356,7 +16355,6 @@
OTHER_CPLUSPLUSFLAGS = (
"-DHAVE_CELT_API_0_7",
"-DHAVE_CELT",
"-DSERVER_SIDE",
"-DMACH_RPC_MACH_SEMA",
"-DJACK_32_64",
"-D__SMP__",


+ 0
- 6
windows/libjack.cbp View File

@@ -21,7 +21,6 @@
<Add option="-D_WINDOWS" />
<Add option="-D_MBCS" />
<Add option="-D_USRDLL" />
<Add option="-DLIBJACKMP_EXPORTS" />
<Add option="-DREGEX_MALLOC" />
<Add option="-DSTDC_HEADERS" />
<Add option="-D__SMP__" />
@@ -65,7 +64,6 @@
<Add option="-D_CONSOLE" />
<Add option="-D_MBCS" />
<Add option="-D_USRDLL" />
<Add option="-DLIBJACKMP_EXPORTS" />
<Add option="-DREGEX_MALLOC" />
<Add option="-DSTDC_HEADERS" />
<Add option="-D__SMP__" />
@@ -109,7 +107,6 @@
<Add option="-D_WINDOWS" />
<Add option="-D_MBCS" />
<Add option="-D_USRDLL" />
<Add option="-DLIBJACKMP_EXPORTS" />
<Add option="-DREGEX_MALLOC" />
<Add option="-DSTDC_HEADERS" />
<Add option="-D__SMP__" />
@@ -155,7 +152,6 @@
<Add option="-D_WINDOWS" />
<Add option="-D_MBCS" />
<Add option="-D_USRDLL" />
<Add option="-DLIBJACKMP_EXPORTS" />
<Add option="-DREGEX_MALLOC" />
<Add option="-DSTDC_HEADERS" />
<Add option="-D__SMP__" />
@@ -204,7 +200,6 @@
<Add option="-D_CONSOLE" />
<Add option="-D_MBCS" />
<Add option="-D_USRDLL" />
<Add option="-DLIBJACKMP_EXPORTS" />
<Add option="-DREGEX_MALLOC" />
<Add option="-DSTDC_HEADERS" />
<Add option="-D__SMP__" />
@@ -253,7 +248,6 @@
<Add option="-D_WINDOWS" />
<Add option="-D_MBCS" />
<Add option="-D_USRDLL" />
<Add option="-DLIBJACKMP_EXPORTS" />
<Add option="-DREGEX_MALLOC" />
<Add option="-DSTDC_HEADERS" />
<Add option="-D__SMP__" />


+ 0
- 6
windows/libjacknet.cbp View File

@@ -24,7 +24,6 @@
<Add option="-DLIBJACKDMP_EXPORTS" />
<Add option="-DREGEX_MALLOC" />
<Add option="-DSTDC_HEADERS" />
<Add option="-DSERVER_SIDE" />
<Add option="-D__SMP__" />
<Add option="-DJACK_32_64" />
<Add directory="." />
@@ -55,7 +54,6 @@
<Add option="-DLIBJACKDMP_EXPORTS" />
<Add option="-DREGEX_MALLOC" />
<Add option="-DSTDC_HEADERS" />
<Add option="-DSERVER_SIDE" />
<Add option="-D__SMP__" />
<Add option="-DJACK_32_64" />
<Add directory="." />
@@ -86,7 +84,6 @@
<Add option="-DLIBJACKDMP_EXPORTS" />
<Add option="-DREGEX_MALLOC" />
<Add option="-DSTDC_HEADERS" />
<Add option="-DSERVER_SIDE" />
<Add option="-D__SMP__" />
<Add option="-DJACK_32_64" />
<Add option="-DJACK_MONITOR" />
@@ -119,7 +116,6 @@
<Add option="-DLIBJACKDMP_EXPORTS" />
<Add option="-DREGEX_MALLOC" />
<Add option="-DSTDC_HEADERS" />
<Add option="-DSERVER_SIDE" />
<Add option="-D__SMP__" />
<Add option="-DJACK_32_64" />
<Add directory="." />
@@ -155,7 +151,6 @@
<Add option="-DLIBJACKDMP_EXPORTS" />
<Add option="-DREGEX_MALLOC" />
<Add option="-DSTDC_HEADERS" />
<Add option="-DSERVER_SIDE" />
<Add option="-D__SMP__" />
<Add option="-DJACK_32_64" />
<Add directory="." />
@@ -191,7 +186,6 @@
<Add option="-DLIBJACKDMP_EXPORTS" />
<Add option="-DREGEX_MALLOC" />
<Add option="-DSTDC_HEADERS" />
<Add option="-DSERVER_SIDE" />
<Add option="-D__SMP__" />
<Add option="-DJACK_32_64" />
<Add option="-DJACK_MONITOR" />


+ 0
- 6
windows/libjackserver.cbp View File

@@ -21,7 +21,6 @@
<Add option="-D_WINDOWS" />
<Add option="-D_MBCS" />
<Add option="-D_USRDLL" />
<Add option="-DLIBJACKDMP_EXPORTS" />
<Add option="-DREGEX_MALLOC" />
<Add option="-DSTDC_HEADERS" />
<Add option="-DSERVER_SIDE" />
@@ -55,7 +54,6 @@
<Add option="-D_CONSOLE" />
<Add option="-D_MBCS" />
<Add option="-D_USRDLL" />
<Add option="-DLIBJACKDMP_EXPORTS" />
<Add option="-DREGEX_MALLOC" />
<Add option="-DSTDC_HEADERS" />
<Add option="-DSERVER_SIDE" />
@@ -89,7 +87,6 @@
<Add option="-D_WINDOWS" />
<Add option="-D_MBCS" />
<Add option="-D_USRDLL" />
<Add option="-DLIBJACKDMP_EXPORTS" />
<Add option="-DREGEX_MALLOC" />
<Add option="-DSTDC_HEADERS" />
<Add option="-DSERVER_SIDE" />
@@ -125,7 +122,6 @@
<Add option="-D_WINDOWS" />
<Add option="-D_MBCS" />
<Add option="-D_USRDLL" />
<Add option="-DLIBJACKDMP_EXPORTS" />
<Add option="-DREGEX_MALLOC" />
<Add option="-DSTDC_HEADERS" />
<Add option="-DSERVER_SIDE" />
@@ -164,7 +160,6 @@
<Add option="-D_CONSOLE" />
<Add option="-D_MBCS" />
<Add option="-D_USRDLL" />
<Add option="-DLIBJACKDMP_EXPORTS" />
<Add option="-DREGEX_MALLOC" />
<Add option="-DSTDC_HEADERS" />
<Add option="-DSERVER_SIDE" />
@@ -203,7 +198,6 @@
<Add option="-D_WINDOWS" />
<Add option="-D_MBCS" />
<Add option="-D_USRDLL" />
<Add option="-DLIBJACKDMP_EXPORTS" />
<Add option="-DREGEX_MALLOC" />
<Add option="-DSTDC_HEADERS" />
<Add option="-DSERVER_SIDE" />


Write Preview
Loading…
Cancel
Save