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

Merge branch 'export-fixes' 

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4375 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/1.9.8
sletz 15 years ago
parent
2d12663fda 6c37846449
commit
265c069d9f
5 changed files with 32 additions and 36 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +3
    -3
      common/JackDriverLoader.cpp
  2. +3
    -3
      common/JackDriverLoader.h
  3. +10
    -10
      common/JackError.cpp
  4. +10
    -10
      common/JackError.h
  5. +6
    -10
      macosx/Jackdmp.xcodeproj/project.pbxproj

+ 3
- 3
common/JackDriverLoader.cpp View File

@@ -32,7 +32,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

jack_driver_desc_t * jackctl_driver_get_desc(jackctl_driver_t * driver);

EXPORT void jack_print_driver_options(jack_driver_desc_t* desc, FILE* file)
SERVER_EXPORT void jack_print_driver_options(jack_driver_desc_t* desc, FILE* file)
{
unsigned long i;
char arg_default[JACK_DRIVER_PARAM_STRING_MAX + 1];
@@ -75,7 +75,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;
@@ -228,7 +228,7 @@ jack_parse_driver_params(jack_driver_desc_t * desc, int argc, char* argv[], JSLi
return 0;
}

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


+ 3
- 3
common/JackDriverLoader.h View File

@@ -59,9 +59,9 @@ jack_driver_desc_t * jack_find_driver_descriptor(JSList * drivers, const char *
JSList * jack_drivers_load(JSList * drivers);
JSList * jack_internals_load(JSList * internals);

EXPORT int jackctl_parse_driver_params (jackctl_driver * driver_ptr, int argc, char* argv[]);
EXPORT void jack_free_driver_params(JSList * param_ptr);
EXPORT void jack_print_driver_options(jack_driver_desc_t* desc, FILE* file);
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);
SERVER_EXPORT void jack_print_driver_options(jack_driver_desc_t* desc, FILE* file);

#endif


+ 10
- 10
common/JackError.cpp View File

@@ -33,7 +33,7 @@ static bool change_thread_log_function(jack_log_function_t log_function)
&& jack_tls_set(JackGlobals::fKeyLogFunction, (void*)log_function));
}

EXPORT int set_threaded_log_function()
SERVER_EXPORT int set_threaded_log_function()
{
return change_thread_log_function(JackMessageBufferAdd);
}
@@ -88,7 +88,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);
@@ -96,7 +96,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);
@@ -104,7 +104,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 (JackGlobals::fVerbose) {
va_list ap;
@@ -114,23 +114,23 @@ EXPORT void jack_log(const char *fmt,...)
}
}

EXPORT void default_jack_error_callback(const char *desc)
SERVER_EXPORT void default_jack_error_callback(const char *desc)
{
fprintf(stderr, "%s\n", desc);
fflush(stderr);
}

EXPORT void default_jack_info_callback(const char *desc)
SERVER_EXPORT void default_jack_info_callback(const char *desc)
{
fprintf(stdout, "%s\n", desc);
fflush(stdout);
}

EXPORT void silent_jack_error_callback(const char *desc)
SERVER_EXPORT void silent_jack_error_callback(const char *desc)
{}

EXPORT void silent_jack_info_callback(const char *desc)
SERVER_EXPORT void silent_jack_info_callback(const char *desc)
{}

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;

+ 10
- 10
common/JackError.h View File

@@ -34,27 +34,27 @@ 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);

EXPORT extern void default_jack_error_callback(const char *desc);
EXPORT extern void default_jack_info_callback(const char *desc);
SERVER_EXPORT extern void default_jack_error_callback(const char *desc);
SERVER_EXPORT extern void default_jack_info_callback(const char *desc);

EXPORT extern void silent_jack_error_callback(const char *desc);
EXPORT extern void silent_jack_info_callback(const char *desc);
SERVER_EXPORT extern void silent_jack_error_callback(const char *desc);
SERVER_EXPORT extern void silent_jack_info_callback(const char *desc);

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

void jack_log_function(int level, const char *message);

EXPORT int set_threaded_log_function();
SERVER_EXPORT int set_threaded_log_function();

#ifdef __cplusplus
}


+ 6
- 10
macosx/Jackdmp.xcodeproj/project.pbxproj View File

@@ -147,12 +147,8 @@
4B32253510A3173D00838A8E /* netjack_packet.c in Sources */ = {isa = PBXBuildFile; fileRef = 4B3224EC10A315C400838A8E /* netjack_packet.c */; };
4B32253610A3173E00838A8E /* netjack_packet.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B3224ED10A315C400838A8E /* netjack_packet.h */; };
4B32256410A318E300838A8E /* netsource.c in Sources */ = {isa = PBXBuildFile; fileRef = 4B32256310A318E300838A8E /* netsource.c */; };
4B32256B10A318FA00838A8E /* netjack.c in Sources */ = {isa = PBXBuildFile; fileRef = 4B3224EE10A315C400838A8E /* netjack.c */; };
4B32256C10A318FB00838A8E /* netjack.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B3224EF10A315C400838A8E /* netjack.h */; };
4B32256D10A318FC00838A8E /* netjack_packet.c in Sources */ = {isa = PBXBuildFile; fileRef = 4B3224EC10A315C400838A8E /* netjack_packet.c */; };
4B32256E10A318FD00838A8E /* netjack_packet.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B3224ED10A315C400838A8E /* netjack_packet.h */; };
4B32257D10A3195700838A8E /* netjack.c in Sources */ = {isa = PBXBuildFile; fileRef = 4B3224EE10A315C400838A8E /* netjack.c */; };
4B32257E10A3195800838A8E /* netjack.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B3224EF10A315C400838A8E /* netjack.h */; };
4B32257F10A3195900838A8E /* netjack_packet.c in Sources */ = {isa = PBXBuildFile; fileRef = 4B3224EC10A315C400838A8E /* netjack_packet.c */; };
4B32258010A3195A00838A8E /* netjack_packet.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B3224ED10A315C400838A8E /* netjack_packet.h */; };
4B32258110A3195B00838A8E /* netsource.c in Sources */ = {isa = PBXBuildFile; fileRef = 4B32256310A318E300838A8E /* netsource.c */; };
@@ -3310,7 +3306,6 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
4B32256C10A318FB00838A8E /* netjack.h in Headers */,
4B32256E10A318FD00838A8E /* netjack_packet.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -3319,7 +3314,6 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
4B32257E10A3195800838A8E /* netjack.h in Headers */,
4B32258010A3195A00838A8E /* netjack_packet.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -6768,7 +6762,6 @@
buildActionMask = 2147483647;
files = (
4B32256410A318E300838A8E /* netsource.c in Sources */,
4B32256B10A318FA00838A8E /* netjack.c in Sources */,
4B32256D10A318FC00838A8E /* netjack_packet.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -6777,7 +6770,6 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
4B32257D10A3195700838A8E /* netjack.c in Sources */,
4B32257F10A3195900838A8E /* netjack_packet.c in Sources */,
4B32258110A3195B00838A8E /* netsource.c in Sources */,
);
@@ -8883,13 +8875,14 @@
../common,
);
OTHER_CFLAGS = (
"-DNO_JACK_ERROR",
"-DHAVE_CELT",
"-DHAVE_CELT_API_0_7",
);
OTHER_CPLUSPLUSFLAGS = (
"-DNO_JACK_ERROR",
"-DHAVE_CELT",
"-DHAVE_CELT_API_0_7",
"$(OTHER_CFLAGS)",
);
OTHER_LDFLAGS = (
libcelt.a,
@@ -8928,13 +8921,14 @@
);
MACOSX_DEPLOYMENT_TARGET = 10.4;
OTHER_CFLAGS = (
"-DNO_JACK_ERROR",
"-DHAVE_CELT",
"-DHAVE_CELT_API_0_7",
);
OTHER_CPLUSPLUSFLAGS = (
"-DNO_JACK_ERROR",
"-DHAVE_CELT",
"-DHAVE_CELT_API_0_7",
"$(OTHER_CFLAGS)",
);
OTHER_LDFLAGS = (
libcelt.a,
@@ -9007,6 +9001,7 @@
../common,
);
OTHER_CFLAGS = (
"-DNO_JACK_ERROR",
"-DHAVE_CELT",
"-DHAVE_CELT_API_0_7",
);
@@ -9046,6 +9041,7 @@
);
MACOSX_DEPLOYMENT_TARGET = 10.4;
OTHER_CFLAGS = (
"-DNO_JACK_ERROR",
"-DHAVE_CELT",
"-DHAVE_CELT_API_0_7",
);


Write Preview
Loading…
Cancel
Save