diff --git a/ChangeLog b/ChangeLog index 23c99efe..574f1f46 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,10 @@ Paul Davis Jackdmp changes log --------------------------- +2009-11-05 Stephane Letz + + * No reason to make jack_on_shutdown deprecated, so revert the incorrect change. + 2009-10-30 Stephane Letz * In JackCoreAudioDriver, improve management of input/output channels: -1 is now used internally to indicate a wanted max value. diff --git a/common/JackAPI.cpp b/common/JackAPI.cpp index 34e591e4..8ca99bd4 100644 --- a/common/JackAPI.cpp +++ b/common/JackAPI.cpp @@ -814,7 +814,6 @@ EXPORT void jack_on_shutdown(jack_client_t* ext_client, JackShutdownCallback cal JackLibGlobals::CheckContext(); #endif JackClient* client = (JackClient*)ext_client; - jack_error("jack_on_shutdown: deprecated, use jack_on_info_shutdown"); if (client == NULL) { jack_error("jack_on_shutdown called with a NULL client"); } else { diff --git a/common/jack/jack.h b/common/jack/jack.h index ebdded77..19ef307b 100644 --- a/common/jack/jack.h +++ b/common/jack/jack.h @@ -282,7 +282,7 @@ int jack_set_thread_init_callback (jack_client_t *client, * @param function The jack_shutdown function pointer. * @param arg The arguments for the jack_shutdown function. * - * @deprecated Register a function (and argument) to be called if and when the + * Register a function (and argument) to be called if and when the * JACK server shuts down the client thread. The function must * be written as if it were an asynchonrous POSIX signal * handler --- use only async-safe functions, and remember that it diff --git a/common/jack/types.h b/common/jack/types.h index f7e03d3c..57cf25d5 100644 --- a/common/jack/types.h +++ b/common/jack/types.h @@ -214,7 +214,7 @@ typedef int (*JackPortRenameCallback)(jack_port_id_t port, const char* new_name, typedef void (*JackFreewheelCallback)(int starting, void *arg); /** - * @deprecated Prototype for the client supplied function that is called + * Prototype for the client supplied function that is called * whenever jackd is shutdown. Note that after server shutdown, * the client pointer is *not* deallocated by libjack, * the application is responsible to properly use jack_client_close()