Browse Source

Add libjacknet target in XCode.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4379 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/1.9.8
sletz 15 years ago
parent
commit
a6fef0f2cc
4 changed files with 339 additions and 27 deletions
  1. +26
    -26
      common/jack/net.h
  2. +306
    -0
      macosx/Jackdmp.xcodeproj/project.pbxproj
  3. +6
    -1
      macosx/install_jackdmp
  4. +1
    -0
      macosx/remove_jackdmp

+ 26
- 26
common/jack/net.h View File

@@ -1,18 +1,18 @@
/* /*
Copyright (C) 2009-2010 Grame Copyright (C) 2009-2010 Grame
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version. (at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details. GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License You should have received a copy of the GNU Lesser General Public License
along with this program; if not, write to the Free Software
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.


*/ */
@@ -48,9 +48,9 @@ enum JackNetEncoder {
JackIntEncoder = 1, // Samples are transmitted as 16 bits integer JackIntEncoder = 1, // Samples are transmitted as 16 bits integer
JackCeltEncoder = 2, // Samples are transmitted using CELT codec (http://www.celt-codec.org/) JackCeltEncoder = 2, // Samples are transmitted using CELT codec (http://www.celt-codec.org/)
}; };
typedef struct { typedef struct {
int audio_input; // from master or to slave int audio_input; // from master or to slave
int audio_output; // to master or from slave int audio_output; // to master or from slave
int midi_input; // from master or to slave int midi_input; // from master or to slave
@@ -59,12 +59,12 @@ typedef struct {
int time_out; // in second, -1 means in infinite int time_out; // in second, -1 means in infinite
int encoder; // Encoder type (one of JackNetEncoder) int encoder; // Encoder type (one of JackNetEncoder)
int kbps; // KB per second for CELT encoder int kbps; // KB per second for CELT encoder
char mode;
char mode; // one of JackNetMode


} jack_slave_t; } jack_slave_t;


typedef struct { typedef struct {
jack_nframes_t buffer_size; jack_nframes_t buffer_size;
jack_nframes_t sample_rate; jack_nframes_t sample_rate;
char master_name[MASTER_NAME_SIZE]; char master_name[MASTER_NAME_SIZE];
@@ -72,7 +72,7 @@ typedef struct {
} jack_master_t; } jack_master_t;


/** /**
* jack_net_t is an opaque type. You may only access it using the
* jack_net_slave_t is an opaque type. You may only access it using the
* API provided. * API provided.
*/ */
typedef struct _jack_net_slave jack_net_slave_t; typedef struct _jack_net_slave jack_net_slave_t;
@@ -99,7 +99,7 @@ int jack_net_slave_close(jack_net_slave_t* net);
/** /**
* Prototype for Process callback. * Prototype for Process callback.
* @param nframes buffer size * @param nframes buffer size
* @param audio_input number of audio inputs
* @param audio_input number of audio inputs
* @param audio_input_buffer an array of audio input buffers (from master) * @param audio_input_buffer an array of audio input buffers (from master)
* @param midi_input number of MIDI inputs * @param midi_input number of MIDI inputs
* @param midi_input_buffer an array of MIDI input buffers (from master) * @param midi_input_buffer an array of MIDI input buffers (from master)
@@ -112,14 +112,14 @@ int jack_net_slave_close(jack_net_slave_t* net);
* @return zero on success, non-zero on error * @return zero on success, non-zero on error
*/ */
typedef int (* JackNetSlaveProcessCallback) (jack_nframes_t buffer_size, typedef int (* JackNetSlaveProcessCallback) (jack_nframes_t buffer_size,
int audio_input,
float** audio_input_buffer,
int audio_input,
float** audio_input_buffer,
int midi_input, int midi_input,
void** midi_input_buffer, void** midi_input_buffer,
int audio_output, int audio_output,
float** audio_output_buffer,
int midi_output,
void** midi_output_buffer,
float** audio_output_buffer,
int midi_output,
void** midi_output_buffer,
void* data); void* data);


/** /**
@@ -203,11 +203,11 @@ typedef void (*JackNetSlaveShutdownCallback)(void* data);
int jack_set_net_slave_shutdown_callback(jack_net_slave_t *net, JackNetSlaveShutdownCallback shutdown_callback, void *arg); int jack_set_net_slave_shutdown_callback(jack_net_slave_t *net, JackNetSlaveShutdownCallback shutdown_callback, void *arg);


/** /**
* jack_net_t is an opaque type. You may only access it using the
* jack_net_master_t is an opaque type. You may only access it using the
* API provided. * API provided.
*/ */
typedef struct _jack_net_master jack_net_master_t; typedef struct _jack_net_master jack_net_master_t;
/** /**
* Open a network connection with the slave machine. * Open a network connection with the slave machine.
* @param ip the multicast address of the master * @param ip the multicast address of the master
@@ -226,7 +226,7 @@ jack_net_master_t* jack_net_master_open(const char* ip, int port, const char* na
* @return 0 on success, otherwise a non-zero error code * @return 0 on success, otherwise a non-zero error code
*/ */
int jack_net_master_close(jack_net_master_t* net); int jack_net_master_close(jack_net_master_t* net);
/** /**
* Receive sync and data from the network * Receive sync and data from the network
* @param net the network connection * @param net the network connection
@@ -236,7 +236,7 @@ int jack_net_master_close(jack_net_master_t* net);
* @param midi_input_buffer an array of MIDI input buffers * @param midi_input_buffer an array of MIDI input buffers
* *
* @return zero on success, non-zero on error * @return zero on success, non-zero on error
*/
*/
int jack_net_master_recv(jack_net_master_t* net, int audio_input, float** audio_input_buffer, int midi_input, void** midi_input_buffer); int jack_net_master_recv(jack_net_master_t* net, int audio_input, float** audio_input_buffer, int midi_input, void** midi_input_buffer);


/** /**
@@ -248,7 +248,7 @@ int jack_net_master_recv(jack_net_master_t* net, int audio_input, float** audio_
* @param midi_output_buffer an array of MIDI output buffers * @param midi_output_buffer an array of MIDI output buffers
* *
* @return zero on success, non-zero on error * @return zero on success, non-zero on error
*/
*/
int jack_net_master_send(jack_net_master_t* net, int audio_output, float** audio_output_buffer, int midi_output, void** midi_output_buffer); int jack_net_master_send(jack_net_master_t* net, int audio_output, float** audio_output_buffer, int midi_output, void** midi_output_buffer);


// Experimental Adapter API // Experimental Adapter API
@@ -269,9 +269,9 @@ typedef struct _jack_adapter jack_adapter_t;
* @param adapted_sample_rate the adapted buffer sample rate * @param adapted_sample_rate the adapted buffer sample rate
* *
* @return 0 on success, otherwise a non-zero error code * @return 0 on success, otherwise a non-zero error code
*/
*/
jack_adapter_t* jack_create_adapter(int input, int output, jack_adapter_t* jack_create_adapter(int input, int output,
jack_nframes_t host_buffer_size,
jack_nframes_t host_buffer_size,
jack_nframes_t host_sample_rate, jack_nframes_t host_sample_rate,
jack_nframes_t adapted_buffer_size, jack_nframes_t adapted_buffer_size,
jack_nframes_t adapted_sample_rate); jack_nframes_t adapted_sample_rate);
@@ -281,7 +281,7 @@ jack_adapter_t* jack_create_adapter(int input, int output,
* @param adapter the adapter to be destroyed * @param adapter the adapter to be destroyed
* *
* @return 0 on success, otherwise a non-zero error code * @return 0 on success, otherwise a non-zero error code
*/
*/
int jack_destroy_adapter(jack_adapter_t* adapter); int jack_destroy_adapter(jack_adapter_t* adapter);


/** /**
@@ -289,7 +289,7 @@ int jack_destroy_adapter(jack_adapter_t* adapter);
* @param adapter the adapter to be flushed * @param adapter the adapter to be flushed
* *
* @return 0 on success, otherwise a non-zero error code * @return 0 on success, otherwise a non-zero error code
*/
*/
void jack_flush_adapter(jack_adapter_t* adapter); void jack_flush_adapter(jack_adapter_t* adapter);


/** /**
@@ -300,7 +300,7 @@ void jack_flush_adapter(jack_adapter_t* adapter);
* @param frames number of frames * @param frames number of frames
* *
* @return 0 on success, otherwise a non-zero error code * @return 0 on success, otherwise a non-zero error code
*/
*/
int jack_adapter_push_and_pull(jack_adapter_t* adapter, float** input, float** output, unsigned int frames); int jack_adapter_push_and_pull(jack_adapter_t* adapter, float** input, float** output, unsigned int frames);


/** /**
@@ -309,7 +309,7 @@ int jack_adapter_push_and_pull(jack_adapter_t* adapter, float** input, float** o
* @param input an array of audio input buffers * @param input an array of audio input buffers
* @param output an array of audio ouput buffers * @param output an array of audio ouput buffers
* @param frames number of frames * @param frames number of frames
*
*
* @return 0 on success, otherwise a non-zero error code * @return 0 on success, otherwise a non-zero error code
*/ */
int jack_adapter_pull_and_push(jack_adapter_t* adapter, float** input, float** output, unsigned int frames); int jack_adapter_pull_and_push(jack_adapter_t* adapter, float** input, float** output, unsigned int frames);


+ 306
- 0
macosx/Jackdmp.xcodeproj/project.pbxproj View File

@@ -595,6 +595,25 @@
4B80D7EB0BA0D17400F035BB /* JackMidiPort.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B80D7E50BA0D17400F035BB /* JackMidiPort.h */; }; 4B80D7EB0BA0D17400F035BB /* JackMidiPort.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B80D7E50BA0D17400F035BB /* JackMidiPort.h */; };
4B80D7EC0BA0D17400F035BB /* JackMidiPort.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B80D7E60BA0D17400F035BB /* JackMidiPort.cpp */; }; 4B80D7EC0BA0D17400F035BB /* JackMidiPort.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B80D7E60BA0D17400F035BB /* JackMidiPort.cpp */; };
4B80D7ED0BA0D17400F035BB /* JackMidiAPI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B80D7E70BA0D17400F035BB /* JackMidiAPI.cpp */; }; 4B80D7ED0BA0D17400F035BB /* JackMidiAPI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B80D7E70BA0D17400F035BB /* JackMidiAPI.cpp */; };
4B8692D61371DB4700D2D11B /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BCC87950D57168300A7FEB1 /* Accelerate.framework */; };
4B8692F81371DC5200D2D11B /* JackAudioAdapterInterface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B19B3080E2362E700DD4A82 /* JackAudioAdapterInterface.cpp */; };
4B8692FA1371DC6300D2D11B /* JackAudioAdapterInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B19B3090E2362E700DD4A82 /* JackAudioAdapterInterface.h */; };
4B8692FB1371DC7100D2D11B /* JackGlobals.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B2C28F908DAD01E00249230 /* JackGlobals.cpp */; };
4B8692FD1371DC8A00D2D11B /* JackGlobals.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BFB73F608AD291A00DB99B8 /* JackGlobals.h */; };
4B8692FE1371DC9700D2D11B /* JackMachThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BFB741E08AD2B9900DB99B8 /* JackMachThread.cpp */; };
4B86930D1371DCB000D2D11B /* JackMachThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BFB741F08AD2B9900DB99B8 /* JackMachThread.h */; };
4B8693141371DCCA00D2D11B /* JackMachTime.c in Sources */ = {isa = PBXBuildFile; fileRef = 4BF5FBC80E878D24003D2374 /* JackMachTime.c */; };
4B8693161371DD0A00D2D11B /* JackNetAPI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B8693151371DD0A00D2D11B /* JackNetAPI.cpp */; };
4B8693171371DD2400D2D11B /* JackNetInterface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B76C7680E5AB2DB00E2AC21 /* JackNetInterface.cpp */; };
4B8693181371DD2A00D2D11B /* JackNetInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B76C7690E5AB2DB00E2AC21 /* JackNetInterface.h */; };
4B8693191371DD3B00D2D11B /* JackNetTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BA222AD60DC88268001A17F4 /* JackNetTool.cpp */; };
4B86931A1371DD4400D2D11B /* JackNetTool.h in Headers */ = {isa = PBXBuildFile; fileRef = BA222AD70DC88268001A17F4 /* JackNetTool.h */; };
4B86931B1371DD4C00D2D11B /* JackNetUnixSocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BC3B6B90E703BCC0066E42F /* JackNetUnixSocket.cpp */; };
4B8693231371DD6000D2D11B /* JackPosixThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BC3B6A20E703B2E0066E42F /* JackPosixThread.cpp */; };
4B8693251371DD7E00D2D11B /* JackResampler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B19B3120E2362E700DD4A82 /* JackResampler.cpp */; };
4B86932C1371DD9B00D2D11B /* ringbuffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 4B003AB008E2B2BA0060EFDC /* ringbuffer.c */; };
4B86934D1371DEBA00D2D11B /* JackLibSampleRateResampler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B19B30E0E2362E700DD4A82 /* JackLibSampleRateResampler.cpp */; };
4B86934E1371DEBD00D2D11B /* JackLibSampleRateResampler.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B19B30F0E2362E700DD4A82 /* JackLibSampleRateResampler.h */; };
4B88D03B11298BEE007A87C1 /* weakjack.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B88D03911298BEE007A87C1 /* weakjack.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4B88D03B11298BEE007A87C1 /* weakjack.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B88D03911298BEE007A87C1 /* weakjack.h */; settings = {ATTRIBUTES = (Public, ); }; };
4B88D03C11298BEE007A87C1 /* weakmacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B88D03A11298BEE007A87C1 /* weakmacros.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4B88D03C11298BEE007A87C1 /* weakmacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B88D03A11298BEE007A87C1 /* weakmacros.h */; settings = {ATTRIBUTES = (Public, ); }; };
4B88D03D11298BEE007A87C1 /* weakjack.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B88D03911298BEE007A87C1 /* weakjack.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4B88D03D11298BEE007A87C1 /* weakjack.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B88D03911298BEE007A87C1 /* weakjack.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -1706,6 +1725,9 @@
4B80D7E50BA0D17400F035BB /* JackMidiPort.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackMidiPort.h; path = ../common/JackMidiPort.h; sourceTree = SOURCE_ROOT; }; 4B80D7E50BA0D17400F035BB /* JackMidiPort.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackMidiPort.h; path = ../common/JackMidiPort.h; sourceTree = SOURCE_ROOT; };
4B80D7E60BA0D17400F035BB /* JackMidiPort.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackMidiPort.cpp; path = ../common/JackMidiPort.cpp; sourceTree = SOURCE_ROOT; }; 4B80D7E60BA0D17400F035BB /* JackMidiPort.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackMidiPort.cpp; path = ../common/JackMidiPort.cpp; sourceTree = SOURCE_ROOT; };
4B80D7E70BA0D17400F035BB /* JackMidiAPI.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackMidiAPI.cpp; path = ../common/JackMidiAPI.cpp; sourceTree = SOURCE_ROOT; }; 4B80D7E70BA0D17400F035BB /* JackMidiAPI.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackMidiAPI.cpp; path = ../common/JackMidiAPI.cpp; sourceTree = SOURCE_ROOT; };
4B8692DB1371DB4700D2D11B /* Jacknet.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Jacknet.framework; sourceTree = BUILT_PRODUCTS_DIR; };
4B8692DE1371DB4700D2D11B /* Jack-Info copy.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Jack-Info copy.plist"; sourceTree = "<group>"; };
4B8693151371DD0A00D2D11B /* JackNetAPI.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JackNetAPI.cpp; path = ../common/JackNetAPI.cpp; sourceTree = SOURCE_ROOT; };
4B869B3D08C8D21C001CF041 /* driver_interface.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = driver_interface.h; path = ../common/driver_interface.h; sourceTree = SOURCE_ROOT; }; 4B869B3D08C8D21C001CF041 /* driver_interface.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = driver_interface.h; path = ../common/driver_interface.h; sourceTree = SOURCE_ROOT; };
4B869B4208C8D22F001CF041 /* JackDriverLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackDriverLoader.h; path = ../common/JackDriverLoader.h; sourceTree = SOURCE_ROOT; }; 4B869B4208C8D22F001CF041 /* JackDriverLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackDriverLoader.h; path = ../common/JackDriverLoader.h; sourceTree = SOURCE_ROOT; };
4B869D7F08C9CB00001CF041 /* JackDriverLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackDriverLoader.cpp; path = ../common/JackDriverLoader.cpp; sourceTree = SOURCE_ROOT; }; 4B869D7F08C9CB00001CF041 /* JackDriverLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackDriverLoader.cpp; path = ../common/JackDriverLoader.cpp; sourceTree = SOURCE_ROOT; };
@@ -2361,6 +2383,14 @@
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
4B8692D51371DB4700D2D11B /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
4B8692D61371DB4700D2D11B /* Accelerate.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
4B8F16DF13290DC80002AD73 /* Frameworks */ = { 4B8F16DF13290DC80002AD73 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase; isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
@@ -2563,6 +2593,7 @@
0249A662FF388D9811CA2CEA /* External Frameworks and Libraries */, 0249A662FF388D9811CA2CEA /* External Frameworks and Libraries */,
1AB674ADFE9D54B511CA2CBB /* Products */, 1AB674ADFE9D54B511CA2CBB /* Products */,
4B464301076CAC7700E5077C /* Jack-Info.plist */, 4B464301076CAC7700E5077C /* Jack-Info.plist */,
4B8692DE1371DB4700D2D11B /* Jack-Info copy.plist */,
); );
name = JackServer; name = JackServer;
sourceTree = "<group>"; sourceTree = "<group>";
@@ -2687,6 +2718,7 @@
4B8F16E513290DC80002AD73 /* jack_midi_dump */, 4B8F16E513290DC80002AD73 /* jack_midi_dump */,
4B8F16F213290E0E0002AD73 /* jack_midi_dump */, 4B8F16F213290E0E0002AD73 /* jack_midi_dump */,
4B2021E6133A9BA40019E213 /* jack_midi_latency_test */, 4B2021E6133A9BA40019E213 /* jack_midi_latency_test */,
4B8692DB1371DB4700D2D11B /* Jacknet.framework */,
); );
name = Products; name = Products;
sourceTree = "<group>"; sourceTree = "<group>";
@@ -3215,6 +3247,7 @@
BA222AEA0DC88379001A17F4 /* Net */ = { BA222AEA0DC88379001A17F4 /* Net */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
4B8693151371DD0A00D2D11B /* JackNetAPI.cpp */,
4B32256310A318E300838A8E /* netsource.c */, 4B32256310A318E300838A8E /* netsource.c */,
4B3224EC10A315C400838A8E /* netjack_packet.c */, 4B3224EC10A315C400838A8E /* netjack_packet.c */,
4B3224ED10A315C400838A8E /* netjack_packet.h */, 4B3224ED10A315C400838A8E /* netjack_packet.h */,
@@ -4032,6 +4065,19 @@
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
4B8692831371DB4700D2D11B /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
4B8692FA1371DC6300D2D11B /* JackAudioAdapterInterface.h in Headers */,
4B8692FD1371DC8A00D2D11B /* JackGlobals.h in Headers */,
4B86930D1371DCB000D2D11B /* JackMachThread.h in Headers */,
4B8693181371DD2A00D2D11B /* JackNetInterface.h in Headers */,
4B86931A1371DD4400D2D11B /* JackNetTool.h in Headers */,
4B86934E1371DEBD00D2D11B /* JackLibSampleRateResampler.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
4B8F16DC13290DC80002AD73 /* Headers */ = { 4B8F16DC13290DC80002AD73 /* Headers */ = {
isa = PBXHeadersBuildPhase; isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
@@ -5561,6 +5607,25 @@
productReference = 4B699DB0097D421700A18468 /* jack_dummy.so */; productReference = 4B699DB0097D421700A18468 /* jack_dummy.so */;
productType = "com.apple.product-type.library.dynamic"; productType = "com.apple.product-type.library.dynamic";
}; };
4B8692821371DB4700D2D11B /* Jacknet.framework 64 bits */ = {
isa = PBXNativeTarget;
buildConfigurationList = 4B8692D71371DB4700D2D11B /* Build configuration list for PBXNativeTarget "Jacknet.framework 64 bits" */;
buildPhases = (
4B8692831371DB4700D2D11B /* Headers */,
4B8692B21371DB4700D2D11B /* Resources */,
4B8692B31371DB4700D2D11B /* Sources */,
4B8692D41371DB4700D2D11B /* Rez */,
4B8692D51371DB4700D2D11B /* Frameworks */,
);
buildRules = (
);
dependencies = (
);
name = "Jacknet.framework 64 bits";
productName = Jack;
productReference = 4B8692DB1371DB4700D2D11B /* Jacknet.framework */;
productType = "com.apple.product-type.framework";
};
4B8F16DB13290DC80002AD73 /* jack_midi_dump Universal */ = { 4B8F16DB13290DC80002AD73 /* jack_midi_dump Universal */ = {
isa = PBXNativeTarget; isa = PBXNativeTarget;
buildConfigurationList = 4B8F16E113290DC80002AD73 /* Build configuration list for PBXNativeTarget "jack_midi_dump Universal" */; buildConfigurationList = 4B8F16E113290DC80002AD73 /* Build configuration list for PBXNativeTarget "jack_midi_dump Universal" */;
@@ -6108,6 +6173,7 @@
4B47AC8010B5890100469C67 /* Jackmp.framework 64 bits debugging */, 4B47AC8010B5890100469C67 /* Jackmp.framework 64 bits debugging */,
4B35C4850D4731D1000DE7AE /* Jackservermp.framework 64 bits */, 4B35C4850D4731D1000DE7AE /* Jackservermp.framework 64 bits */,
4BA3393310B2E36800190E3B /* Jackservermp.framework 64 bits profiling */, 4BA3393310B2E36800190E3B /* Jackservermp.framework 64 bits profiling */,
4B8692821371DB4700D2D11B /* Jacknet.framework 64 bits */,
4B35C50A0D4731D1000DE7AE /* jack_midiseq 64 bits */, 4B35C50A0D4731D1000DE7AE /* jack_midiseq 64 bits */,
4B35C5160D4731D1000DE7AE /* jack_midisine 64 bits */, 4B35C5160D4731D1000DE7AE /* jack_midisine 64 bits */,
4B8F16E813290E0E0002AD73 /* jack_midi_dump 64 bits */, 4B8F16E813290E0E0002AD73 /* jack_midi_dump 64 bits */,
@@ -6190,6 +6256,13 @@
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
4B8692B21371DB4700D2D11B /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
4BA3397010B2E36800190E3B /* Resources */ = { 4BA3397010B2E36800190E3B /* Resources */ = {
isa = PBXResourcesBuildPhase; isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
@@ -6585,6 +6658,13 @@
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
4B8692D41371DB4700D2D11B /* Rez */ = {
isa = PBXRezBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
4B8F16E013290DC80002AD73 /* Rez */ = { 4B8F16E013290DC80002AD73 /* Rez */ = {
isa = PBXRezBuildPhase; isa = PBXRezBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
@@ -7461,6 +7541,25 @@
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
4B8692B31371DB4700D2D11B /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
4B8692F81371DC5200D2D11B /* JackAudioAdapterInterface.cpp in Sources */,
4B8692FB1371DC7100D2D11B /* JackGlobals.cpp in Sources */,
4B8692FE1371DC9700D2D11B /* JackMachThread.cpp in Sources */,
4B8693141371DCCA00D2D11B /* JackMachTime.c in Sources */,
4B8693161371DD0A00D2D11B /* JackNetAPI.cpp in Sources */,
4B8693171371DD2400D2D11B /* JackNetInterface.cpp in Sources */,
4B8693191371DD3B00D2D11B /* JackNetTool.cpp in Sources */,
4B86931B1371DD4C00D2D11B /* JackNetUnixSocket.cpp in Sources */,
4B8693231371DD6000D2D11B /* JackPosixThread.cpp in Sources */,
4B8693251371DD7E00D2D11B /* JackResampler.cpp in Sources */,
4B86932C1371DD9B00D2D11B /* ringbuffer.c in Sources */,
4B86934D1371DEBA00D2D11B /* JackLibSampleRateResampler.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
4B8F16DD13290DC80002AD73 /* Sources */ = { 4B8F16DD13290DC80002AD73 /* Sources */ = {
isa = PBXSourcesBuildPhase; isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
@@ -16087,6 +16186,203 @@
}; };
name = Default; name = Default;
}; };
4B8692D81371DB4700D2D11B /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_64_BIT_PRE_XCODE_3_1)";
ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc";
ARCHS_STANDARD_64_BIT_PRE_XCODE_3_1 = x86_64;
COPY_PHASE_STRIP = NO;
DEBUGGING_SYMBOLS = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
);
FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/build/Development\"";
FRAMEWORK_VERSION = A;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
GCC_WARN_UNKNOWN_PRAGMAS = NO;
GENERATE_PKGINFO_FILE = NO;
HEADER_SEARCH_PATHS = (
/opt/local/include,
../common,
../posix,
RPC,
../common/jack,
);
INFOPLIST_FILE = "Jack-Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LIBRARY_SEARCH_PATHS = (
/opt/local/lib,
/usr/lib/gcc/darwin/3.3,
);
OTHER_CFLAGS = (
"-DUSE_POSIX_SHM",
"-DJACK_32_64",
"-D__SMP__",
);
OTHER_CPLUSPLUSFLAGS = (
"-DSERVER_SIDE",
"-DMACH_RPC_MACH_SEMA",
"-D__SMP__",
"-DJACK_32_64",
);
OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_1 = "-DJACK_LOCATION=\\\"/usr/local/bin\\\"";
OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_2 = "-DADDON_DIR=\\\"/usr/local/lib/jackmp\\\"";
OTHER_LDFLAGS = (
/opt/local/lib/libsamplerate.a,
"-framework",
CoreAudio,
);
OTHER_REZFLAGS = "";
PRODUCT_NAME = Jacknet;
REZ_EXECUTABLE = NO;
SDKROOT = "";
SECTORDER_FLAGS = "";
WARNING_CFLAGS = "-Wmost";
ZERO_LINK = YES;
};
name = Development;
};
4B8692D91371DB4700D2D11B /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_64_BIT_PRE_XCODE_3_1)";
ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc";
ARCHS_STANDARD_64_BIT_PRE_XCODE_3_1 = x86_64;
COPY_PHASE_STRIP = YES;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
);
FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/build/Development\"";
FRAMEWORK_VERSION = A;
GCC_AUTO_VECTORIZATION = YES;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_ENABLE_SSE3_EXTENSIONS = YES;
GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS = YES;
GCC_OPTIMIZATION_LEVEL = 3;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
GCC_WARN_UNKNOWN_PRAGMAS = NO;
GENERATE_PKGINFO_FILE = NO;
HEADER_SEARCH_PATHS = (
/opt/local/include,
../common,
../posix,
RPC,
../common/jack,
);
INFOPLIST_FILE = "Jack-Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LIBRARY_SEARCH_PATHS = (
/opt/local/lib,
/usr/lib/gcc/darwin/3.3,
);
MACOSX_DEPLOYMENT_TARGET = 10.4;
OTHER_CFLAGS = (
"-DUSE_POSIX_SHM",
"-DJACK_32_64",
"-D__SMP__",
);
OTHER_CPLUSPLUSFLAGS = (
"-DSERVER_SIDE",
"-DMACH_RPC_MACH_SEMA",
"-DJACK_32_64",
"-D__SMP__",
);
OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_1 = "-DADDON_DIR=\\\"/usr/local/lib/jackmp\\\"";
OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_2 = "-DJACK_LOCATION=\\\"/usr/local/bin\\\"";
OTHER_LDFLAGS = (
/opt/local/lib/libsamplerate.a,
"-framework",
CoreAudio,
);
OTHER_REZFLAGS = "";
PRODUCT_NAME = Jacknet;
REZ_EXECUTABLE = NO;
SDKROOT = "";
SECTORDER_FLAGS = "";
WARNING_CFLAGS = "-Wmost";
ZERO_LINK = NO;
};
name = Deployment;
};
4B8692DA1371DB4700D2D11B /* Default */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = (
ppc64,
ppc,
i386,
x86_64,
);
DEBUG_INFORMATION_FORMAT = dwarf;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
);
FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/build/Development\"";
FRAMEWORK_VERSION = A;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
GCC_WARN_UNKNOWN_PRAGMAS = NO;
GENERATE_PKGINFO_FILE = NO;
HEADER_SEARCH_PATHS = (
RPC,
../common/jack,
);
INFOPLIST_FILE = "Jack-Info copy.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LIBRARY_SEARCH_PATHS = /usr/lib/gcc/darwin/3.3;
OTHER_CFLAGS = (
"-DUSE_POSIX_SHM",
"-DJACK_32_64",
"-D__SMP__",
);
OTHER_CPLUSPLUSFLAGS = (
"-DMACH_RPC_MACH_SEMA",
"-DJACK_32_64",
"-D__SMP__",
"$(OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_1)",
"$(OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_2)",
);
OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_1 = "-DJACK_LOCATION=\\\"/usr/local/bin\\\"";
OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_2 = "-DADDON_DIR=\\\"/usr/local/lib/jackmp\\\"";
OTHER_LDFLAGS = (
"-framework",
Carbon,
"-framework",
AudioToolBox,
"-framework",
CoreAudio,
);
OTHER_REZFLAGS = "";
PRODUCT_NAME = Jackmp;
REZ_EXECUTABLE = NO;
SDKROOT = "";
SECTORDER_FLAGS = "";
WARNING_CFLAGS = "-Wmost";
};
name = Default;
};
4B8F16E213290DC80002AD73 /* Development */ = { 4B8F16E213290DC80002AD73 /* Development */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
@@ -19883,6 +20179,16 @@
defaultConfigurationIsVisible = 0; defaultConfigurationIsVisible = 0;
defaultConfigurationName = Default; defaultConfigurationName = Default;
}; };
4B8692D71371DB4700D2D11B /* Build configuration list for PBXNativeTarget "Jacknet.framework 64 bits" */ = {
isa = XCConfigurationList;
buildConfigurations = (
4B8692D81371DB4700D2D11B /* Development */,
4B8692D91371DB4700D2D11B /* Deployment */,
4B8692DA1371DB4700D2D11B /* Default */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Default;
};
4B8F16E113290DC80002AD73 /* Build configuration list for PBXNativeTarget "jack_midi_dump Universal" */ = { 4B8F16E113290DC80002AD73 /* Build configuration list for PBXNativeTarget "jack_midi_dump Universal" */ = {
isa = XCConfigurationList; isa = XCConfigurationList;
buildConfigurations = ( buildConfigurations = (


+ 6
- 1
macosx/install_jackdmp View File

@@ -6,7 +6,8 @@


# Copy libraries and exe # Copy libraries and exe
sudo cp -r Jackmp.framework /Library/Frameworks/ sudo cp -r Jackmp.framework /Library/Frameworks/
sudo cp -r Jackservermp.framework /Library/Frameworks/
sudo cp -r Jackservermp.framework /Library/Frameworks/
sudo cp -r Jacknet.framework /Library/Frameworks/
sudo install -d /usr/local/bin sudo install -d /usr/local/bin
sudo cp jackdmp /usr/local/bin sudo cp jackdmp /usr/local/bin
[ -f jack_load ] && sudo cp jack_load /usr/local/bin [ -f jack_load ] && sudo cp jack_load /usr/local/bin
@@ -31,9 +32,13 @@ sudo cp jack_loopback.so /usr/local/lib/jackmp
cd /usr/local/lib && [ -f libjack.0.dylib ] && sudo mv -f libjack.0.dylib tmp_libjack.0.dylib cd /usr/local/lib && [ -f libjack.0.dylib ] && sudo mv -f libjack.0.dylib tmp_libjack.0.dylib
cd /usr/local/lib && [ -f jackd ] && sudo mv -f jackd tmp_jackd cd /usr/local/lib && [ -f jackd ] && sudo mv -f jackd tmp_jackd
cd /usr/local/lib && [ -f libjack.dylib ] && sudo rm libjack.dylib cd /usr/local/lib && [ -f libjack.dylib ] && sudo rm libjack.dylib
cd /usr/local/lib && [ -f libjacknet.dylib ] && sudo rm libjacknet.dylib
cd /usr/local/lib && [ -f libjacknet.0.dylib ] && sudo rm libjacknet.0.dylib
cd /usr/local/bin && [ -f jackd ] && sudo rm jackd cd /usr/local/bin && [ -f jackd ] && sudo rm jackd
cd /usr/local/lib && sudo ln -s /Library/Frameworks/Jackmp.framework/Jackmp libjack.dylib cd /usr/local/lib && sudo ln -s /Library/Frameworks/Jackmp.framework/Jackmp libjack.dylib
cd /usr/local/lib && sudo ln -s /Library/Frameworks/Jackmp.framework/Jackmp libjack.0.dylib cd /usr/local/lib && sudo ln -s /Library/Frameworks/Jackmp.framework/Jackmp libjack.0.dylib
cd /usr/local/lib && sudo ln -s /Library/Frameworks/Jacknet.framework/Jacknet libjacknet.dylib
cd /usr/local/lib && sudo ln -s /Library/Frameworks/Jacknet.framework/Jacknet libjacknet.0.dylib
cd /usr/local/bin && sudo ln -s jackdmp jackd cd /usr/local/bin && sudo ln -s jackdmp jackd





+ 1
- 0
macosx/remove_jackdmp View File

@@ -5,6 +5,7 @@ sudo rm -r "/usr/local/lib/jackd"
sudo rm "/usr/local/lib/libjackmp.dylib" sudo rm "/usr/local/lib/libjackmp.dylib"
sudo rm -r "/Library/Frameworks/Jackmp.framework" sudo rm -r "/Library/Frameworks/Jackmp.framework"
sudo rm -r "/Library/Frameworks/Jackservermp.framework" sudo rm -r "/Library/Frameworks/Jackservermp.framework"
sudo rm -r "/Library/Frameworks/Jacknet.framework"
sudo rm -r "/Library/Audio/Plug-Ins/HAL/JackRouter.plugin" sudo rm -r "/Library/Audio/Plug-Ins/HAL/JackRouter.plugin"


# Tries to restore jack # Tries to restore jack


Loading…
Cancel
Save