git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@1752 0c269be4-1314-0410-8aa9-9f06e86f4224tags/0.69
| @@ -19,7 +19,7 @@ Tim Blechmann | |||||
| 2007-12-11 Stephane Letz <letz@grame.fr> | 2007-12-11 Stephane Letz <letz@grame.fr> | ||||
| * Change string management for proper compilation with gcc 4.2.2. | |||||
| * Change string management for proper compilation with gcc 4.2.2. JackLog cleanup. | |||||
| 2007-12-08 Stephane Letz <letz@grame.fr> | 2007-12-08 Stephane Letz <letz@grame.fr> | ||||
| @@ -237,13 +237,6 @@ static inline void WaitGraphChange() | |||||
| } | } | ||||
| } | } | ||||
| static void default_jack_error_callback(const char *desc) | |||||
| { | |||||
| fprintf(stderr, "%s\n", desc); | |||||
| } | |||||
| void (*jack_error_callback)(const char *desc) = &default_jack_error_callback; | |||||
| EXPORT void jack_set_error_function (void (*func)(const char *)) | EXPORT void jack_set_error_function (void (*func)(const char *)) | ||||
| { | { | ||||
| jack_error_callback = func; | jack_error_callback = func; | ||||
| @@ -30,8 +30,7 @@ EXPORT void jack_error(const char *fmt, ...) | |||||
| char buffer[300]; | char buffer[300]; | ||||
| va_start(ap, fmt); | va_start(ap, fmt); | ||||
| vsnprintf(buffer, sizeof(buffer), fmt, ap); | vsnprintf(buffer, sizeof(buffer), fmt, ap); | ||||
| //jack_error_callback(buffer); | |||||
| fprintf(stderr, "%s\n", buffer); | |||||
| jack_error_callback(buffer); | |||||
| va_end(ap); | va_end(ap); | ||||
| } | } | ||||
| @@ -46,3 +45,10 @@ EXPORT void JackLog(const char *fmt,...) | |||||
| } | } | ||||
| } | } | ||||
| static void default_jack_error_callback(const char *desc) | |||||
| { | |||||
| fprintf(stderr, "%s\n", desc); | |||||
| } | |||||
| void (*jack_error_callback)(const char *desc) = &default_jack_error_callback; | |||||
| @@ -39,6 +39,8 @@ extern "C" | |||||
| EXPORT void JackLog(const char *fmt, ...); | EXPORT void JackLog(const char *fmt, ...); | ||||
| extern int jack_verbose; | extern int jack_verbose; | ||||
| extern void (*jack_error_callback)(const char *desc); | |||||
| #ifdef __cplusplus | #ifdef __cplusplus | ||||
| } | } | ||||