Commit bfdf50d5 authored by sletz's avatar sletz
Browse files

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
parent 7723df5c
......@@ -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.
......
......@@ -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);
......
......@@ -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:
......
......@@ -32,7 +32,7 @@ struct JackClientControl;
\brief Client interface.
*/
class EXPORT JackClientInterface
class SERVER_EXPORT JackClientInterface
{
public:
......
......@@ -372,7 +372,7 @@ struct JackClientTiming
</UL>
*/
class EXPORT JackConnectionManager
class SERVER_EXPORT JackConnectionManager
{
private:
......
......@@ -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:
......
......@@ -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;
......
......@@ -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
......@@ -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;
......
......@@ -37,7 +37,7 @@ class JackExternalClient;
\brief Engine description.
*/
class EXPORT JackEngine
class SERVER_EXPORT JackEngine
{
private:
......
......@@ -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;
......
......@@ -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;
......@@ -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;
......
......@@ -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:
......
......@@ -32,7 +32,7 @@ namespace Jack
\brief A structure used for time management.
*/
class EXPORT JackTimer
class SERVER_EXPORT JackTimer
{
friend class JackFrameTimer;
......
......@@ -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:
......
......@@ -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:
......
......@@ -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 );
......
......@@ -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 );
......
......@@ -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;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment