Browse Source

Better symbols export for server and client side libraries.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2895 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/1.90
sletz 15 years ago
parent
commit
bfdf50d52d
58 changed files with 153 additions and 128 deletions
  1. +4
    -0
      ChangeLog
  2. +3
    -3
      common/JackAudioAdapterFactory.cpp
  3. +1
    -1
      common/JackAudioDriver.h
  4. +1
    -1
      common/JackClientInterface.h
  5. +1
    -1
      common/JackConnectionManager.h
  6. +3
    -3
      common/JackDriver.h
  7. +2
    -2
      common/JackDriverLoader.cpp
  8. +2
    -2
      common/JackDriverLoader.h
  9. +2
    -2
      common/JackDummyDriver.cpp
  10. +1
    -1
      common/JackEngine.h
  11. +1
    -1
      common/JackEngineControl.h
  12. +6
    -6
      common/JackError.cpp
  13. +6
    -6
      common/JackError.h
  14. +2
    -2
      common/JackException.h
  15. +1
    -1
      common/JackFrameTimer.h
  16. +1
    -1
      common/JackGraphManager.h
  17. +1
    -1
      common/JackLockedEngine.h
  18. +4
    -4
      common/JackNetAdapter.cpp
  19. +2
    -2
      common/JackNetDriver.cpp
  20. +3
    -3
      common/JackNetInterface.h
  21. +4
    -4
      common/JackNetManager.cpp
  22. +1
    -1
      common/JackNetSocket.h
  23. +11
    -11
      common/JackNetTool.cpp
  24. +13
    -13
      common/JackNetTool.h
  25. +1
    -1
      common/JackPort.h
  26. +1
    -1
      common/JackRestartThreadedDriver.h
  27. +1
    -1
      common/JackServer.h
  28. +3
    -3
      common/JackShmMem.h
  29. +5
    -5
      common/JackThread.h
  30. +1
    -1
      common/JackThreadedDriver.h
  31. +1
    -1
      common/JackTime.c
  32. +2
    -2
      common/JackTools.h
  33. +1
    -1
      common/JackTransportEngine.h
  34. +2
    -2
      common/JackWaitThreadedDriver.h
  35. +1
    -1
      common/driver_interface.h
  36. +1
    -1
      common/wscript
  37. +2
    -2
      linux/alsa/JackAlsaDriver.cpp
  38. +2
    -2
      linux/firewire/JackFFADODriver.cpp
  39. +1
    -1
      macosx/JackMachSemaphore.h
  40. +1
    -1
      macosx/JackMachThread.h
  41. +2
    -0
      macosx/Jackdmp.xcodeproj/project.pbxproj
  42. +1
    -1
      macosx/coreaudio/JackCoreAudioAdapter.cpp
  43. +1
    -1
      macosx/coreaudio/JackCoreAudioAdapter.h
  44. +2
    -2
      macosx/coreaudio/JackCoreAudioDriver.cpp
  45. +6
    -0
      posix/JackCompilerDeps_os.h
  46. +1
    -1
      posix/JackFifo.h
  47. +1
    -1
      posix/JackNetUnixSocket.h
  48. +1
    -1
      posix/JackPosixSemaphore.h
  49. +5
    -5
      posix/JackPosixThread.cpp
  50. +2
    -2
      posix/JackPosixThread.h
  51. +11
    -1
      windows/JackCompilerDeps_os.h
  52. +2
    -2
      windows/JackNetWinSocket.cpp
  53. +2
    -2
      windows/JackNetWinSocket.h
  54. +2
    -2
      windows/JackTime_os.h
  55. +5
    -5
      windows/JackWinThread.cpp
  56. +2
    -2
      windows/JackWinThread.h
  57. +3
    -0
      windows/libjackserver.cbp
  58. +2
    -2
      windows/portaudio/JackPortAudioDriver.cpp

+ 4
- 0
ChangeLog View File

@@ -22,6 +22,10 @@ Florian Faber
Jackdmp changes log
---------------------------

2008-08-08 Stephane Letz <letz@grame.fr>
* Better symbols export for server and client side libraries.

2008-08-06 Stephane Letz <letz@grame.fr>
* Correct driver hierarchy on macosx and windows targets.


+ 3
- 3
common/JackAudioAdapterFactory.cpp View File

@@ -44,7 +44,7 @@ extern "C"

using namespace Jack;

EXPORT int jack_internal_initialize(jack_client_t* jack_client, const JSList* params)
SERVER_EXPORT int jack_internal_initialize(jack_client_t* jack_client, const JSList* params)
{
jack_log("Loading audioadapter");

@@ -80,7 +80,7 @@ extern "C"
}
}

EXPORT int jack_initialize(jack_client_t* jack_client, const char* load_init)
SERVER_EXPORT int jack_initialize(jack_client_t* jack_client, const char* load_init)
{
JSList* params = NULL;
jack_driver_desc_t *desc = jack_get_descriptor();
@@ -94,7 +94,7 @@ extern "C"
return res;
}

EXPORT void jack_finish(void* arg)
SERVER_EXPORT void jack_finish(void* arg)
{
Jack::JackAudioAdapter* adapter = static_cast<Jack::JackAudioAdapter*>(arg);



+ 1
- 1
common/JackAudioDriver.h View File

@@ -30,7 +30,7 @@ namespace Jack
\brief The base class for audio drivers: drivers with audio ports.
*/

class EXPORT JackAudioDriver : public JackDriver
class SERVER_EXPORT JackAudioDriver : public JackDriver
{

private:


+ 1
- 1
common/JackClientInterface.h View File

@@ -32,7 +32,7 @@ struct JackClientControl;
\brief Client interface.
*/

class EXPORT JackClientInterface
class SERVER_EXPORT JackClientInterface
{

public:


+ 1
- 1
common/JackConnectionManager.h View File

@@ -372,7 +372,7 @@ struct JackClientTiming
</UL>
*/

class EXPORT JackConnectionManager
class SERVER_EXPORT JackConnectionManager
{

private:


+ 3
- 3
common/JackDriver.h View File

@@ -39,7 +39,7 @@ struct JackEngineControl;
\brief The base interface for drivers.
*/
class EXPORT JackDriverInterface
class SERVER_EXPORT JackDriverInterface
{

public:
@@ -91,14 +91,14 @@ class EXPORT JackDriverInterface
\brief The base interface for drivers clients.
*/

class EXPORT JackDriverClientInterface : public JackDriverInterface, public JackClientInterface
class SERVER_EXPORT JackDriverClientInterface : public JackDriverInterface, public JackClientInterface
{};

/*!
\brief The base class for drivers.
*/

class EXPORT JackDriver : public JackDriverClientInterface
class SERVER_EXPORT JackDriver : public JackDriverClientInterface
{
protected:


+ 2
- 2
common/JackDriverLoader.cpp View File

@@ -90,7 +90,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 void jack_free_driver_params(JSList * driver_params)
SERVER_EXPORT void jack_free_driver_params(JSList * driver_params)
{
JSList *node_ptr = driver_params;
JSList *next_node_ptr;
@@ -243,7 +243,7 @@ jack_parse_driver_params (jack_driver_desc_t * desc, int argc, char* argv[], JSL
return 0;
}

EXPORT int
SERVER_EXPORT int
jackctl_parse_driver_params (jackctl_driver *driver_ptr, int argc, char* argv[])
{
struct option * long_options;


+ 2
- 2
common/JackDriverLoader.h View File

@@ -66,8 +66,8 @@ JSList * jack_drivers_load (JSList * drivers);
JSList * jack_internals_load (JSList * internals);

jack_driver_info_t * jack_load_driver (jack_driver_desc_t * driver_desc);
EXPORT int jackctl_parse_driver_params (jackctl_driver * driver_ptr, int argc, char* argv[]);
EXPORT void jack_free_driver_params(JSList * param_ptr);
SERVER_EXPORT int jackctl_parse_driver_params (jackctl_driver * driver_ptr, int argc, char* argv[]);
SERVER_EXPORT void jack_free_driver_params(JSList * param_ptr);

#endif


+ 2
- 2
common/JackDummyDriver.cpp View File

@@ -85,7 +85,7 @@ extern "C"
{
#endif

EXPORT jack_driver_desc_t * driver_get_descriptor () {
SERVER_EXPORT jack_driver_desc_t * driver_get_descriptor () {
jack_driver_desc_t * desc;
unsigned int i;

@@ -148,7 +148,7 @@ extern "C"
return desc;
}

EXPORT Jack::JackDriverClientInterface* driver_initialize(Jack::JackLockedEngine* engine, Jack::JackSynchro* table, const JSList* params) {
SERVER_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;


+ 1
- 1
common/JackEngine.h View File

@@ -37,7 +37,7 @@ class JackExternalClient;
\brief Engine description.
*/

class EXPORT JackEngine
class SERVER_EXPORT JackEngine
{
private:



+ 1
- 1
common/JackEngineControl.h View File

@@ -40,7 +40,7 @@ class JackGraphManager;
\brief Engine control in shared memory.
*/

struct EXPORT JackEngineControl : public JackShmMem
struct SERVER_EXPORT JackEngineControl : public JackShmMem
{
// Shared state
jack_nframes_t fBufferSize;


+ 6
- 6
common/JackError.cpp View File

@@ -39,7 +39,7 @@ void change_thread_log_function(jack_log_function_t log_function)
}
}

EXPORT void set_threaded_log_function()
SERVER_EXPORT void set_threaded_log_function()
{
change_thread_log_function(Jack::JackMessageBufferAdd);
}
@@ -94,7 +94,7 @@ static void jack_format_and_log(int level, const char *prefix, const char *fmt,
log_function(level, buffer);
}

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

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

EXPORT void jack_log(const char *fmt,...)
SERVER_EXPORT void jack_log(const char *fmt,...)
{
if (jack_verbose) {
va_list ap;
@@ -132,5 +132,5 @@ static void default_jack_info_callback (const char *desc)
fflush(stdout);
}

EXPORT void (*jack_error_callback)(const char *desc) = &default_jack_error_callback;
EXPORT void (*jack_info_callback)(const char *desc) = &default_jack_info_callback;
SERVER_EXPORT void (*jack_error_callback)(const char *desc) = &default_jack_error_callback;
SERVER_EXPORT void (*jack_info_callback)(const char *desc) = &default_jack_info_callback;

+ 6
- 6
common/JackError.h View File

@@ -36,22 +36,22 @@ extern "C"
#define LOG_LEVEL_INFO 1
#define LOG_LEVEL_ERROR 2

EXPORT void jack_error(const char *fmt, ...);
SERVER_EXPORT void jack_error(const char *fmt, ...);

EXPORT void jack_info(const char *fmt, ...);
SERVER_EXPORT void jack_info(const char *fmt, ...);

// like jack_info() but only if verbose mode is enabled
EXPORT void jack_log(const char *fmt, ...);
SERVER_EXPORT void jack_log(const char *fmt, ...);

EXPORT extern void (*jack_error_callback)(const char *desc);
EXPORT extern void (*jack_info_callback)(const char *desc);
SERVER_EXPORT extern void (*jack_error_callback)(const char *desc);
SERVER_EXPORT extern void (*jack_info_callback)(const char *desc);

typedef void (* jack_log_function_t)(int level, const char *message);

void change_thread_log_function(jack_log_function_t log_function);
void jack_log_function(int level, const char *message);
EXPORT void set_threaded_log_function();
SERVER_EXPORT void set_threaded_log_function();

extern int jack_verbose;



+ 2
- 2
common/JackException.h View File

@@ -33,7 +33,7 @@ namespace Jack
\brief Exception base class.
*/

class EXPORT JackException : public std::runtime_error {
class SERVER_EXPORT JackException : public std::runtime_error {

public:

@@ -61,7 +61,7 @@ class EXPORT JackException : public std::runtime_error {
\brief Exception possibly thrown by Net Slaves.
*/

class EXPORT JackNetException : public JackException {
class SERVER_EXPORT JackNetException : public JackException {

public:



+ 1
- 1
common/JackFrameTimer.h View File

@@ -32,7 +32,7 @@ namespace Jack
\brief A structure used for time management.
*/

class EXPORT JackTimer
class SERVER_EXPORT JackTimer
{

friend class JackFrameTimer;


+ 1
- 1
common/JackGraphManager.h View File

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

private:


+ 1
- 1
common/JackLockedEngine.h View File

@@ -30,7 +30,7 @@ namespace Jack
\brief Locked Engine, access to methods is serialized using a mutex.
*/

class EXPORT JackLockedEngine : public JackLockAble
class SERVER_EXPORT JackLockedEngine : public JackLockAble
{
private:



+ 4
- 4
common/JackNetAdapter.cpp View File

@@ -442,7 +442,7 @@ extern "C"

using namespace Jack;

EXPORT jack_driver_desc_t* jack_get_descriptor()
SERVER_EXPORT jack_driver_desc_t* jack_get_descriptor()
{
jack_driver_desc_t* desc = ( jack_driver_desc_t* ) calloc ( 1, sizeof ( jack_driver_desc_t ) );
@@ -527,7 +527,7 @@ extern "C"
return desc;
}

EXPORT int jack_internal_initialize ( jack_client_t* jack_client, const JSList* params )
SERVER_EXPORT int jack_internal_initialize ( jack_client_t* jack_client, const JSList* params )
{
jack_log ( "Loading netadapter" );

@@ -553,7 +553,7 @@ extern "C"
}
}

EXPORT int jack_initialize ( jack_client_t* jack_client, const char* load_init )
SERVER_EXPORT int jack_initialize ( jack_client_t* jack_client, const char* load_init )
{
JSList* params = NULL;
jack_driver_desc_t *desc = jack_get_descriptor();
@@ -567,7 +567,7 @@ extern "C"
return res;
}

EXPORT void jack_finish ( void* arg )
SERVER_EXPORT void jack_finish ( void* arg )
{
Jack::JackAudioAdapter* adapter = static_cast<Jack::JackAudioAdapter*> ( arg );



+ 2
- 2
common/JackNetDriver.cpp View File

@@ -554,7 +554,7 @@ namespace Jack
extern "C"
{
#endif
EXPORT jack_driver_desc_t* driver_get_descriptor ()
SERVER_EXPORT jack_driver_desc_t* driver_get_descriptor ()
{
jack_driver_desc_t* desc = ( jack_driver_desc_t* ) calloc ( 1, sizeof ( jack_driver_desc_t ) );
@@ -647,7 +647,7 @@ namespace Jack
return desc;
}

EXPORT Jack::JackDriverClientInterface* driver_initialize ( Jack::JackLockedEngine* engine, Jack::JackSynchro* table, const JSList* params )
SERVER_EXPORT Jack::JackDriverClientInterface* driver_initialize ( Jack::JackLockedEngine* engine, Jack::JackSynchro* table, const JSList* params )
{
char multicast_ip[16];
strcpy ( multicast_ip, DEFAULT_MULTICAST_IP );


+ 3
- 3
common/JackNetInterface.h View File

@@ -29,7 +29,7 @@ namespace Jack
\Brief This class describes the basic Net Interface, used by both master and slave
*/

class EXPORT JackNetInterface
class SERVER_EXPORT JackNetInterface
{
protected:
session_params_t fParams;
@@ -96,7 +96,7 @@ namespace Jack
\Brief This class describes the Net Interface for masters (NetMaster)
*/

class EXPORT JackNetMasterInterface : public JackNetInterface
class SERVER_EXPORT JackNetMasterInterface : public JackNetInterface
{
protected:
bool fRunning;
@@ -127,7 +127,7 @@ namespace Jack
\Brief This class describes the Net Interface for slaves (NetDriver and NetAdapter)
*/

class EXPORT JackNetSlaveInterface : public JackNetInterface
class SERVER_EXPORT JackNetSlaveInterface : public JackNetInterface
{
protected:
static uint fSlaveCounter;


+ 4
- 4
common/JackNetManager.cpp View File

@@ -691,7 +691,7 @@ extern "C"
{
#endif

EXPORT jack_driver_desc_t* jack_get_descriptor()
SERVER_EXPORT jack_driver_desc_t* jack_get_descriptor()
{
jack_driver_desc_t *desc;
desc = ( jack_driver_desc_t* ) calloc ( 1, sizeof ( jack_driver_desc_t ) );
@@ -721,7 +721,7 @@ extern "C"
return desc;
}

EXPORT int jack_internal_initialize ( jack_client_t* jack_client, const JSList* params )
SERVER_EXPORT int jack_internal_initialize ( jack_client_t* jack_client, const JSList* params )
{
if ( master_manager )
{
@@ -736,7 +736,7 @@ extern "C"
}
}

EXPORT int jack_initialize ( jack_client_t* jack_client, const char* load_init )
SERVER_EXPORT int jack_initialize ( jack_client_t* jack_client, const char* load_init )
{
JSList* params = NULL;
jack_driver_desc_t* desc = jack_get_descriptor();
@@ -750,7 +750,7 @@ extern "C"
return res;
}

EXPORT void jack_finish ( void* arg )
SERVER_EXPORT void jack_finish ( void* arg )
{
if (master_manager) {
jack_log ( "Unloading Master Manager" );


+ 1
- 1
common/JackNetSocket.h View File

@@ -30,7 +30,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
namespace Jack
{
//get host name*********************************
EXPORT int GetHostName ( char * name, int size );
SERVER_EXPORT int GetHostName ( char * name, int size );

//net errors ***********************************
enum _net_error


+ 11
- 11
common/JackNetTool.cpp View File

@@ -164,7 +164,7 @@ namespace Jack

// SessionParams ************************************************************************************

EXPORT void SessionParamsHToN ( session_params_t* params )
SERVER_EXPORT void SessionParamsHToN ( session_params_t* params )
{
params->fPacketID = htonl ( params->fPacketID );
params->fMtu = htonl ( params->fMtu );
@@ -181,7 +181,7 @@ namespace Jack
params->fSlaveSyncMode = htonl ( params->fSlaveSyncMode );
}

EXPORT void SessionParamsNToH ( session_params_t* params )
SERVER_EXPORT void SessionParamsNToH ( session_params_t* params )
{
params->fPacketID = ntohl ( params->fPacketID );
params->fMtu = ntohl ( params->fMtu );
@@ -198,7 +198,7 @@ namespace Jack
params->fSlaveSyncMode = ntohl ( params->fSlaveSyncMode );
}

EXPORT void SessionParamsDisplay ( session_params_t* params )
SERVER_EXPORT void SessionParamsDisplay ( session_params_t* params )
{
char bitdepth[16];
( params->fBitdepth ) ? sprintf ( bitdepth, "%u", params->fBitdepth ) : sprintf ( bitdepth, "%s", "float" );
@@ -235,7 +235,7 @@ namespace Jack
jack_info ( "****************************************************" );
}

EXPORT sync_packet_type_t GetPacketType ( session_params_t* params )
SERVER_EXPORT sync_packet_type_t GetPacketType ( session_params_t* params )
{
switch ( params->fPacketID )
{
@@ -253,7 +253,7 @@ namespace Jack
return INVALID;
}

EXPORT int SetPacketType ( session_params_t* params, sync_packet_type_t packet_type )
SERVER_EXPORT int SetPacketType ( session_params_t* params, sync_packet_type_t packet_type )
{
switch ( packet_type )
{
@@ -279,7 +279,7 @@ namespace Jack

// Packet header **********************************************************************************

EXPORT void PacketHeaderHToN ( packet_header_t* header )
SERVER_EXPORT void PacketHeaderHToN ( packet_header_t* header )
{
header->fID = htonl ( header->fID );
header->fMidiDataSize = htonl ( header->fMidiDataSize );
@@ -291,7 +291,7 @@ namespace Jack
header->fIsLastPckt = htonl ( header->fIsLastPckt );
}

EXPORT void PacketHeaderNToH ( packet_header_t* header )
SERVER_EXPORT void PacketHeaderNToH ( packet_header_t* header )
{
header->fID = ntohl ( header->fID );
header->fMidiDataSize = ntohl ( header->fMidiDataSize );
@@ -303,7 +303,7 @@ namespace Jack
header->fIsLastPckt = ntohl ( header->fIsLastPckt );
}

EXPORT void PacketHeaderDisplay ( packet_header_t* header )
SERVER_EXPORT void PacketHeaderDisplay ( packet_header_t* header )
{
char bitdepth[16];
( header->fBitdepth ) ? sprintf ( bitdepth, "%u", header->fBitdepth ) : sprintf ( bitdepth, "%s", "float" );
@@ -322,7 +322,7 @@ namespace Jack

// Utility *******************************************************************************************************

EXPORT int SocketAPIInit()
SERVER_EXPORT int SocketAPIInit()
{
#ifdef WIN32
WORD wVersionRequested = MAKEWORD ( 2, 2 );
@@ -344,7 +344,7 @@ namespace Jack
return 0;
}

EXPORT int SocketAPIEnd()
SERVER_EXPORT int SocketAPIEnd()
{
#ifdef WIN32
return WSACleanup();
@@ -352,7 +352,7 @@ namespace Jack
return 0;
}

EXPORT const char* GetTransportState ( int transport_state )
SERVER_EXPORT const char* GetTransportState ( int transport_state )
{
switch ( transport_state )
{


+ 13
- 13
common/JackNetTool.h View File

@@ -199,7 +199,7 @@ namespace Jack

*/

class EXPORT NetMidiBuffer
class SERVER_EXPORT NetMidiBuffer
{
private:
int fNPorts;
@@ -240,7 +240,7 @@ namespace Jack

*/

class EXPORT NetAudioBuffer
class SERVER_EXPORT NetAudioBuffer
{
private:
int fNPorts;
@@ -265,21 +265,21 @@ namespace Jack
//utility *************************************************************************************

//socket API management
EXPORT int SocketAPIInit();
EXPORT int SocketAPIEnd();
SERVER_EXPORT int SocketAPIInit();
SERVER_EXPORT int SocketAPIEnd();
//n<-->h functions
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 );
SERVER_EXPORT void SessionParamsHToN ( session_params_t* params );
SERVER_EXPORT void SessionParamsNToH ( session_params_t* params );
SERVER_EXPORT void PacketHeaderHToN ( packet_header_t* header );
SERVER_EXPORT void PacketHeaderNToH ( packet_header_t* header );
//display session parameters
EXPORT void SessionParamsDisplay ( session_params_t* params );
SERVER_EXPORT void SessionParamsDisplay ( session_params_t* params );
//display packet header
EXPORT void PacketHeaderDisplay ( packet_header_t* header );
SERVER_EXPORT void PacketHeaderDisplay ( packet_header_t* header );
//get the packet type from a sesion parameters
EXPORT sync_packet_type_t GetPacketType ( session_params_t* params );
SERVER_EXPORT sync_packet_type_t GetPacketType ( session_params_t* params );
//set the packet type in a session parameters
EXPORT int SetPacketType ( session_params_t* params, sync_packet_type_t packet_type );
SERVER_EXPORT int SetPacketType ( session_params_t* params, sync_packet_type_t packet_type );
//transport utility
EXPORT const char* GetTransportState ( int transport_state );
SERVER_EXPORT const char* GetTransportState ( int transport_state );
}

+ 1
- 1
common/JackPort.h View File

@@ -35,7 +35,7 @@ namespace Jack
\brief Base class for port.
*/

class EXPORT JackPort
class SERVER_EXPORT JackPort
{

friend class JackGraphManager;


+ 1
- 1
common/JackRestartThreadedDriver.h View File

@@ -30,7 +30,7 @@ namespace Jack
\brief Restart a driver after an exception is thrown.
*/

class EXPORT JackRestartThreadedDriver : public JackThreadedDriver
class SERVER_EXPORT JackRestartThreadedDriver : public JackThreadedDriver
{
public:



+ 1
- 1
common/JackServer.h View File

@@ -44,7 +44,7 @@ class JackLoadableInternalClient;
\brief The Jack server.
*/

class EXPORT JackServer
class SERVER_EXPORT JackServer
{

private:


+ 3
- 3
common/JackShmMem.h View File

@@ -34,8 +34,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
namespace Jack
{

EXPORT void LockMemoryImp(void* ptr, size_t size);
EXPORT void UnlockMemoryImp(void* ptr, size_t size);
SERVER_EXPORT void LockMemoryImp(void* ptr, size_t size);
SERVER_EXPORT void UnlockMemoryImp(void* ptr, size_t size);

class JackMem
{
@@ -120,7 +120,7 @@ class JackShmMemAble
A class which objects need to be allocated in shared memory derives from this class.
*/

class EXPORT JackShmMem : public JackShmMemAble
class SERVER_EXPORT JackShmMem : public JackShmMemAble
{

protected:


+ 5
- 5
common/JackThread.h View File

@@ -57,7 +57,7 @@ class JackRunnableInterface
namespace detail
{

class EXPORT JackThreadInterface
class SERVER_EXPORT JackThreadInterface
{

public:
@@ -113,10 +113,10 @@ class EXPORT JackThreadInterface

} // end of namespace

EXPORT bool jack_tls_allocate_key(jack_tls_key *key_ptr);
EXPORT bool jack_tls_free_key(jack_tls_key key);
bool jack_tls_allocate_key(jack_tls_key *key_ptr);
bool jack_tls_free_key(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);
bool jack_tls_set(jack_tls_key key, void *data_ptr);
void *jack_tls_get(jack_tls_key key);

#endif

+ 1
- 1
common/JackThreadedDriver.h View File

@@ -31,7 +31,7 @@ namespace Jack
\brief The base class for threaded drivers. Threaded drivers are used with blocking devices.
*/

class EXPORT JackThreadedDriver : public JackDriverClientInterface, public JackRunnableInterface
class SERVER_EXPORT JackThreadedDriver : public JackDriverClientInterface, public JackRunnableInterface
{

protected:


+ 1
- 1
common/JackTime.c View File

@@ -42,7 +42,7 @@ void InitTime()

#ifdef WIN32

EXPORT LARGE_INTEGER _jack_freq;
SERVER_EXPORT LARGE_INTEGER _jack_freq;

void InitTime()
{


+ 2
- 2
common/JackTools.h View File

@@ -50,7 +50,7 @@ namespace Jack
\brief Utility functions.
*/

struct EXPORT JackTools
struct SERVER_EXPORT JackTools
{
static int GetPID();
static int GetUID();
@@ -67,7 +67,7 @@ namespace Jack
\brief Internal cient command line parser.
*/

class EXPORT JackArgParser
class SERVER_EXPORT JackArgParser
{
private:



+ 1
- 1
common/JackTransportEngine.h View File

@@ -89,7 +89,7 @@ We have:

class JackClientInterface;

class EXPORT JackTransportEngine : public JackAtomicArrayState<jack_position_t>
class SERVER_EXPORT JackTransportEngine : public JackAtomicArrayState<jack_position_t>
{

private:


+ 2
- 2
common/JackWaitThreadedDriver.h View File

@@ -31,11 +31,11 @@ namespace Jack
\brief To be used as a wrapper of JackNetDriver.
*/

class EXPORT JackWaitThreadedDriver : public JackThreadedDriver
class SERVER_EXPORT JackWaitThreadedDriver : public JackThreadedDriver
{
private:
struct EXPORT JackDriverStarter : public JackRunnableInterface
struct SERVER_EXPORT JackDriverStarter : public JackRunnableInterface
{
JackDriver* fDriver;


+ 1
- 1
common/driver_interface.h View File

@@ -87,7 +87,7 @@ extern "C"
jack_driver_desc_t;


EXPORT int jack_parse_driver_params (jack_driver_desc_t * desc, int argc, char* argv[], JSList ** param_ptr);
SERVER_EXPORT int jack_parse_driver_params (jack_driver_desc_t * desc, int argc, char* argv[], JSList ** param_ptr);

#ifdef __cplusplus
}


+ 1
- 1
common/wscript View File

@@ -114,7 +114,7 @@ def build(bld):

serverlib = bld.create_obj('cpp', 'shlib')
serverlib.features.append('cc')
serverlib.defines = 'HAVE_CONFIG_H'
serverlib.defines = ['HAVE_CONFIG_H','SERVER_SIDE']
serverlib.includes = includes
serverlib.name = 'serverlib'
serverlib.target = 'jackserver'


+ 2
- 2
linux/alsa/JackAlsaDriver.cpp View File

@@ -2448,7 +2448,7 @@ extern "C"
return 0;
}

EXPORT const jack_driver_desc_t* driver_get_descriptor ()
SERVER_EXPORT const jack_driver_desc_t* driver_get_descriptor ()
{
jack_driver_desc_t * desc;
jack_driver_param_desc_t * params;
@@ -2624,7 +2624,7 @@ extern "C"
return desc;
}

EXPORT Jack::JackDriverClientInterface* driver_initialize(Jack::JackLockedEngine* engine, Jack::JackSynchro* table, const JSList* params)
SERVER_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;


+ 2
- 2
linux/firewire/JackFFADODriver.cpp View File

@@ -809,7 +809,7 @@ extern "C"
{
#endif

EXPORT const jack_driver_desc_t *
SERVER_EXPORT const jack_driver_desc_t *
driver_get_descriptor () {
jack_driver_desc_t * desc;
jack_driver_param_desc_t * params;
@@ -916,7 +916,7 @@ extern "C"
return desc;
}

EXPORT Jack::JackDriverClientInterface* driver_initialize(Jack::JackLockedEngine* engine, Jack::JackSynchro* table, const JSList* params) {
SERVER_EXPORT Jack::JackDriverClientInterface* driver_initialize(Jack::JackLockedEngine* engine, Jack::JackSynchro* table, const JSList* params) {
const JSList * node;
const jack_driver_param_t * param;



+ 1
- 1
macosx/JackMachSemaphore.h View File

@@ -36,7 +36,7 @@ namespace Jack
\brief Inter process synchronization using using Mach semaphore.
*/

class EXPORT JackMachSemaphore : public detail::JackSynchro
class SERVER_EXPORT JackMachSemaphore : public detail::JackSynchro
{

private:


+ 1
- 1
macosx/JackMachThread.h View File

@@ -78,7 +78,7 @@ namespace Jack
\brief Darwin threads. Real-time threads are actually "time constraint" threads.
*/

class EXPORT JackMachThread : public JackPosixThread
class SERVER_EXPORT JackMachThread : public JackPosixThread
{

private:


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

@@ -11259,6 +11259,7 @@
"-DUSE_POSIX_SHM",
);
OTHER_CPLUSPLUSFLAGS = (
"-DSERVER_SIDE",
"-D__SMP__",
"-DMACH_RPC_MACH_SEMA",
"$(OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_1)",
@@ -11318,6 +11319,7 @@
"-DUSE_POSIX_SHM",
);
OTHER_CPLUSPLUSFLAGS = (
"-DSERVER_SIDE",
"-D__SMP__",
"-DMACH_RPC_MACH_SEMA",
"$(OTHER_CPLUSPLUSFLAGS_QUOTED_2)",


+ 1
- 1
macosx/coreaudio/JackCoreAudioAdapter.cpp View File

@@ -947,7 +947,7 @@ extern "C"
{
#endif

EXPORT jack_driver_desc_t* jack_get_descriptor()
SERVER_EXPORT jack_driver_desc_t* jack_get_descriptor()
{
jack_driver_desc_t *desc;
unsigned int i;


+ 1
- 1
macosx/coreaudio/JackCoreAudioAdapter.h View File

@@ -140,7 +140,7 @@ extern "C"
#include "JackCompilerDeps.h"
#include "driver_interface.h"

EXPORT jack_driver_desc_t* jack_get_descriptor();
SERVER_EXPORT jack_driver_desc_t* jack_get_descriptor();

#ifdef __cplusplus
}


+ 2
- 2
macosx/coreaudio/JackCoreAudioDriver.cpp View File

@@ -1144,7 +1144,7 @@ extern "C"
{
#endif

EXPORT jack_driver_desc_t* driver_get_descriptor()
SERVER_EXPORT jack_driver_desc_t* driver_get_descriptor()
{
jack_driver_desc_t *desc;
unsigned int i;
@@ -1271,7 +1271,7 @@ extern "C"
return desc;
}

EXPORT Jack::JackDriverClientInterface* driver_initialize(Jack::JackLockedEngine* engine, Jack::JackSynchro* table, const JSList* params)
SERVER_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;


+ 6
- 0
posix/JackCompilerDeps_os.h View File

@@ -23,9 +23,15 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#if __GNUC__
#define MEM_ALIGN(x,y) x __attribute__((aligned(y)))
#define EXPORT __attribute__((visibility("default")))
#ifdef SERVER_SIDE
#define SERVER_EXPORT __attribute__((visibility("default")))
#else
#define SERVER_EXPORT
#endif
#else
#define MEM_ALIGN(x,y) x
#define EXPORT
#define SERVER_EXPORT
#endif
#endif


+ 1
- 1
posix/JackFifo.h View File

@@ -32,7 +32,7 @@ namespace Jack
\brief Inter process synchronization using Fifo.
*/

class EXPORT JackFifo : public detail::JackSynchro
class SERVER_EXPORT JackFifo : public detail::JackSynchro
{

private:


+ 1
- 1
posix/JackNetUnixSocket.h View File

@@ -37,7 +37,7 @@ namespace Jack
typedef struct in_addr address_t;

//JackNetUnixSocket********************************************
class EXPORT JackNetUnixSocket
class SERVER_EXPORT JackNetUnixSocket
{
private:
int fSockfd;


+ 1
- 1
posix/JackPosixSemaphore.h View File

@@ -33,7 +33,7 @@ namespace Jack
\brief Inter process synchronization using POSIX semaphore.
*/

class EXPORT JackPosixSemaphore : public detail::JackSynchro
class SERVER_EXPORT JackPosixSemaphore : public detail::JackSynchro
{

private:


+ 5
- 5
posix/JackPosixThread.cpp View File

@@ -261,7 +261,7 @@ void JackPosixThread::Terminate()
pthread_exit(0);
}

EXPORT void ThreadExit()
SERVER_EXPORT void ThreadExit()
{
jack_log("ThreadExit");
pthread_exit(0);
@@ -269,7 +269,7 @@ EXPORT void ThreadExit()

} // end of namespace

EXPORT bool jack_tls_allocate_key(jack_tls_key *key_ptr)
bool jack_tls_allocate_key(jack_tls_key *key_ptr)
{
int ret;
@@ -283,7 +283,7 @@ EXPORT bool jack_tls_allocate_key(jack_tls_key *key_ptr)
return true;
}

EXPORT bool jack_tls_free_key(jack_tls_key key)
bool jack_tls_free_key(jack_tls_key key)
{
int ret;
@@ -297,7 +297,7 @@ EXPORT bool jack_tls_free_key(jack_tls_key key)
return true;
}

EXPORT bool jack_tls_set(jack_tls_key key, void *data_ptr)
bool jack_tls_set(jack_tls_key key, void *data_ptr)
{
int ret;
@@ -311,7 +311,7 @@ EXPORT bool jack_tls_set(jack_tls_key key, void *data_ptr)
return true;
}

EXPORT void *jack_tls_get(jack_tls_key key)
void *jack_tls_get(jack_tls_key key)
{
return pthread_getspecific(key);
}

+ 2
- 2
posix/JackPosixThread.h View File

@@ -35,7 +35,7 @@ namespace Jack
\brief The POSIX thread base class.
*/

class EXPORT JackPosixThread : public detail::JackThreadInterface
class SERVER_EXPORT JackPosixThread : public detail::JackThreadInterface
{

protected:
@@ -71,7 +71,7 @@ class EXPORT JackPosixThread : public detail::JackThreadInterface
static int KillImp(pthread_t thread);
};

EXPORT void ThreadExit();
SERVER_EXPORT void ThreadExit();

} // end of namespace



+ 11
- 1
windows/JackCompilerDeps_os.h View File

@@ -21,12 +21,22 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#define __JackCompilerDeps_WIN32__

#if __GNUC__
#define MEM_ALIGN(x,y) x __attribute__((aligned(y)))
#define MEM_ALIGN(x,y) x __attribute__((aligned(y)))
#define EXPORT __declspec(dllexport)
#ifdef SERVER_SIDE
#define SERVER_EXPORT __declspec(dllexport)
#else
#define SERVER_EXPORT
#endif
#else
//#define MEM_ALIGN(x,y) __declspec(align(y)) x
#define MEM_ALIGN(x,y) x
#define EXPORT __declspec(dllexport)
#ifdef SERVER_SIDE
#define SERVER_EXPORT __declspec(dllexport)
#else
#define SERVER_EXPORT
#endif
#endif

#endif

+ 2
- 2
windows/JackNetWinSocket.cpp View File

@@ -22,7 +22,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
namespace Jack
{
//utility *********************************************************************************************************
EXPORT int GetHostName ( char * name, int size )
SERVER_EXPORT int GetHostName ( char * name, int size )
{
if ( gethostname ( name, size ) == SOCKET_ERROR )
{
@@ -92,7 +92,7 @@ namespace Jack
{ -1, NULL },
};

EXPORT const char* PrintError ( int error )
SERVER_EXPORT const char* PrintError ( int error )
{
int i;
for ( i = 0; NetErrorList[i].code >= 0; ++i )


+ 2
- 2
windows/JackNetWinSocket.h View File

@@ -36,10 +36,10 @@ namespace Jack
typedef uint32_t uint;
typedef int SOCKLEN;

EXPORT const char* PrintError ( int error );
SERVER_EXPORT const char* PrintError ( int error );

//JeckNetWinSocket***************************************************************************
class EXPORT JackNetWinSocket
class SERVER_EXPORT JackNetWinSocket
{
private:
int fSockfd;


+ 2
- 2
windows/JackTime_os.h View File

@@ -26,9 +26,9 @@ extern "C"
{
#endif

extern EXPORT LARGE_INTEGER _jack_freq;
extern SERVER_EXPORT LARGE_INTEGER _jack_freq;

EXPORT jack_time_t GetMicroSeconds(void) ;
SERVER_EXPORT jack_time_t GetMicroSeconds(void) ;

void InitTime();



+ 5
- 5
windows/JackWinThread.cpp View File

@@ -228,7 +228,7 @@ void JackWinThread::Terminate()
ExitThread(0);
}

EXPORT void ThreadExit()
SERVER_EXPORT void ThreadExit()
{
jack_log("ThreadExit");
ExitThread(0);
@@ -236,7 +236,7 @@ EXPORT void ThreadExit()

} // end of namespace

EXPORT bool jack_tls_allocate_key(jack_tls_key *key_ptr)
bool jack_tls_allocate_key(jack_tls_key *key_ptr)
{
DWORD key;
@@ -251,7 +251,7 @@ EXPORT bool jack_tls_allocate_key(jack_tls_key *key_ptr)
return true;
}

EXPORT bool jack_tls_free_key(jack_tls_key key)
bool jack_tls_free_key(jack_tls_key key)
{
if (!TlsFree(key))
{
@@ -262,7 +262,7 @@ EXPORT bool jack_tls_free_key(jack_tls_key key)
return true;
}

EXPORT bool jack_tls_set(jack_tls_key key, void *data_ptr)
bool jack_tls_set(jack_tls_key key, void *data_ptr)
{
if (!TlsSetValue(key, data_ptr))
{
@@ -273,7 +273,7 @@ EXPORT bool jack_tls_set(jack_tls_key key, void *data_ptr)
return true;
}

EXPORT void *jack_tls_get(jack_tls_key key)
void *jack_tls_get(jack_tls_key key)
{
return TlsGetValue(key);
}

+ 2
- 2
windows/JackWinThread.h View File

@@ -36,7 +36,7 @@ typedef DWORD (WINAPI *ThreadCallback)(void *arg);
\brief Windows threads.
*/

class EXPORT JackWinThread : public detail::JackThreadInterface
class SERVER_EXPORT JackWinThread : public detail::JackThreadInterface
{

private:
@@ -71,7 +71,7 @@ class EXPORT JackWinThread : public detail::JackThreadInterface

};

EXPORT void ThreadExit();
SERVER_EXPORT void ThreadExit();

} // end of namespace



+ 3
- 0
windows/libjackserver.cbp View File

@@ -24,6 +24,7 @@
<Add option="-DLIBJACKDMP_EXPORTS" />
<Add option="-DREGEX_MALLOC" />
<Add option="-DSTDC_HEADERS" />
<Add option="-DSERVER_SIDE" />
<Add option="-D__SMP__" />
<Add directory="." />
<Add directory="..\windows" />
@@ -49,6 +50,7 @@
<Add option="-DLIBJACKDMP_EXPORTS" />
<Add option="-DREGEX_MALLOC" />
<Add option="-DSTDC_HEADERS" />
<Add option="-DSERVER_SIDE" />
<Add option="-D__SMP__" />
<Add directory="." />
<Add directory="..\windows" />
@@ -74,6 +76,7 @@
<Add option="-DLIBJACKDMP_EXPORTS" />
<Add option="-DREGEX_MALLOC" />
<Add option="-DSTDC_HEADERS" />
<Add option="-DSERVER_SIDE" />
<Add option="-D__SMP__" />
<Add option="-DJACK_MONITOR" />
<Add directory="." />


+ 2
- 2
windows/portaudio/JackPortAudioDriver.cpp View File

@@ -265,7 +265,7 @@ extern "C"

#include "JackCompilerDeps.h"

EXPORT jack_driver_desc_t* driver_get_descriptor()
SERVER_EXPORT jack_driver_desc_t* driver_get_descriptor()
{
jack_driver_desc_t *desc;
unsigned int i;
@@ -385,7 +385,7 @@ extern "C"
return desc;
}

EXPORT Jack::JackDriverClientInterface* driver_initialize(Jack::JackLockedEngine* engine, Jack::JackSynchro* table, const JSList* params)
SERVER_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 = 512;


Loading…
Cancel
Save