Better control of exported symbols.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2456 0c269be4-1314-0410-8aa9-9f06e86f4224

ChangeLog

@@ -15,18 +15,24 @@ Tim Blechmann
 Marc-Olivier Barre
 Nedko Arnaudov
 Fernando Lopez-Lezcano
+Romain Moret
 
 ---------------------------
   Jackdmp changes log
 ---------------------------
 
+2008-06-05 Stephane Letz  <letz@grame.fr>
+
+	* Better control of exported symbols.
+
 2008-06-04 Stephane Letz  <letz@grame.fr>
 
-	*  Use of set_threaded_log_function only when needed in RT threads.
+	* Merge of network branch.
+	* Use of set_threaded_log_function only when needed in RT threads.
 
 2008-06-02 Stephane Letz  <letz@grame.fr>
 
-	*  Tim Blechmann patch to remove unnecessary virtual methods : choice of the appropriate platform version is now done at compilation time.
+	* Tim Blechmann patch to remove unnecessary virtual methods : choice of the appropriate platform version is now done at compilation time.
 
 2008-06-02 Stephane Letz  <letz@grame.fr>
 

SConstruct

@@ -200,8 +200,8 @@ if env['DEBUG']:
 else:
     env.AppendUnique(CCFLAGS = ['-O3','-DNDEBUG'])
 
-env.AppendUnique(CCFLAGS = ['-fPIC', '-DSOCKET_RPC_FIFO_SEMA', '-D__SMP__'])
-env.AppendUnique(CFLAGS = ['-fPIC', '-DUSE_POSIX_SHM'])
+env.AppendUnique(CCFLAGS = ['-fvisibility=hidden', '-fPIC', '-DSOCKET_RPC_FIFO_SEMA', '-D__SMP__'])
+env.AppendUnique(CFLAGS = ['-fvisibility=hidden', '-fPIC', '-DUSE_POSIX_SHM'])
 
 # used for alsa midi code, probably this define should be removed
 env.AppendUnique(CFLAGS = ['-DJACKMP'])

common/JackDriverLoader.cpp

@@ -88,7 +88,7 @@ jack_print_driver_param_usage (jack_driver_desc_t * desc, unsigned long param, F
     fprintf (file, "%s\n", desc->params[param].long_desc);
 }
 
-EXPORT int
+int
 jack_parse_driver_params (jack_driver_desc_t * desc, int argc, char* argv[], JSList ** param_ptr)
 {
     struct option * long_options;
@@ -369,7 +369,7 @@ jackctl_parse_driver_params (jackctl_driver *driver_ptr, int argc, char* argv[])
     return 0;
 }
 
-EXPORT jack_driver_desc_t *
+jack_driver_desc_t *
 jack_find_driver_descriptor (JSList * drivers, const char * name)
 {
     jack_driver_desc_t * desc = 0;
@@ -486,7 +486,7 @@ jack_drivers_get_descriptor (JSList * drivers, const char * sofile)
 
 #ifdef WIN32
 
-EXPORT JSList *
+JSList *
 jack_drivers_load (JSList * drivers) {
     char * driver_dir;
     char driver_dir_storage[512];

common/JackDriverLoader.h

@@ -54,13 +54,11 @@ typedef struct _jack_driver_info
 }
 jack_driver_info_t;
 
-EXPORT jack_driver_desc_t * jack_find_driver_descriptor (JSList * drivers, const char * name);
+jack_driver_desc_t * jack_find_driver_descriptor (JSList * drivers, const char * name);
 jack_driver_desc_t * jack_drivers_get_descriptor (JSList * drivers, const char * sofile);
-
-EXPORT JSList * jack_drivers_load (JSList * drivers);
+JSList * jack_drivers_load (JSList * drivers);
 jack_driver_info_t * jack_load_driver (jack_driver_desc_t * driver_desc);
-
-EXPORT int jack_parse_driver_params (jack_driver_desc_t * desc, int argc, char* argv[], JSList ** param_ptr);
+int jack_parse_driver_params (jack_driver_desc_t * desc, int argc, char* argv[], JSList ** param_ptr);
 EXPORT int jackctl_parse_driver_params (jackctl_driver *driver_ptr, int argc, char* argv[]);
 
 #endif

common/JackDummyDriver.cpp

@@ -27,6 +27,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include "JackGraphManager.h"
 #include "JackDriverLoader.h"
 #include "JackThreadedDriver.h"
+#include "JackExports.h"
 #include <iostream>
 #include <unistd.h>
 
@@ -77,7 +78,7 @@ extern "C"
 {
 #endif
 
-    jack_driver_desc_t * driver_get_descriptor () {
+    EXPORT jack_driver_desc_t * driver_get_descriptor () {
         jack_driver_desc_t * desc;
         unsigned int i;
 
@@ -138,7 +139,7 @@ extern "C"
         return desc;
     }
 
-    Jack::JackDriverClientInterface* driver_initialize(Jack::JackLockedEngine* engine, Jack::JackSynchro* table, const JSList* params) {
+    EXPORT Jack::JackDriverClientInterface* driver_initialize(Jack::JackLockedEngine* engine, Jack::JackSynchro* table, const JSList* params) {
         jack_nframes_t sample_rate = 48000;
         jack_nframes_t period_size = 1024;
         unsigned int capture_ports = 2;

common/JackEngine.h

@@ -38,7 +38,7 @@ class JackExternalClient;
 \brief Engine description.
 */
 
-class JackEngine 
+class EXPORT JackEngine 
 {
     private:
 

common/JackEngineControl.h

@@ -65,7 +65,7 @@ struct JackTimingMeasure
 \brief Engine control in shared memory.
 */
 
-struct JackEngineControl : public JackShmMem
+struct EXPORT JackEngineControl : public JackShmMem
 {
     // Shared state
     jack_nframes_t fBufferSize;

common/JackError.cpp

@@ -132,5 +132,5 @@ static void default_jack_info_callback (const char *desc)
     fflush(stdout);
 }
 
-void (*jack_error_callback)(const char *desc) = &default_jack_error_callback;
-void (*jack_info_callback)(const char *desc) = &default_jack_info_callback;
+EXPORT void (*jack_error_callback)(const char *desc) = &default_jack_error_callback;
+EXPORT void (*jack_info_callback)(const char *desc) = &default_jack_info_callback;

common/JackError.h

@@ -44,8 +44,8 @@ extern "C"
     // like jack_info() but only if verbose mode is enabled
     EXPORT void jack_log(const char *fmt, ...);
 
-    extern void (*jack_error_callback)(const char *desc);
-    extern void (*jack_info_callback)(const char *desc);
+    EXPORT extern void (*jack_error_callback)(const char *desc);
+    EXPORT extern void (*jack_info_callback)(const char *desc);
 
     typedef void (* jack_log_function_t)(int level, const char *message);
 

common/JackExports.h

@@ -23,7 +23,7 @@ This program is free software; you can redistribute it and/or modify
 #ifdef WIN32
 #define	EXPORT __declspec(dllexport)
 #else
-#define	EXPORT
+#define	EXPORT __attribute__ ((visibility("default")))
 #endif
 
 #endif

common/JackFifo.h

@@ -21,6 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #define __JackFifo__
 
 #include "JackSynchro.h"
+#include "JackExports.h"
 #include <assert.h>
 #include <stdio.h>
 #include <poll.h>
@@ -32,7 +33,7 @@ namespace Jack
 \brief Inter process synchronization using Fifo.
 */
 
-class JackFifo : public detail::JackSynchro
+class EXPORT JackFifo : public detail::JackSynchro
 {
 
     private:

common/JackFrameTimer.h

@@ -22,6 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #define __JackFrameTimer__
 
 #include "JackAtomicState.h"
+#include "JackExports.h"
 #include "types.h"
 
 namespace Jack
@@ -31,7 +32,7 @@ namespace Jack
 \brief A structure used for time management.
 */
 
-struct JackTimer
+struct EXPORT JackTimer
 {
     jack_nframes_t fFrames;
     jack_time_t	fCurrentWakeup;

common/JackGlobals.cpp

@@ -22,7 +22,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #endif
 
 #include "JackGlobals.h"
-#include "JackError.h"
 
 static bool gKeyRealtimeInitialized = false;
 static bool g_key_log_function_initialized = false;
@@ -30,7 +29,8 @@ static bool g_key_log_function_initialized = false;
 jack_tls_key gRealTime;
 jack_tls_key g_key_log_function;
 
-void jack_init()
+__attribute__ ((constructor))
+static void jack_init()
 {
     if (!gKeyRealtimeInitialized) {
         gKeyRealtimeInitialized = jack_tls_allocate_key(&gRealTime);
@@ -40,7 +40,8 @@ void jack_init()
         g_key_log_function_initialized = jack_tls_allocate_key(&g_key_log_function);
 }
 
-void jack_uninit()
+__attribute__ ((destructor))
+static void jack_uninit()
 {
     if (gKeyRealtimeInitialized) {
         jack_tls_free_key(gRealTime);
@@ -57,6 +58,11 @@ void jack_uninit()
 
 #ifdef WIN32
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 BOOL WINAPI DllEntryPoint(HINSTANCE  hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
     switch (fdwReason) {
@@ -70,4 +76,8 @@ BOOL WINAPI DllEntryPoint(HINSTANCE  hinstDLL, DWORD fdwReason, LPVOID lpvReserv
     return TRUE;
 }
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

common/JackGlobals.h

@@ -20,36 +20,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #ifndef __JackGlobals__
 #define __JackGlobals__
 
-#include "JackError.h"
-#include "JackExports.h"
-
-#include "JackPlatformSynchro.h"
-#include "JackPlatformProcessSync.h"
 #include "JackPlatformThread.h"
 
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 extern jack_tls_key gRealTime;
 extern jack_tls_key g_key_log_function;
 
-#ifdef WIN32
-
-EXPORT void jack_init();
-EXPORT void jack_uninit();
-
-#else
-
-void __attribute__ ((constructor)) jack_init();
-void __attribute__ ((destructor)) jack_uninit();
-
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
 #endif

common/JackGraphManager.h

@@ -35,7 +35,7 @@ namespace Jack
 \brief Graph manager: contains the connection manager and the port array.
 */
     
-class JackGraphManager : public JackShmMem, public JackAtomicState<JackConnectionManager>
+class EXPORT JackGraphManager : public JackShmMem, public JackAtomicState<JackConnectionManager>
 {
 
     private:

common/JackLibAPI.cpp

@@ -28,16 +28,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #include "JackLibGlobals.h"
 #include "JackGlobals.h"
 #include "JackServerLaunch.h"
+#include "JackExports.h"
 #include "JackTools.h"
 
 using namespace Jack;
 
-#ifdef WIN32
-#define	EXPORT __declspec(dllexport)
-#else
-#define	EXPORT
-#endif
-
 #ifdef __cplusplus
 extern "C"
 {

common/JackLockedEngine.h

@@ -30,7 +30,7 @@ namespace Jack
 \brief Locked Engine.
 */
 
-class JackLockedEngine : public JackLockAble
+class EXPORT JackLockedEngine : public JackLockAble
 {
     private:
 

common/JackNetDriver.cpp

@@ -26,6 +26,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include "JackDriverLoader.h"
 #include "JackThreadedDriver.h"
 #include "JackException.h"
+#include "JackExports.h"
 
 #define DEFAULT_MULTICAST_IP "225.3.19.154"
 #define DEFAULT_PORT 19000
@@ -571,7 +572,7 @@ namespace Jack
 	extern "C"
 	{
 #endif
-		jack_driver_desc_t* driver_get_descriptor ()
+		EXPORT jack_driver_desc_t* driver_get_descriptor ()
 		{
 			jack_driver_desc_t* desc = ( jack_driver_desc_t* ) calloc ( 1, sizeof ( jack_driver_desc_t ) );
 			strcpy ( desc->name, "net" );
@@ -637,7 +638,7 @@ namespace Jack
 			return desc;
 		}
 
-		Jack::JackDriverClientInterface* driver_initialize ( Jack::JackLockedEngine* engine, Jack::JackSynchro* table, const JSList* params )
+		EXPORT Jack::JackDriverClientInterface* driver_initialize ( Jack::JackLockedEngine* engine, Jack::JackSynchro* table, const JSList* params )
 		{
 			const char* multicast_ip = DEFAULT_MULTICAST_IP;
 			char name[JACK_CLIENT_NAME_SIZE];

common/JackNetTool.cpp

@@ -127,7 +127,7 @@ namespace Jack
 
 // SessionParams ************************************************************************************
 
-	void SessionParamsHToN ( session_params_t* params )
+	EXPORT void SessionParamsHToN ( session_params_t* params )
 	{
 		params->fPacketID = htonl ( params->fPacketID );
 		params->fMtu = htonl ( params->fMtu );
@@ -142,7 +142,7 @@ namespace Jack
 		params->fBitdepth = htonl ( params->fBitdepth );
 	}
 
-	void SessionParamsNToH ( session_params_t* params )
+	EXPORT void SessionParamsNToH ( session_params_t* params )
 	{
 		params->fPacketID = ntohl ( params->fPacketID );
 		params->fMtu = ntohl ( params->fMtu );
@@ -157,7 +157,7 @@ namespace Jack
 		params->fBitdepth = ntohl ( params->fBitdepth );
 	}
 
-	void SessionParamsDisplay ( session_params_t* params )
+	EXPORT void SessionParamsDisplay ( session_params_t* params )
 	{
 		jack_info ( "********************Params********************" );
 		jack_info ( "Protocol revision : %c", params->fProtocolVersion );
@@ -176,7 +176,7 @@ namespace Jack
 		jack_info ( "**********************************************" );
 	}
 
-	sync_packet_type_t GetPacketType ( session_params_t* params )
+	EXPORT sync_packet_type_t GetPacketType ( session_params_t* params )
 	{
 		switch ( params->fPacketID )
 		{
@@ -194,7 +194,7 @@ namespace Jack
 		return INVALID;
 	}
 
-	int SetPacketType ( session_params_t* params, sync_packet_type_t packet_type )
+	EXPORT int SetPacketType ( session_params_t* params, sync_packet_type_t packet_type )
 	{
 		switch ( packet_type )
 		{
@@ -220,7 +220,7 @@ namespace Jack
 
 // Packet header **********************************************************************************
 
-	void PacketHeaderHToN ( packet_header_t* header )
+	EXPORT void PacketHeaderHToN ( packet_header_t* header )
 	{
 		header->fID = htonl ( header->fID );
 		header->fMidiDataSize = htonl ( header->fMidiDataSize );
@@ -230,7 +230,7 @@ namespace Jack
 		header->fSubCycle = htonl ( header->fSubCycle );
 	}
 
-	void PacketHeaderNToH ( packet_header_t* header )
+	EXPORT void PacketHeaderNToH ( packet_header_t* header )
 	{
 		header->fID = ntohl ( header->fID );
 		header->fMidiDataSize = ntohl ( header->fMidiDataSize );
@@ -240,7 +240,7 @@ namespace Jack
 		header->fSubCycle = ntohl ( header->fSubCycle );
 	}
 
-	void PacketHeaderDisplay ( packet_header_t* header )
+	EXPORT void PacketHeaderDisplay ( packet_header_t* header )
 	{
 		jack_info ( "********************Header********************" );
 		jack_info ( "Data type : %c", header->fDataType );
@@ -257,7 +257,7 @@ namespace Jack
 
 // Utility *******************************************************************************************************
 
-	size_t SetFramesPerPacket ( session_params_t* params )
+	EXPORT size_t SetFramesPerPacket ( session_params_t* params )
 	{
 		if ( !params->fSendAudioChannels && !params->fReturnAudioChannels )
 			return ( params->fFramesPerPacket = params->fPeriodSize );
@@ -267,7 +267,7 @@ namespace Jack
 		return params->fFramesPerPacket;
 	}
 
-	size_t GetNMidiPckt ( session_params_t* params, size_t data_size )
+	EXPORT size_t GetNMidiPckt ( session_params_t* params, size_t data_size )
 	{
 		//even if there is no midi data, jack need an empty buffer to know there is no event to read
 		//99% of the cases : all data in one packet
@@ -280,7 +280,7 @@ namespace Jack
 		return npckt;
 	}
 
-	int SetRxTimeout ( int* sockfd, session_params_t* params )
+	EXPORT int SetRxTimeout ( int* sockfd, session_params_t* params )
 	{
 		int ret;
 		struct timeval timeout;
@@ -295,7 +295,7 @@ namespace Jack
 
 // Packet *******************************************************************************************************
 
-	bool IsNextPacket ( packet_header_t* previous, packet_header_t* next, size_t subcycles )
+	EXPORT bool IsNextPacket ( packet_header_t* previous, packet_header_t* next, size_t subcycles )
 	{
 		//ignore first cycle
 		if ( previous->fCycle <= 1 )

common/JackNetTool.h

@@ -2,6 +2,7 @@
 #include "types.h"
 #include "JackConstants.h"
 #include "JackMidiPort.h"
+#include "JackExports.h"
 
 #include <string>
 #include <algorithm>
@@ -101,7 +102,7 @@ namespace Jack
 
 //midi data ***********************************************************************************
 
-	class NetMidiBuffer
+	class EXPORT NetMidiBuffer
 	{
 		private:
 			int fNPorts;
@@ -130,7 +131,7 @@ namespace Jack
 
 // audio data *********************************************************************************
 
-	class NetAudioBuffer
+	class EXPORT NetAudioBuffer
 	{
 		private:
 			int fNPorts;
@@ -153,24 +154,24 @@ namespace Jack
 //utility *************************************************************************************
 
 	//n<-->h functions
-	void SessionParamsHToN ( session_params_t* params );
-	void SessionParamsNToH ( session_params_t* params );
-	void PacketHeaderHToN ( packet_header_t* header );
-	void PacketHeaderNToH ( packet_header_t* header );
+	EXPORT void SessionParamsHToN ( session_params_t* params );
+	EXPORT void SessionParamsNToH ( session_params_t* params );
+	EXPORT void PacketHeaderHToN ( packet_header_t* header );
+	EXPORT void PacketHeaderNToH ( packet_header_t* header );
 	//display session parameters
-	void SessionParamsDisplay ( session_params_t* params );
+	EXPORT void SessionParamsDisplay ( session_params_t* params );
 	//display packet header
-	void PacketHeaderDisplay ( packet_header_t* header );
+	EXPORT void PacketHeaderDisplay ( packet_header_t* header );
 	//get the packet type from a sesion parameters
-	sync_packet_type_t GetPacketType ( session_params_t* params );
+	EXPORT sync_packet_type_t GetPacketType ( session_params_t* params );
 	//set the packet type in a session parameters
-	int SetPacketType ( session_params_t* params, sync_packet_type_t packet_type );
+	EXPORT int SetPacketType ( session_params_t* params, sync_packet_type_t packet_type );
 	//step of network initialization
-	size_t SetFramesPerPacket ( session_params_t* params );
+	EXPORT size_t SetFramesPerPacket ( session_params_t* params );
 	//get the midi packet number for a given cycle
-	size_t GetNMidiPckt ( session_params_t* params, size_t data_size );
+	EXPORT size_t GetNMidiPckt ( session_params_t* params, size_t data_size );
 	//set the recv timeout on a socket
-	int SetRxTimeout ( int* sockfd, session_params_t* params );
+	EXPORT int SetRxTimeout ( int* sockfd, session_params_t* params );
 	//check if 'next' packet is really the next after 'previous'
-	bool IsNextPacket ( packet_header_t* previous, packet_header_t* next, size_t subcycles );
+	EXPORT bool IsNextPacket ( packet_header_t* previous, packet_header_t* next, size_t subcycles );
 }

common/JackPort.h

@@ -23,6 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 #include "types.h"
 #include "JackConstants.h"
+#include "JackExports.h"
 
 namespace Jack
 {
@@ -34,7 +35,7 @@ namespace Jack
 \brief Base class for port.
 */
 
-class JackPort
+class EXPORT JackPort
 {
 
         friend class JackGraphManager;

common/JackPosixSemaphore.h

@@ -21,6 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #define __JackPosixSemaphore__
 
 #include "JackSynchro.h"
+#include "JackExports.h"
 #include <semaphore.h>
 #include <time.h>
 #include <stdio.h>
@@ -33,7 +34,7 @@ namespace Jack
 \brief Inter process synchronization using POSIX semaphore.
 */
 
-class JackPosixSemaphore : public detail::JackSynchro
+class EXPORT JackPosixSemaphore : public detail::JackSynchro
 {
 
     private:

common/JackPosixThread.cpp

@@ -237,7 +237,7 @@ void JackPosixThread::Terminate()
 
 } // end of namespace
 
-bool jack_tls_allocate_key(jack_tls_key *key_ptr)
+EXPORT bool jack_tls_allocate_key(jack_tls_key *key_ptr)
 {
     int ret;
     
@@ -251,7 +251,7 @@ bool jack_tls_allocate_key(jack_tls_key *key_ptr)
     return true;
 }
 
-bool jack_tls_free_key(jack_tls_key key)
+EXPORT bool jack_tls_free_key(jack_tls_key key)
 {
     int ret;
     
@@ -265,7 +265,7 @@ bool jack_tls_free_key(jack_tls_key key)
     return true;
 }
 
-bool jack_tls_set(jack_tls_key key, void *data_ptr)
+EXPORT bool jack_tls_set(jack_tls_key key, void *data_ptr)
 {
     int ret;
     
@@ -279,7 +279,7 @@ bool jack_tls_set(jack_tls_key key, void *data_ptr)
     return true;
 }
 
-void *jack_tls_get(jack_tls_key key)
+EXPORT void *jack_tls_get(jack_tls_key key)
 {
     return pthread_getspecific(key);
 }

common/JackPosixThread.h

@@ -35,7 +35,7 @@ namespace Jack
 \brief The POSIX thread base class.
 */
 
-class JackPosixThread : public detail::JackThread
+class EXPORT JackPosixThread : public detail::JackThread
 {
 
     protected:

common/JackSocketClientChannel.h

@@ -24,6 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #include "JackSocket.h"
 #include "JackPlatformThread.h"
 #include "JackRequest.h"
+#include "JackError.h"
 
 namespace Jack
 {

common/JackThread.h

@@ -21,6 +21,8 @@
 #ifndef __JackThread__
 #define __JackThread__
 
+#include "JackExports.h"
+
 #ifdef WIN32
 #include <windows.h>
 typedef HANDLE pthread_t;
@@ -106,10 +108,10 @@ typedef DWORD jack_tls_key;
 typedef pthread_key_t jack_tls_key;
 #endif
 
-bool jack_tls_allocate_key(jack_tls_key *key_ptr);
-bool jack_tls_free_key(jack_tls_key key);
+EXPORT bool jack_tls_allocate_key(jack_tls_key *key_ptr);
+EXPORT bool jack_tls_free_key(jack_tls_key key);
 
-bool jack_tls_set(jack_tls_key key, void *data_ptr);
-void *jack_tls_get(jack_tls_key key);
+EXPORT bool jack_tls_set(jack_tls_key key, void *data_ptr);
+EXPORT void *jack_tls_get(jack_tls_key key);
 
 #endif

common/JackThreadedDriver.h

@@ -31,7 +31,7 @@ namespace Jack
 \brief The base class for threaded drivers. Threaded drivers are used with blocking devices.
 */
 
-class JackThreadedDriver : public JackDriverClientInterface, public JackRunnableInterface
+class EXPORT JackThreadedDriver : public JackDriverClientInterface, public JackRunnableInterface
 {
 
     protected:
@@ -148,7 +148,7 @@ class JackThreadedDriver : public JackDriverClientInterface, public JackRunnable
 
 };
 
-class JackRestartThreadedDriver : public JackThreadedDriver
+class EXPORT JackRestartThreadedDriver : public JackThreadedDriver
 {
      public:
 

common/JackTime.h

@@ -35,7 +35,7 @@ extern "C"
 #include <mach/mach_time.h>
 #include <unistd.h>
 
-    extern double __jack_time_ratio;
+    extern EXPORT double __jack_time_ratio;
 
     static inline jack_time_t GetMicroSeconds(void) {
         return (jack_time_t) (mach_absolute_time () * __jack_time_ratio);

common/jack/ringbuffer.h

@@ -21,6 +21,8 @@
 #ifndef _RINGBUFFER_H
 #define _RINGBUFFER_H
 
+#include "JackExports.h"
+
 #ifdef __cplusplus
 extern "C"
 {
@@ -68,7 +70,7 @@ extern "C"
      * @return a pointer to a new jack_ringbuffer_t, if successful; NULL
      * otherwise.
      */
-    jack_ringbuffer_t *jack_ringbuffer_create(size_t sz);
+    EXPORT jack_ringbuffer_t *jack_ringbuffer_create(size_t sz);
 
     /**
      * Frees the ringbuffer data structure allocated by an earlier call to
@@ -76,7 +78,7 @@ extern "C"
      *
      * @param rb a pointer to the ringbuffer structure.
      */
-    void jack_ringbuffer_free(jack_ringbuffer_t *rb);
+    EXPORT void jack_ringbuffer_free(jack_ringbuffer_t *rb);
 
     /**
      * Fill a data structure with a description of the current readable
@@ -98,7 +100,7 @@ extern "C"
      * @param vec a pointer to a 2 element array of jack_ringbuffer_data_t.
      *
      */
-    void jack_ringbuffer_get_read_vector(const jack_ringbuffer_t *rb,
+    EXPORT void jack_ringbuffer_get_read_vector(const jack_ringbuffer_t *rb,
                                          jack_ringbuffer_data_t *vec);
 
     /**
@@ -120,7 +122,7 @@ extern "C"
      * @param rb a pointer to the ringbuffer structure.
      * @param vec a pointer to a 2 element array of jack_ringbuffer_data_t.
      */
-    void jack_ringbuffer_get_write_vector(const jack_ringbuffer_t *rb,
+    EXPORT void jack_ringbuffer_get_write_vector(const jack_ringbuffer_t *rb,
                                           jack_ringbuffer_data_t *vec);
 
     /**
@@ -133,7 +135,7 @@ extern "C"
      *
      * @return the number of bytes read, which may range from 0 to cnt.
      */
-    size_t jack_ringbuffer_read(jack_ringbuffer_t *rb, char *dest, size_t cnt);
+    EXPORT size_t jack_ringbuffer_read(jack_ringbuffer_t *rb, char *dest, size_t cnt);
 
     /**
      * Read data from the ringbuffer. Opposed to jack_ringbuffer_read()
@@ -150,7 +152,7 @@ extern "C"
      *
      * @return the number of bytes read, which may range from 0 to cnt.
      */
-    size_t jack_ringbuffer_peek(jack_ringbuffer_t *rb, char *dest, size_t cnt);
+    EXPORT size_t jack_ringbuffer_peek(jack_ringbuffer_t *rb, char *dest, size_t cnt);
 
     /**
      * Advance the read pointer.
@@ -163,7 +165,7 @@ extern "C"
      * @param rb a pointer to the ringbuffer structure.
      * @param cnt the number of bytes read.
      */
-    void jack_ringbuffer_read_advance(jack_ringbuffer_t *rb, size_t cnt);
+    EXPORT void jack_ringbuffer_read_advance(jack_ringbuffer_t *rb, size_t cnt);
 
     /**
      * Return the number of bytes available for reading.
@@ -172,7 +174,7 @@ extern "C"
      *
      * @return the number of bytes available to read.
      */
-    size_t jack_ringbuffer_read_space(const jack_ringbuffer_t *rb);
+    EXPORT size_t jack_ringbuffer_read_space(const jack_ringbuffer_t *rb);
 
     /**
      * Lock a ringbuffer data block into memory.
@@ -181,7 +183,7 @@ extern "C"
      *
      * @param rb a pointer to the ringbuffer structure.
      */
-    int jack_ringbuffer_mlock(jack_ringbuffer_t *rb);
+    EXPORT int jack_ringbuffer_mlock(jack_ringbuffer_t *rb);
 
     /**
      * Reset the read and write pointers, making an empty buffer.
@@ -190,7 +192,7 @@ extern "C"
      *
      * @param rb a pointer to the ringbuffer structure.
      */
-    void jack_ringbuffer_reset(jack_ringbuffer_t *rb);
+    EXPORT void jack_ringbuffer_reset(jack_ringbuffer_t *rb);
 
     /**
      * Write data into the ringbuffer.
@@ -201,7 +203,7 @@ extern "C"
      *
      * @return the number of bytes write, which may range from 0 to cnt
      */
-    size_t jack_ringbuffer_write(jack_ringbuffer_t *rb, const char *src,
+    EXPORT size_t jack_ringbuffer_write(jack_ringbuffer_t *rb, const char *src,
                                  size_t cnt);
 
     /**
@@ -215,7 +217,7 @@ extern "C"
      * @param rb a pointer to the ringbuffer structure.
      * @param cnt the number of bytes written.
      */
-    void jack_ringbuffer_write_advance(jack_ringbuffer_t *rb, size_t cnt);
+    EXPORT void jack_ringbuffer_write_advance(jack_ringbuffer_t *rb, size_t cnt);
 
     /**
      * Return the number of bytes available for writing.
@@ -224,8 +226,7 @@ extern "C"
      *
      * @return the amount of free space (in bytes) available for writing.
      */
-    size_t jack_ringbuffer_write_space(const jack_ringbuffer_t *rb);
-
+    EXPORT size_t jack_ringbuffer_write_space(const jack_ringbuffer_t *rb);
 
 #ifdef __cplusplus
 }

common/ringbuffer.c

@@ -34,7 +34,7 @@
 /* Create a new ringbuffer to hold at least `sz' bytes of data. The
    actual buffer size is rounded up to the next power of two.  */
 
-jack_ringbuffer_t *
+EXPORT jack_ringbuffer_t *
 jack_ringbuffer_create (size_t sz)
 {
   int power_of_two;
@@ -58,7 +58,7 @@ jack_ringbuffer_create (size_t sz)
 
 /* Free all data associated with the ringbuffer `rb'. */
 
-void
+EXPORT void
 jack_ringbuffer_free (jack_ringbuffer_t * rb)
 {
 #ifdef USE_MLOCK
@@ -72,7 +72,7 @@ jack_ringbuffer_free (jack_ringbuffer_t * rb)
 
 /* Lock the data block of `rb' using the system call 'mlock'.  */
 
-int
+EXPORT int
 jack_ringbuffer_mlock (jack_ringbuffer_t * rb)
 {
 #ifdef USE_MLOCK
@@ -87,7 +87,7 @@ jack_ringbuffer_mlock (jack_ringbuffer_t * rb)
 /* Reset the read and write pointers to zero. This is not thread
    safe. */
 
-void
+EXPORT void
 jack_ringbuffer_reset (jack_ringbuffer_t * rb)
 {
   rb->read_ptr = 0;
@@ -98,7 +98,7 @@ jack_ringbuffer_reset (jack_ringbuffer_t * rb)
    number of bytes in front of the read pointer and behind the write
    pointer.  */
 
-size_t
+EXPORT size_t
 jack_ringbuffer_read_space (const jack_ringbuffer_t * rb)
 {
   size_t w, r;
@@ -117,7 +117,7 @@ jack_ringbuffer_read_space (const jack_ringbuffer_t * rb)
    number of bytes in front of the write pointer and behind the read
    pointer.  */
 
-size_t
+EXPORT size_t
 jack_ringbuffer_write_space (const jack_ringbuffer_t * rb)
 {
   size_t w, r;
@@ -137,7 +137,7 @@ jack_ringbuffer_write_space (const jack_ringbuffer_t * rb)
 /* The copying data reader.  Copy at most `cnt' bytes from `rb' to
    `dest'.  Returns the actual number of bytes copied. */
 
-size_t
+EXPORT size_t
 jack_ringbuffer_read (jack_ringbuffer_t * rb, char *dest, size_t cnt)
 {
   size_t free_cnt;
@@ -178,7 +178,7 @@ jack_ringbuffer_read (jack_ringbuffer_t * rb, char *dest, size_t cnt)
    `cnt' bytes from `rb' to `dest'.  Returns the actual number of bytes 
 copied. */
 
-size_t
+EXPORT size_t
 jack_ringbuffer_peek (jack_ringbuffer_t * rb, char *dest, size_t cnt)
 {
   size_t free_cnt;
@@ -221,7 +221,7 @@ jack_ringbuffer_peek (jack_ringbuffer_t * rb, char *dest, size_t cnt)
 /* The copying data writer.  Copy at most `cnt' bytes to `rb' from
    `src'.  Returns the actual number of bytes copied. */
 
-size_t
+EXPORT size_t
 jack_ringbuffer_write (jack_ringbuffer_t * rb, const char *src, size_t cnt)
 {
   size_t free_cnt;
@@ -260,7 +260,7 @@ jack_ringbuffer_write (jack_ringbuffer_t * rb, const char *src, size_t cnt)
 
 /* Advance the read pointer `cnt' places. */
 
-void
+EXPORT void
 jack_ringbuffer_read_advance (jack_ringbuffer_t * rb, size_t cnt)
 {
   rb->read_ptr += cnt;
@@ -269,7 +269,7 @@ jack_ringbuffer_read_advance (jack_ringbuffer_t * rb, size_t cnt)
 
 /* Advance the write pointer `cnt' places. */
 
-void
+EXPORT void
 jack_ringbuffer_write_advance (jack_ringbuffer_t * rb, size_t cnt)
 {
   rb->write_ptr += cnt;
@@ -281,7 +281,7 @@ jack_ringbuffer_write_advance (jack_ringbuffer_t * rb, size_t cnt)
    the readable data is in one segment the second segment has zero
    length.  */
 
-void
+EXPORT void
 jack_ringbuffer_get_read_vector (const jack_ringbuffer_t * rb,
 				 jack_ringbuffer_data_t * vec)
 {
@@ -325,7 +325,7 @@ jack_ringbuffer_get_read_vector (const jack_ringbuffer_t * rb,
    the writeable data is in one segment the second segment has zero
    length.  */
 
-void
+EXPORT void
 jack_ringbuffer_get_write_vector (const jack_ringbuffer_t * rb,
 				  jack_ringbuffer_data_t * vec)
 {

common/shm.c

@@ -426,7 +426,7 @@ jack_release_shm_info (jack_shm_registry_index_t index)
  *	   ENOSPC if server registration limit reached
  *	   ENOMEM if unable to access shared memory registry
  */
-EXPORT int
+int
 jack_register_server (const char *server_name, int new_registry)
 {
 	int i, res = 0;
@@ -496,7 +496,7 @@ jack_register_server (const char *server_name, int new_registry)
 }
 
 /* release server_name registration */
-EXPORT void
+void
 jack_unregister_server (const char *server_name /* unused */)
 {
 	int i;
@@ -520,7 +520,7 @@ jack_unregister_server (const char *server_name /* unused */)
 }
 
 /* called for server startup and termination */
-EXPORT int
+int
 jack_cleanup_shm ()
 {
 	int i;

common/shm.h

@@ -123,32 +123,30 @@ extern "C"
     jack_shm_info_t;
 
     /* utility functions used only within JACK */
-
-    extern void jack_shm_copy_from_registry (jack_shm_info_t*,
+      
+    void jack_shm_copy_from_registry (jack_shm_info_t*,
                 jack_shm_registry_index_t);
-    extern void jack_shm_copy_to_registry (jack_shm_info_t*,
+    void jack_shm_copy_to_registry (jack_shm_info_t*,
                                                jack_shm_registry_index_t*);
-    extern void jack_release_shm_info (jack_shm_registry_index_t);
-
-    extern char* jack_shm_addr (jack_shm_info_t* si);  // steph
-
-    /* here beginneth the API */
+    void jack_release_shm_info (jack_shm_registry_index_t);
+    char* jack_shm_addr (jack_shm_info_t* si);  // steph
 
-    EXPORT extern int jack_register_server (const char *server_name, int new_registry);
-    EXPORT extern void jack_unregister_server (const char *server_name);
+    // here begin the API 
+    int jack_register_server (const char *server_name, int new_registry);
+    void jack_unregister_server (const char *server_name);
 
-    extern int jack_initialize_shm (const char *server_name);
-    extern int jack_initialize_shm_server (void);  // steph
-    extern int jack_initialize_shm_client (void);  // steph
-    EXPORT extern int jack_cleanup_shm (void);
+    int jack_initialize_shm (const char *server_name);
+    int jack_initialize_shm_server (void);  // steph
+    int jack_initialize_shm_client (void);  // steph
+    int jack_cleanup_shm (void);
 
-    extern int jack_shmalloc (const char *shm_name, jack_shmsize_t size,
+    int jack_shmalloc (const char *shm_name, jack_shmsize_t size,
                                   jack_shm_info_t* result);
-    extern void jack_release_shm (jack_shm_info_t*);
-    extern void jack_destroy_shm (jack_shm_info_t*);
-    extern int jack_attach_shm (jack_shm_info_t*);
-    extern int jack_attach_shm_read (jack_shm_info_t*); // steph
-    extern int jack_resize_shm (jack_shm_info_t*, jack_shmsize_t size);
+    void jack_release_shm (jack_shm_info_t*);
+    void jack_destroy_shm (jack_shm_info_t*);
+    int jack_attach_shm (jack_shm_info_t*);
+    int jack_attach_shm_read (jack_shm_info_t*); // steph
+    int jack_resize_shm (jack_shm_info_t*, jack_shmsize_t size);
 
 #ifdef __cplusplus
 }

linux/alsa/JackAlsaDriver.cpp

@@ -53,6 +53,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include "memops.h"
 
 #include "JackPosixThread.h"
+#include "JackExports.h"
 
 namespace Jack
 {
@@ -2435,7 +2436,7 @@ extern "C"
         return 0;
     }
 
-    const jack_driver_desc_t* driver_get_descriptor () {
+    EXPORT const jack_driver_desc_t* driver_get_descriptor () {
         jack_driver_desc_t * desc;
         jack_driver_param_desc_t * params;
         unsigned int i;
@@ -2608,7 +2609,7 @@ extern "C"
         return desc;
     }
 
-    Jack::JackDriverClientInterface* driver_initialize(Jack::JackLockedEngine* engine, Jack::JackSynchro* table, const JSList* params) {
+    EXPORT Jack::JackDriverClientInterface* driver_initialize(Jack::JackLockedEngine* engine, Jack::JackSynchro* table, const JSList* params) {
         jack_nframes_t srate = 48000;
         jack_nframes_t frames_per_interrupt = 1024;
         unsigned long user_nperiods = 2;

linux/firewire/JackFFADODriver.cpp

@@ -44,6 +44,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include "JackClientControl.h"
 #include "JackPort.h"
 #include "JackGraphManager.h"
+#include "JackExports.h"
 
 namespace Jack
 {
@@ -808,7 +809,7 @@ extern "C"
 {
 #endif
 
-    const jack_driver_desc_t *
+    EXPORT const jack_driver_desc_t *
     driver_get_descriptor () {
         jack_driver_desc_t * desc;
         jack_driver_param_desc_t * params;
@@ -913,7 +914,7 @@ extern "C"
         return desc;
     }
 
-    Jack::JackDriverClientInterface* driver_initialize(Jack::JackLockedEngine* engine, Jack::JackSynchro* table, const JSList* params) {
+    EXPORT Jack::JackDriverClientInterface* driver_initialize(Jack::JackLockedEngine* engine, Jack::JackSynchro* table, const JSList* params) {
         const JSList * node;
         const jack_driver_param_t * param;
 

macosx/JackCoreAudioDriver.cpp

@@ -29,6 +29,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include "JackClientControl.h"
 #include "JackDriverLoader.h"
 #include "JackGlobals.h"
+#include "JackExports.h"
 #include <iostream>
 
 namespace Jack
@@ -1125,7 +1126,7 @@ extern "C"
 {
 #endif
 
-    jack_driver_desc_t* driver_get_descriptor() {
+    EXPORT jack_driver_desc_t* driver_get_descriptor() {
         jack_driver_desc_t *desc;
         unsigned int i;
         desc = (jack_driver_desc_t*)calloc(1, sizeof(jack_driver_desc_t));
@@ -1249,7 +1250,7 @@ extern "C"
         return desc;
     }
 
-    Jack::JackDriverClientInterface* driver_initialize(Jack::JackLockedEngine* engine, Jack::JackSynchro* table, const JSList* params) {
+    EXPORT Jack::JackDriverClientInterface* driver_initialize(Jack::JackLockedEngine* engine, Jack::JackSynchro* table, const JSList* params) {
         jack_nframes_t srate = 44100;
         jack_nframes_t frames_per_interrupt = 128;
         int capture = FALSE;

macosx/JackMachSemaphore.h

@@ -17,9 +17,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 */
 
-#ifndef __JackMacSemaphore__
-#define __JackMacSemaphore__
+#ifndef __JackMachSemaphore__
+#define __JackMachSemaphore__
 
+#include "JackExports.h"
 #include "JackSynchro.h"
 #include <mach/mach.h>
 #include <mach/mach_types.h>
@@ -35,7 +36,7 @@ namespace Jack
 \brief Inter process synchronization using using Mach semaphore.
 */
 
-class JackMachSemaphore : public detail::JackSynchro
+class EXPORT JackMachSemaphore : public detail::JackSynchro
 {
 
     private:

macosx/JackMachThread.h

@@ -78,7 +78,7 @@ namespace Jack
 \brief Darwin threads. Real-time threads are actually "time constraint" threads.
 */
 
-class JackMachThread : public JackPosixThread
+class EXPORT JackMachThread : public JackPosixThread
 {
 
     private:

macosx/Jackdmp.xcodeproj/project.pbxproj

@@ -59,7 +59,10 @@
 				4B699DB8097D421700A18468 /* PBXTargetDependency */,
 				4B699DBA097D421700A18468 /* PBXTargetDependency */,
 				4B699DBC097D421700A18468 /* PBXTargetDependency */,
+				4B978E800A31D8B7009E2DD1 /* PBXTargetDependency */,
+				BA222AF20DC883F3001A17F4 /* PBXTargetDependency */,
 				4BD624D30CBCF55700DE782F /* PBXTargetDependency */,
+				BA222AF00DC883EF001A17F4 /* PBXTargetDependency */,
 				4B5A1BE20CD1CD730005BF74 /* PBXTargetDependency */,
 				4B5A1BCF0CD1CCC80005BF74 /* PBXTargetDependency */,
 				4BFA99440AAAED90009E916C /* PBXTargetDependency */,
@@ -89,9 +92,6 @@
 				4B363F250DEB0ABE001F72D9 /* PBXTargetDependency */,
 				4B363F530DEB0CFE001F72D9 /* PBXTargetDependency */,
 				4B363F780DEB0D85001F72D9 /* PBXTargetDependency */,
-				4B978E800A31D8B7009E2DD1 /* PBXTargetDependency */,
-				BA222AF00DC883EF001A17F4 /* PBXTargetDependency */,
-				BA222AF20DC883F3001A17F4 /* PBXTargetDependency */,
 			);
 			name = "All Universal 32 bits";
 			productName = All;
@@ -482,7 +482,6 @@
 		4B95BCAE0D913073000F7695 /* control.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B95BCAD0D913073000F7695 /* control.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		4B978DED0A31D099009E2DD1 /* JackPortAudioDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B978DEB0A31D099009E2DD1 /* JackPortAudioDriver.h */; };
 		4B978DEE0A31D099009E2DD1 /* JackPortAudioDriver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B978DEC0A31D099009E2DD1 /* JackPortAudioDriver.cpp */; };
-		4B9A25B40DBF8330006E9FBC /* JackError.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B9A25B30DBF8330006E9FBC /* JackError.cpp */; };
 		4B9A25B50DBF8330006E9FBC /* JackError.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B9A25B30DBF8330006E9FBC /* JackError.cpp */; };
 		4B9A25B60DBF8330006E9FBC /* JackError.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B9A25B30DBF8330006E9FBC /* JackError.cpp */; };
 		4B9A26010DBF8584006E9FBC /* jslist.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B9A26000DBF8584006E9FBC /* jslist.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -505,13 +504,13 @@
 		4BA7BDD20DC22F4500AA3457 /* Jackservermp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BA7BDCB0DC22F4500AA3457 /* Jackservermp.framework */; };
 		4BA7BDDA0DC2300800AA3457 /* JackFifo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B56880F08B5C8620022B32D /* JackFifo.cpp */; };
 		4BA7BDDB0DC2300A00AA3457 /* JackPosixSemaphore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BEE0B2C08ACBB9F00D22B43 /* JackPosixSemaphore.cpp */; };
-		4BA7BE0F0DC232A400AA3457 /* Jackdmp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B35C4FC0D4731D1000DE7AE /* Jackdmp.framework */; };
-		4BA7BE1A0DC2347500AA3457 /* Jackdmp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B35C4FC0D4731D1000DE7AE /* Jackdmp.framework */; };
+		4BA7BE0F0DC232A400AA3457 /* Jackservermp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B35C4FC0D4731D1000DE7AE /* Jackservermp.framework */; };
+		4BA7BE1A0DC2347500AA3457 /* Jackservermp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B35C4FC0D4731D1000DE7AE /* Jackservermp.framework */; };
 		4BA7BE1C0DC2348600AA3457 /* JackFifo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B56880F08B5C8620022B32D /* JackFifo.cpp */; };
 		4BA7BE1D0DC2348800AA3457 /* JackPosixSemaphore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BEE0B2C08ACBB9F00D22B43 /* JackPosixSemaphore.cpp */; };
-		4BA7BE200DC234FB00AA3457 /* Jackdmp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B35C4FC0D4731D1000DE7AE /* Jackdmp.framework */; };
-		4BA7BE240DC2350D00AA3457 /* Jackdmp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B35C4FC0D4731D1000DE7AE /* Jackdmp.framework */; };
-		4BA7BE270DC2352A00AA3457 /* Jackdmp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B35C4FC0D4731D1000DE7AE /* Jackdmp.framework */; };
+		4BA7BE200DC234FB00AA3457 /* Jackservermp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B35C4FC0D4731D1000DE7AE /* Jackservermp.framework */; };
+		4BA7BE240DC2350D00AA3457 /* Jackservermp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B35C4FC0D4731D1000DE7AE /* Jackservermp.framework */; };
+		4BA7BE270DC2352A00AA3457 /* Jackservermp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B35C4FC0D4731D1000DE7AE /* Jackservermp.framework */; };
 		4BA7FECA0D8E76650017FF73 /* control.c in Sources */ = {isa = PBXBuildFile; fileRef = 4BA7FEC80D8E76650017FF73 /* control.c */; };
 		4BAB95B80B9E20B800A0C723 /* JackPortType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BAB95B60B9E20B800A0C723 /* JackPortType.cpp */; };
 		4BAB95B90B9E20B800A0C723 /* JackPortType.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BAB95B70B9E20B800A0C723 /* JackPortType.h */; };
@@ -1100,11 +1099,8 @@
 		4B05A06F0DF72BC000840F4C /* jackdbus.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = jackdbus.c; path = ../linux/dbus/jackdbus.c; sourceTree = SOURCE_ROOT; };
 		4B05A0700DF72BC000840F4C /* jackdbus.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = jackdbus.h; path = ../linux/dbus/jackdbus.h; sourceTree = SOURCE_ROOT; };
 		4B05A0710DF72BC000840F4C /* list.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = list.h; path = ../linux/dbus/list.h; sourceTree = SOURCE_ROOT; };
-		4B05A0720DF72BC000840F4C /* org.jackaudio.service.in */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = org.jackaudio.service.in; path = ../linux/dbus/org.jackaudio.service.in; sourceTree = SOURCE_ROOT; };
-		4B05A0730DF72BC000840F4C /* SConscript */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = SConscript; path = ../linux/dbus/SConscript; sourceTree = SOURCE_ROOT; };
 		4B05A0740DF72BC000840F4C /* sigsegv.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = sigsegv.c; path = ../linux/dbus/sigsegv.c; sourceTree = SOURCE_ROOT; };
 		4B05A0750DF72BC000840F4C /* sigsegv.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sigsegv.h; path = ../linux/dbus/sigsegv.h; sourceTree = SOURCE_ROOT; };
-		4B05A0760DF72BC000840F4C /* wscript */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = wscript; path = ../linux/dbus/wscript; sourceTree = SOURCE_ROOT; };
 		4B05A0770DF72BC000840F4C /* xml.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = xml.c; path = ../linux/dbus/xml.c; sourceTree = SOURCE_ROOT; };
 		4B05A0780DF72BC000840F4C /* xml.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = xml.h; path = ../linux/dbus/xml.h; sourceTree = SOURCE_ROOT; };
 		4B05A0790DF72BC000840F4C /* xml_expat.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = xml_expat.c; path = ../linux/dbus/xml_expat.c; sourceTree = SOURCE_ROOT; };
@@ -1142,7 +1138,7 @@
 		4B2C28F908DAD01E00249230 /* JackGlobals.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackGlobals.cpp; path = ../common/JackGlobals.cpp; sourceTree = SOURCE_ROOT; };
 		4B35C4250D4731D1000DE7AE /* jackdmp */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jackdmp; sourceTree = BUILT_PRODUCTS_DIR; };
 		4B35C4830D4731D1000DE7AE /* Jackmp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Jackmp.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		4B35C4FC0D4731D1000DE7AE /* Jackdmp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Jackdmp.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		4B35C4FC0D4731D1000DE7AE /* Jackservermp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Jackservermp.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		4B35C5140D4731D1000DE7AE /* jack_midiseq */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_midiseq; sourceTree = BUILT_PRODUCTS_DIR; };
 		4B35C5200D4731D1000DE7AE /* jack_midisine */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_midisine; sourceTree = BUILT_PRODUCTS_DIR; };
 		4B35C52C0D4731D1000DE7AE /* jack_metro */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_metro; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -1166,19 +1162,19 @@
 		4B35C6290D4731D2000DE7AE /* jack_portaudio.so */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = jack_portaudio.so; sourceTree = BUILT_PRODUCTS_DIR; };
 		4B35C6340D4731D2000DE7AE /* jack_dummy.so */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = jack_dummy.so; sourceTree = BUILT_PRODUCTS_DIR; };
 		4B35C63E0D4731D3000DE7AE /* inprocess.so */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = inprocess.so; sourceTree = BUILT_PRODUCTS_DIR; };
-		4B363DD80DEB02F6001F72D9 /* jack_midiseq */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_midiseq; sourceTree = BUILT_PRODUCTS_DIR; };
+		4B363DD80DEB02F6001F72D9 /* jack_alias */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_alias; sourceTree = BUILT_PRODUCTS_DIR; };
 		4B363DDE0DEB034E001F72D9 /* alias.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = alias.c; path = "../example-clients/alias.c"; sourceTree = SOURCE_ROOT; };
-		4B363E1A0DEB03C5001F72D9 /* jack_midiseq */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_midiseq; sourceTree = BUILT_PRODUCTS_DIR; };
+		4B363E1A0DEB03C5001F72D9 /* jack_evmon */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_evmon; sourceTree = BUILT_PRODUCTS_DIR; };
 		4B363E200DEB0401001F72D9 /* evmon.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = evmon.c; path = "../example-clients/evmon.c"; sourceTree = SOURCE_ROOT; };
-		4B363E4E0DEB0775001F72D9 /* jack_midiseq */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_midiseq; sourceTree = BUILT_PRODUCTS_DIR; };
+		4B363E4E0DEB0775001F72D9 /* jack_bufsize */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_bufsize; sourceTree = BUILT_PRODUCTS_DIR; };
 		4B363E710DEB0808001F72D9 /* bufsize.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = bufsize.c; path = "../example-clients/bufsize.c"; sourceTree = SOURCE_ROOT; };
-		4B363EE90DEB091C001F72D9 /* jack_midiseq */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_midiseq; sourceTree = BUILT_PRODUCTS_DIR; };
+		4B363EE90DEB091C001F72D9 /* jack_rec */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_rec; sourceTree = BUILT_PRODUCTS_DIR; };
 		4B363EED0DEB094B001F72D9 /* capture_client.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = capture_client.c; path = "../example-clients/capture_client.c"; sourceTree = SOURCE_ROOT; };
-		4B363F1E0DEB0A6A001F72D9 /* jack_midiseq */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_midiseq; sourceTree = BUILT_PRODUCTS_DIR; };
+		4B363F1E0DEB0A6A001F72D9 /* jack_monitor_client */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_monitor_client; sourceTree = BUILT_PRODUCTS_DIR; };
 		4B363F220DEB0AB0001F72D9 /* monitor_client.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = monitor_client.c; path = "../example-clients/monitor_client.c"; sourceTree = SOURCE_ROOT; };
-		4B363F350DEB0BD1001F72D9 /* jack_midiseq */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_midiseq; sourceTree = BUILT_PRODUCTS_DIR; };
+		4B363F350DEB0BD1001F72D9 /* jack_showtime */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_showtime; sourceTree = BUILT_PRODUCTS_DIR; };
 		4B363F3D0DEB0C31001F72D9 /* showtime.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = showtime.c; path = "../example-clients/showtime.c"; sourceTree = SOURCE_ROOT; };
-		4B363F720DEB0D4E001F72D9 /* jack_midiseq */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_midiseq; sourceTree = BUILT_PRODUCTS_DIR; };
+		4B363F720DEB0D4E001F72D9 /* jack_impulse_grabber */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_impulse_grabber; sourceTree = BUILT_PRODUCTS_DIR; };
 		4B363F750DEB0D7D001F72D9 /* impulse_grabber.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = impulse_grabber.c; path = "../example-clients/impulse_grabber.c"; sourceTree = SOURCE_ROOT; };
 		4B37C20306DF1FBE0016E567 /* CALatencyLog.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = CALatencyLog.cpp; path = /Developer/Examples/CoreAudio/PublicUtility/CALatencyLog.cpp; sourceTree = "<absolute>"; };
 		4B37C20406DF1FBE0016E567 /* CALatencyLog.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CALatencyLog.h; path = /Developer/Examples/CoreAudio/PublicUtility/CALatencyLog.h; sourceTree = "<absolute>"; };
@@ -1265,7 +1261,7 @@
 		4BA692D40CBE4C9000EAD520 /* jack_unload */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_unload; sourceTree = BUILT_PRODUCTS_DIR; };
 		4BA692D60CBE4CC600EAD520 /* ipunload.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = ipunload.c; path = "../example-clients/ipunload.c"; sourceTree = SOURCE_ROOT; };
 		4BA7BDCB0DC22F4500AA3457 /* Jackservermp.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Jackservermp.framework; path = build/Development/Jackservermp.framework; sourceTree = SOURCE_ROOT; };
-		4BA7FEC30D8E76270017FF73 /* jack_lsp */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_lsp; sourceTree = BUILT_PRODUCTS_DIR; };
+		4BA7FEC30D8E76270017FF73 /* jack_server_control */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_server_control; sourceTree = BUILT_PRODUCTS_DIR; };
 		4BA7FEC80D8E76650017FF73 /* control.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = control.c; path = "../example-clients/control.c"; sourceTree = SOURCE_ROOT; };
 		4BAB95B60B9E20B800A0C723 /* JackPortType.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackPortType.cpp; path = ../common/JackPortType.cpp; sourceTree = SOURCE_ROOT; };
 		4BAB95B70B9E20B800A0C723 /* JackPortType.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackPortType.h; path = ../common/JackPortType.h; sourceTree = SOURCE_ROOT; };
@@ -1364,14 +1360,14 @@
 		4BF8D2470834F20600C94B91 /* testSem.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = testSem.cpp; path = ../tests/testSem.cpp; sourceTree = SOURCE_ROOT; };
 		4BF8FB0D08AC88EF00D1A344 /* JackFrameTimer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackFrameTimer.cpp; path = ../common/JackFrameTimer.cpp; sourceTree = SOURCE_ROOT; };
 		4BF8FB0E08AC88EF00D1A344 /* JackFrameTimer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackFrameTimer.h; path = ../common/JackFrameTimer.h; sourceTree = SOURCE_ROOT; };
-		4BFA5E980DEC4D9C00FA4CDB /* testSem */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = testSem; sourceTree = BUILT_PRODUCTS_DIR; };
+		4BFA5E980DEC4D9C00FA4CDB /* testMutex */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = testMutex; sourceTree = BUILT_PRODUCTS_DIR; };
 		4BFA5E9E0DEC4DD900FA4CDB /* testMutex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testMutex.cpp; path = ../tests/testMutex.cpp; sourceTree = SOURCE_ROOT; };
-		4BFA828C0DF6A9E40087B4E1 /* jack_midiseq */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_midiseq; sourceTree = BUILT_PRODUCTS_DIR; };
-		4BFA829F0DF6A9E40087B4E1 /* jack_midiseq */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_midiseq; sourceTree = BUILT_PRODUCTS_DIR; };
-		4BFA82AB0DF6A9E40087B4E1 /* jack_midiseq */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_midiseq; sourceTree = BUILT_PRODUCTS_DIR; };
-		4BFA82B70DF6A9E40087B4E1 /* jack_midiseq */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_midiseq; sourceTree = BUILT_PRODUCTS_DIR; };
-		4BFA82C30DF6A9E40087B4E1 /* jack_midiseq */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_midiseq; sourceTree = BUILT_PRODUCTS_DIR; };
-		4BFA82CF0DF6A9E40087B4E1 /* jack_midiseq */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_midiseq; sourceTree = BUILT_PRODUCTS_DIR; };
+		4BFA828C0DF6A9E40087B4E1 /* jack_evmon */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_evmon; sourceTree = BUILT_PRODUCTS_DIR; };
+		4BFA829F0DF6A9E40087B4E1 /* jack_bufsize */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_bufsize; sourceTree = BUILT_PRODUCTS_DIR; };
+		4BFA82AB0DF6A9E40087B4E1 /* jack_rec */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_rec; sourceTree = BUILT_PRODUCTS_DIR; };
+		4BFA82B70DF6A9E40087B4E1 /* jack_monitor_client */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_monitor_client; sourceTree = BUILT_PRODUCTS_DIR; };
+		4BFA82C30DF6A9E40087B4E1 /* jack_showtime */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_showtime; sourceTree = BUILT_PRODUCTS_DIR; };
+		4BFA82CF0DF6A9E40087B4E1 /* jack_impulse_grabber */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_impulse_grabber; sourceTree = BUILT_PRODUCTS_DIR; };
 		4BFA99A20AAAF3B0009E916C /* jdelay */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jdelay; sourceTree = BUILT_PRODUCTS_DIR; };
 		4BFA99A90AAAF40C009E916C /* jdelay.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = jdelay.cpp; path = ../tests/jdelay.cpp; sourceTree = SOURCE_ROOT; };
 		4BFB297708AF44ED00D450D4 /* JackMachServerNotifyChannel.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JackMachServerNotifyChannel.cpp; sourceTree = "<group>"; };
@@ -1503,7 +1499,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				4BA7BE0F0DC232A400AA3457 /* Jackdmp.framework in Frameworks */,
+				4BA7BE0F0DC232A400AA3457 /* Jackservermp.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1511,7 +1507,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				4BA7BE1A0DC2347500AA3457 /* Jackdmp.framework in Frameworks */,
+				4BA7BE1A0DC2347500AA3457 /* Jackservermp.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1554,7 +1550,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				4BA7BE200DC234FB00AA3457 /* Jackdmp.framework in Frameworks */,
+				4BA7BE200DC234FB00AA3457 /* Jackservermp.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1562,7 +1558,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				4BA7BE240DC2350D00AA3457 /* Jackdmp.framework in Frameworks */,
+				4BA7BE240DC2350D00AA3457 /* Jackservermp.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1570,7 +1566,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				4BA7BE270DC2352A00AA3457 /* Jackdmp.framework in Frameworks */,
+				4BA7BE270DC2352A00AA3457 /* Jackservermp.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1990,7 +1986,7 @@
 				4B5A1BDA0CD1CCE10005BF74 /* jack_midisine */,
 				4B35C4250D4731D1000DE7AE /* jackdmp */,
 				4B35C4830D4731D1000DE7AE /* Jackmp.framework */,
-				4B35C4FC0D4731D1000DE7AE /* Jackdmp.framework */,
+				4B35C4FC0D4731D1000DE7AE /* Jackservermp.framework */,
 				4B35C5140D4731D1000DE7AE /* jack_midiseq */,
 				4B35C5200D4731D1000DE7AE /* jack_midisine */,
 				4B35C52C0D4731D1000DE7AE /* jack_metro */,
@@ -2017,24 +2013,24 @@
 				4B0A28E60D52073D002EFF74 /* jack_thread_wait */,
 				4B0A292D0D52108E002EFF74 /* jack_thread_wait */,
 				4B57F5950D72C27900B4E719 /* jack_thread_wait */,
-				4BA7FEC30D8E76270017FF73 /* jack_lsp */,
+				4BA7FEC30D8E76270017FF73 /* jack_server_control */,
 				BA222ACF0DC88132001A17F4 /* jack_net.so */,
 				BA222AE90DC882DB001A17F4 /* netmanager.so */,
-				4BA7FEC30D8E76270017FF73 /* jack_lsp */,
-				4B363DD80DEB02F6001F72D9 /* jack_midiseq */,
-				4B363E1A0DEB03C5001F72D9 /* jack_midiseq */,
-				4B363E4E0DEB0775001F72D9 /* jack_midiseq */,
-				4B363EE90DEB091C001F72D9 /* jack_midiseq */,
-				4B363F1E0DEB0A6A001F72D9 /* jack_midiseq */,
-				4B363F350DEB0BD1001F72D9 /* jack_midiseq */,
-				4B363F720DEB0D4E001F72D9 /* jack_midiseq */,
-				4BFA5E980DEC4D9C00FA4CDB /* testSem */,
-				4BFA828C0DF6A9E40087B4E1 /* jack_midiseq */,
-				4BFA829F0DF6A9E40087B4E1 /* jack_midiseq */,
-				4BFA82AB0DF6A9E40087B4E1 /* jack_midiseq */,
-				4BFA82B70DF6A9E40087B4E1 /* jack_midiseq */,
-				4BFA82C30DF6A9E40087B4E1 /* jack_midiseq */,
-				4BFA82CF0DF6A9E40087B4E1 /* jack_midiseq */,
+				4BA7FEC30D8E76270017FF73 /* jack_server_control */,
+				4B363DD80DEB02F6001F72D9 /* jack_alias */,
+				4B363E1A0DEB03C5001F72D9 /* jack_evmon */,
+				4B363E4E0DEB0775001F72D9 /* jack_bufsize */,
+				4B363EE90DEB091C001F72D9 /* jack_rec */,
+				4B363F1E0DEB0A6A001F72D9 /* jack_monitor_client */,
+				4B363F350DEB0BD1001F72D9 /* jack_showtime */,
+				4B363F720DEB0D4E001F72D9 /* jack_impulse_grabber */,
+				4BFA5E980DEC4D9C00FA4CDB /* testMutex */,
+				4BFA828C0DF6A9E40087B4E1 /* jack_evmon */,
+				4BFA829F0DF6A9E40087B4E1 /* jack_bufsize */,
+				4BFA82AB0DF6A9E40087B4E1 /* jack_rec */,
+				4BFA82B70DF6A9E40087B4E1 /* jack_monitor_client */,
+				4BFA82C30DF6A9E40087B4E1 /* jack_showtime */,
+				4BFA82CF0DF6A9E40087B4E1 /* jack_impulse_grabber */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -2125,11 +2121,8 @@
 				4B05A06F0DF72BC000840F4C /* jackdbus.c */,
 				4B05A0700DF72BC000840F4C /* jackdbus.h */,
 				4B05A0710DF72BC000840F4C /* list.h */,
-				4B05A0720DF72BC000840F4C /* org.jackaudio.service.in */,
-				4B05A0730DF72BC000840F4C /* SConscript */,
 				4B05A0740DF72BC000840F4C /* sigsegv.c */,
 				4B05A0750DF72BC000840F4C /* sigsegv.h */,
-				4B05A0760DF72BC000840F4C /* wscript */,
 				4B05A0770DF72BC000840F4C /* xml.c */,
 				4B05A0780DF72BC000840F4C /* xml.h */,
 				4B05A0790DF72BC000840F4C /* xml_expat.c */,
@@ -3344,7 +3337,7 @@
 			);
 			name = "Jackservermp.framework 64 bits";
 			productName = Jack;
-			productReference = 4B35C4FC0D4731D1000DE7AE /* Jackdmp.framework */;
+			productReference = 4B35C4FC0D4731D1000DE7AE /* Jackservermp.framework */;
 			productType = "com.apple.product-type.framework";
 		};
 		4B35C50A0D4731D1000DE7AE /* jack_midiseq 64 bits */ = {
@@ -3793,7 +3786,7 @@
 			name = "jack_alias Universal";
 			productInstallPath = /usr/local/bin;
 			productName = jack_metro;
-			productReference = 4B363DD80DEB02F6001F72D9 /* jack_midiseq */;
+			productReference = 4B363DD80DEB02F6001F72D9 /* jack_alias */;
 			productType = "com.apple.product-type.tool";
 		};
 		4B363E100DEB03C5001F72D9 /* jack_evmon Universal */ = {
@@ -3812,7 +3805,7 @@
 			name = "jack_evmon Universal";
 			productInstallPath = /usr/local/bin;
 			productName = jack_metro;
-			productReference = 4B363E1A0DEB03C5001F72D9 /* jack_midiseq */;
+			productReference = 4B363E1A0DEB03C5001F72D9 /* jack_evmon */;
 			productType = "com.apple.product-type.tool";
 		};
 		4B363E440DEB0775001F72D9 /* jack_bufsize Universal */ = {
@@ -3831,7 +3824,7 @@
 			name = "jack_bufsize Universal";
 			productInstallPath = /usr/local/bin;
 			productName = jack_metro;
-			productReference = 4B363E4E0DEB0775001F72D9 /* jack_midiseq */;
+			productReference = 4B363E4E0DEB0775001F72D9 /* jack_bufsize */;
 			productType = "com.apple.product-type.tool";
 		};
 		4B363EDF0DEB091C001F72D9 /* jack_rec Universal */ = {
@@ -3850,7 +3843,7 @@
 			name = "jack_rec Universal";
 			productInstallPath = /usr/local/bin;
 			productName = jack_metro;
-			productReference = 4B363EE90DEB091C001F72D9 /* jack_midiseq */;
+			productReference = 4B363EE90DEB091C001F72D9 /* jack_rec */;
 			productType = "com.apple.product-type.tool";
 		};
 		4B363F140DEB0A6A001F72D9 /* jack_monitor_client Universal */ = {
@@ -3869,7 +3862,7 @@
 			name = "jack_monitor_client Universal";
 			productInstallPath = /usr/local/bin;
 			productName = jack_metro;
-			productReference = 4B363F1E0DEB0A6A001F72D9 /* jack_midiseq */;
+			productReference = 4B363F1E0DEB0A6A001F72D9 /* jack_monitor_client */;
 			productType = "com.apple.product-type.tool";
 		};
 		4B363F2B0DEB0BD1001F72D9 /* jack_showtime Universal */ = {
@@ -3888,7 +3881,7 @@
 			name = "jack_showtime Universal";
 			productInstallPath = /usr/local/bin;
 			productName = jack_metro;
-			productReference = 4B363F350DEB0BD1001F72D9 /* jack_midiseq */;
+			productReference = 4B363F350DEB0BD1001F72D9 /* jack_showtime */;
 			productType = "com.apple.product-type.tool";
 		};
 		4B363F680DEB0D4E001F72D9 /* jack_impulse_grabber Universal */ = {
@@ -3907,7 +3900,7 @@
 			name = "jack_impulse_grabber Universal";
 			productInstallPath = /usr/local/bin;
 			productName = jack_metro;
-			productReference = 4B363F720DEB0D4E001F72D9 /* jack_midiseq */;
+			productReference = 4B363F720DEB0D4E001F72D9 /* jack_impulse_grabber */;
 			productType = "com.apple.product-type.tool";
 		};
 		4B5A1BB10CD1CB9E0005BF74 /* jack_midiseq Universal */ = {
@@ -4339,7 +4332,7 @@
 			name = "jack_server_control Universal";
 			productInstallPath = /usr/local/bin;
 			productName = jack_lsp;
-			productReference = 4BA7FEC30D8E76270017FF73 /* jack_lsp */;
+			productReference = 4BA7FEC30D8E76270017FF73 /* jack_server_control */;
 			productType = "com.apple.product-type.tool";
 		};
 		4BD623ED0CBCF0F000DE782F /* inprocess */ = {
@@ -4413,7 +4406,7 @@
 			name = "testMutex Universal";
 			productInstallPath = /usr/local/bin;
 			productName = testSem;
-			productReference = 4BFA5E980DEC4D9C00FA4CDB /* testSem */;
+			productReference = 4BFA5E980DEC4D9C00FA4CDB /* testMutex */;
 			productType = "com.apple.product-type.tool";
 		};
 		4BFA82820DF6A9E40087B4E1 /* jack_evmon 64 bits */ = {
@@ -4432,7 +4425,7 @@
 			name = "jack_evmon 64 bits";
 			productInstallPath = /usr/local/bin;
 			productName = jack_metro;
-			productReference = 4BFA828C0DF6A9E40087B4E1 /* jack_midiseq */;
+			productReference = 4BFA828C0DF6A9E40087B4E1 /* jack_evmon */;
 			productType = "com.apple.product-type.tool";
 		};
 		4BFA82950DF6A9E40087B4E1 /* jack_bufsize 64 bits */ = {
@@ -4451,7 +4444,7 @@
 			name = "jack_bufsize 64 bits";
 			productInstallPath = /usr/local/bin;
 			productName = jack_metro;
-			productReference = 4BFA829F0DF6A9E40087B4E1 /* jack_midiseq */;
+			productReference = 4BFA829F0DF6A9E40087B4E1 /* jack_bufsize */;
 			productType = "com.apple.product-type.tool";
 		};
 		4BFA82A10DF6A9E40087B4E1 /* jack_rec 64 bits */ = {
@@ -4470,7 +4463,7 @@
 			name = "jack_rec 64 bits";
 			productInstallPath = /usr/local/bin;
 			productName = jack_metro;
-			productReference = 4BFA82AB0DF6A9E40087B4E1 /* jack_midiseq */;
+			productReference = 4BFA82AB0DF6A9E40087B4E1 /* jack_rec */;
 			productType = "com.apple.product-type.tool";
 		};
 		4BFA82AD0DF6A9E40087B4E1 /* jack_monitor_client 64 bits */ = {
@@ -4489,7 +4482,7 @@
 			name = "jack_monitor_client 64 bits";
 			productInstallPath = /usr/local/bin;
 			productName = jack_metro;
-			productReference = 4BFA82B70DF6A9E40087B4E1 /* jack_midiseq */;
+			productReference = 4BFA82B70DF6A9E40087B4E1 /* jack_monitor_client */;
 			productType = "com.apple.product-type.tool";
 		};
 		4BFA82B90DF6A9E40087B4E1 /* jack_showtime 64 bits */ = {
@@ -4508,7 +4501,7 @@
 			name = "jack_showtime 64 bits";
 			productInstallPath = /usr/local/bin;
 			productName = jack_metro;
-			productReference = 4BFA82C30DF6A9E40087B4E1 /* jack_midiseq */;
+			productReference = 4BFA82C30DF6A9E40087B4E1 /* jack_showtime */;
 			productType = "com.apple.product-type.tool";
 		};
 		4BFA82C50DF6A9E40087B4E1 /* jack_impulse_grabber 64 bits */ = {
@@ -4527,7 +4520,7 @@
 			name = "jack_impulse_grabber 64 bits";
 			productInstallPath = /usr/local/bin;
 			productName = jack_metro;
-			productReference = 4BFA82CF0DF6A9E40087B4E1 /* jack_midiseq */;
+			productReference = 4BFA82CF0DF6A9E40087B4E1 /* jack_impulse_grabber */;
 			productType = "com.apple.product-type.tool";
 		};
 		4BFA99980AAAF3B0009E916C /* jdelay Universal */ = {
@@ -5523,7 +5516,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				4B699BAA097D421600A18468 /* Jackdmp.cpp in Sources */,
-				4B9A25B40DBF8330006E9FBC /* JackError.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -8562,6 +8554,7 @@
 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
+				HEADER_SEARCH_PATHS = ../common;
 				OTHER_CFLAGS = "";
 				OTHER_CPLUSPLUSFLAGS = "-DMACH_RPC_MACH_SEMA";
 				OTHER_LDFLAGS = (
@@ -8597,6 +8590,7 @@
 				);
 				COPY_PHASE_STRIP = YES;
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
+				HEADER_SEARCH_PATHS = ../common;
 				MACOSX_DEPLOYMENT_TARGET = 10.4;
 				OTHER_CFLAGS = "";
 				OTHER_CPLUSPLUSFLAGS = "-DMACH_RPC_MACH_SEMA";
@@ -8631,6 +8625,7 @@
 					i386,
 					x86_64,
 				);
+				HEADER_SEARCH_PATHS = ../common;
 				OTHER_CFLAGS = "";
 				OTHER_CPLUSPLUSFLAGS = "-DMACH_RPC_MACH_SEMA";
 				OTHER_LDFLAGS = (
@@ -8670,6 +8665,7 @@
 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
+				HEADER_SEARCH_PATHS = ../common;
 				OTHER_CFLAGS = "";
 				OTHER_CPLUSPLUSFLAGS = "-DMACH_RPC_MACH_SEMA";
 				OTHER_LDFLAGS = (
@@ -8705,6 +8701,7 @@
 				);
 				COPY_PHASE_STRIP = YES;
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
+				HEADER_SEARCH_PATHS = ../common;
 				MACOSX_DEPLOYMENT_TARGET = 10.4;
 				OTHER_CFLAGS = "";
 				OTHER_CPLUSPLUSFLAGS = "-DMACH_RPC_MACH_SEMA";
@@ -8739,6 +8736,7 @@
 					i386,
 					x86_64,
 				);
+				HEADER_SEARCH_PATHS = ../common;
 				OTHER_CFLAGS = "";
 				OTHER_CPLUSPLUSFLAGS = "-DMACH_RPC_MACH_SEMA";
 				OTHER_LDFLAGS = (
@@ -8778,6 +8776,7 @@
 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
+				HEADER_SEARCH_PATHS = ../common;
 				OTHER_CFLAGS = "";
 				OTHER_CPLUSPLUSFLAGS = "-DMACH_RPC_MACH_SEMA";
 				OTHER_LDFLAGS = (
@@ -8813,6 +8812,7 @@
 				);
 				COPY_PHASE_STRIP = YES;
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
+				HEADER_SEARCH_PATHS = ../common;
 				MACOSX_DEPLOYMENT_TARGET = 10.4;
 				OTHER_CFLAGS = "";
 				OTHER_CPLUSPLUSFLAGS = "-DMACH_RPC_MACH_SEMA";
@@ -8847,6 +8847,7 @@
 					i386,
 					x86_64,
 				);
+				HEADER_SEARCH_PATHS = ../common;
 				OTHER_CFLAGS = "";
 				OTHER_CPLUSPLUSFLAGS = "-DMACH_RPC_MACH_SEMA";
 				OTHER_LDFLAGS = (
@@ -8892,6 +8893,7 @@
 				GCC_MODEL_TUNING = G4;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = "";
+				HEADER_SEARCH_PATHS = ../common;
 				INSTALL_PATH = /usr/local/lib;
 				LIBRARY_STYLE = DYNAMIC;
 				MACH_O_TYPE = mh_dylib;
@@ -8939,6 +8941,7 @@
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_MODEL_TUNING = G4;
 				GCC_PREPROCESSOR_DEFINITIONS = "";
+				HEADER_SEARCH_PATHS = ../common;
 				INSTALL_PATH = /usr/local/lib;
 				LIBRARY_STYLE = DYNAMIC;
 				MACH_O_TYPE = mh_dylib;
@@ -8984,6 +8987,7 @@
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_MODEL_TUNING = G4;
 				GCC_PREPROCESSOR_DEFINITIONS = "";
+				HEADER_SEARCH_PATHS = ../common;
 				INSTALL_PATH = /usr/local/lib;
 				LIBRARY_STYLE = DYNAMIC;
 				MACH_O_TYPE = mh_dylib;
@@ -10691,6 +10695,7 @@
 				GCC_OPTIMIZATION_LEVEL = 3;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
+				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
 				GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
 				GCC_WARN_UNKNOWN_PRAGMAS = NO;
 				GENERATE_PKGINFO_FILE = NO;
@@ -10858,6 +10863,7 @@
 				GCC_OPTIMIZATION_LEVEL = 3;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
+				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
 				GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
 				GCC_WARN_UNKNOWN_PRAGMAS = NO;
 				GENERATE_PKGINFO_FILE = NO;
@@ -12196,12 +12202,14 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				EXECUTABLE_EXTENSION = so;
+				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_MODEL_TUNING = G4;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = "";
+				HEADER_SEARCH_PATHS = ../common;
 				INSTALL_PATH = /usr/local/lib;
 				LIBRARY_STYLE = DYNAMIC;
 				MACH_O_TYPE = mh_dylib;
@@ -12243,10 +12251,12 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				EXECUTABLE_EXTENSION = so;
+				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_MODEL_TUNING = G4;
 				GCC_PREPROCESSOR_DEFINITIONS = "";
+				HEADER_SEARCH_PATHS = ../common;
 				INSTALL_PATH = /usr/local/lib;
 				LIBRARY_STYLE = DYNAMIC;
 				MACH_O_TYPE = mh_dylib;
@@ -12287,9 +12297,11 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				EXECUTABLE_EXTENSION = so;
+				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_MODEL_TUNING = G4;
 				GCC_PREPROCESSOR_DEFINITIONS = "";
+				HEADER_SEARCH_PATHS = ../common;
 				INSTALL_PATH = /usr/local/lib;
 				LIBRARY_STYLE = DYNAMIC;
 				MACH_O_TYPE = mh_dylib;

windows/JackPortAudioDriver.cpp

@@ -32,6 +32,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include "JackEngineControl.h"
 #include "JackError.h"
 #include "JackTime.h"
+#include "JackExports.h"
 #include <iostream>
 #include <assert.h>
 

windows/JackWinThread.cpp

@@ -206,7 +206,7 @@ void JackWinThread::Terminate()
 
 } // end of namespace
 
-bool jack_tls_allocate_key(jack_tls_key *key_ptr)
+EXPORT bool jack_tls_allocate_key(jack_tls_key *key_ptr)
 {
     DWORD key;
     
@@ -221,7 +221,7 @@ bool jack_tls_allocate_key(jack_tls_key *key_ptr)
     return true;
 }
 
-bool jack_tls_free_key(jack_tls_key key)
+EXPORT bool jack_tls_free_key(jack_tls_key key)
 {
     if (!TlsFree(key))
     {
@@ -232,7 +232,7 @@ bool jack_tls_free_key(jack_tls_key key)
     return true;
 }
 
-bool jack_tls_set(jack_tls_key key, void *data_ptr)
+EXPORT bool jack_tls_set(jack_tls_key key, void *data_ptr)
 {
     if (!TlsSetValue(key, data_ptr))
     {
@@ -243,7 +243,7 @@ bool jack_tls_set(jack_tls_key key, void *data_ptr)
     return true;
 }
 
-void *jack_tls_get(jack_tls_key key)
+EXPORT void *jack_tls_get(jack_tls_key key)
 {
     return TlsGetValue(key);
 }