From dddffd32942b9df7f571fdf421664bba1a02c53a Mon Sep 17 00:00:00 2001 From: sletz Date: Fri, 13 Jan 2012 21:51:02 +0000 Subject: [PATCH] Cleanup JACK API code. git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4698 0c269be4-1314-0410-8aa9-9f06e86f4224 --- common/JackAPI.cpp | 344 +++++++++++++-------------------------- common/JackGlobals.cpp | 8 + common/JackGlobals.h | 2 +- common/JackLibAPI.cpp | 6 +- common/JackServerAPI.cpp | 6 +- 5 files changed, 126 insertions(+), 240 deletions(-) diff --git a/common/JackAPI.cpp b/common/JackAPI.cpp index 1d3a25a5..37b215d8 100644 --- a/common/JackAPI.cpp +++ b/common/JackAPI.cpp @@ -28,10 +28,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "JackPortType.h" #include -#ifdef __CLIENTDEBUG__ -#include "JackLibGlobals.h" -#endif - using namespace Jack; #ifdef __cplusplus @@ -307,9 +303,8 @@ LIB_EXPORT void jack_set_info_function(print_function func) LIB_EXPORT jack_client_t* jack_client_new(const char* client_name) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_client_new"); -#endif + try { assert(JackGlobals::fOpenMutex); JackGlobals::fOpenMutex->Lock(); @@ -331,9 +326,8 @@ LIB_EXPORT jack_client_t* jack_client_new(const char* client_name) LIB_EXPORT void* jack_port_get_buffer(jack_port_t* port, jack_nframes_t frames) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_port_get_buffer"); -#endif + uintptr_t port_aux = (uintptr_t)port; jack_port_id_t myport = (jack_port_id_t)port_aux; if (!CheckPort(myport)) { @@ -347,9 +341,8 @@ LIB_EXPORT void* jack_port_get_buffer(jack_port_t* port, jack_nframes_t frames) LIB_EXPORT const char* jack_port_name(const jack_port_t* port) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_port_name"); -#endif + uintptr_t port_aux = (uintptr_t)port; jack_port_id_t myport = (jack_port_id_t)port_aux; if (!CheckPort(myport)) { @@ -363,9 +356,8 @@ LIB_EXPORT const char* jack_port_name(const jack_port_t* port) LIB_EXPORT const char* jack_port_short_name(const jack_port_t* port) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_port_short_name"); -#endif + uintptr_t port_aux = (uintptr_t)port; jack_port_id_t myport = (jack_port_id_t)port_aux; if (!CheckPort(myport)) { @@ -379,9 +371,8 @@ LIB_EXPORT const char* jack_port_short_name(const jack_port_t* port) LIB_EXPORT int jack_port_flags(const jack_port_t* port) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_port_flags"); -#endif + uintptr_t port_aux = (uintptr_t)port; jack_port_id_t myport = (jack_port_id_t)port_aux; if (!CheckPort(myport)) { @@ -395,12 +386,11 @@ LIB_EXPORT int jack_port_flags(const jack_port_t* port) LIB_EXPORT const char* jack_port_type(const jack_port_t* port) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_port_type"); -#endif + uintptr_t port_aux = (uintptr_t)port; jack_port_id_t myport = (jack_port_id_t)port_aux; - if (!CheckPort(myport)) { + if (!CheckPort(myport)) { jack_error("jack_port_flags called an incorrect port %ld", myport); return NULL; } else { @@ -411,9 +401,8 @@ LIB_EXPORT const char* jack_port_type(const jack_port_t* port) LIB_EXPORT jack_port_type_id_t jack_port_type_id(const jack_port_t *port) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_port_type_id"); -#endif + uintptr_t port_aux = (uintptr_t)port; jack_port_id_t myport = (jack_port_id_t)port_aux; if (!CheckPort(myport)) { @@ -427,9 +416,8 @@ LIB_EXPORT jack_port_type_id_t jack_port_type_id(const jack_port_t *port) LIB_EXPORT int jack_port_connected(const jack_port_t* port) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_port_connected"); -#endif + uintptr_t port_aux = (uintptr_t)port; jack_port_id_t myport = (jack_port_id_t)port_aux; if (!CheckPort(myport)) { @@ -444,9 +432,8 @@ LIB_EXPORT int jack_port_connected(const jack_port_t* port) LIB_EXPORT int jack_port_connected_to(const jack_port_t* port, const char* port_name) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_port_connected_to"); -#endif + uintptr_t port_aux = (uintptr_t)port; jack_port_id_t src = (jack_port_id_t)port_aux; if (!CheckPort(src)) { @@ -470,9 +457,8 @@ LIB_EXPORT int jack_port_connected_to(const jack_port_t* port, const char* port_ LIB_EXPORT int jack_port_tie(jack_port_t* src, jack_port_t* dst) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_port_tie"); -#endif + uintptr_t src_aux = (uintptr_t)src; jack_port_id_t mysrc = (jack_port_id_t)src_aux; if (!CheckPort(mysrc)) { @@ -496,9 +482,8 @@ LIB_EXPORT int jack_port_tie(jack_port_t* src, jack_port_t* dst) LIB_EXPORT int jack_port_untie(jack_port_t* port) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_port_untie"); -#endif + uintptr_t port_aux = (uintptr_t)port; jack_port_id_t myport = (jack_port_id_t)port_aux; if (!CheckPort(myport)) { @@ -512,9 +497,8 @@ LIB_EXPORT int jack_port_untie(jack_port_t* port) LIB_EXPORT jack_nframes_t jack_port_get_latency(jack_port_t* port) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_port_get_latency"); -#endif + uintptr_t port_aux = (uintptr_t)port; jack_port_id_t myport = (jack_port_id_t)port_aux; if (!CheckPort(myport)) { @@ -529,9 +513,8 @@ LIB_EXPORT jack_nframes_t jack_port_get_latency(jack_port_t* port) LIB_EXPORT void jack_port_set_latency(jack_port_t* port, jack_nframes_t frames) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_port_set_latency"); -#endif + uintptr_t port_aux = (uintptr_t)port; jack_port_id_t myport = (jack_port_id_t)port_aux; if (!CheckPort(myport)) { @@ -545,9 +528,8 @@ LIB_EXPORT void jack_port_set_latency(jack_port_t* port, jack_nframes_t frames) LIB_EXPORT void jack_port_get_latency_range(jack_port_t *port, jack_latency_callback_mode_t mode, jack_latency_range_t *range) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_port_get_latency_range"); -#endif + uintptr_t port_aux = (uintptr_t)port; jack_port_id_t myport = (jack_port_id_t)port_aux; if (!CheckPort(myport)) { @@ -562,9 +544,8 @@ LIB_EXPORT void jack_port_get_latency_range(jack_port_t *port, jack_latency_call LIB_EXPORT void jack_port_set_latency_range(jack_port_t *port, jack_latency_callback_mode_t mode, jack_latency_range_t *range) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_port_set_latency_range"); -#endif + uintptr_t port_aux = (uintptr_t)port; jack_port_id_t myport = (jack_port_id_t)port_aux; if (!CheckPort(myport)) { @@ -579,9 +560,8 @@ LIB_EXPORT void jack_port_set_latency_range(jack_port_t *port, jack_latency_call LIB_EXPORT int jack_recompute_total_latency(jack_client_t* ext_client, jack_port_t* port) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_recompute_total_latency"); -#endif + JackClient* client = (JackClient*)ext_client; uintptr_t port_aux = (uintptr_t)port; @@ -601,9 +581,7 @@ LIB_EXPORT int jack_recompute_total_latency(jack_client_t* ext_client, jack_port LIB_EXPORT int jack_recompute_total_latencies(jack_client_t* ext_client) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_recompute_total_latencies"); -#endif JackClient* client = (JackClient*)ext_client; if (client == NULL) { @@ -616,9 +594,8 @@ LIB_EXPORT int jack_recompute_total_latencies(jack_client_t* ext_client) LIB_EXPORT int jack_port_set_name(jack_port_t* port, const char* name) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_port_set_name"); -#endif + uintptr_t port_aux = (uintptr_t)port; jack_port_id_t myport = (jack_port_id_t)port_aux; if (!CheckPort(myport)) { @@ -641,9 +618,8 @@ LIB_EXPORT int jack_port_set_name(jack_port_t* port, const char* name) LIB_EXPORT int jack_port_set_alias(jack_port_t* port, const char* name) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_port_set_alias"); -#endif + uintptr_t port_aux = (uintptr_t)port; jack_port_id_t myport = (jack_port_id_t)port_aux; if (!CheckPort(myport)) { @@ -660,9 +636,8 @@ LIB_EXPORT int jack_port_set_alias(jack_port_t* port, const char* name) LIB_EXPORT int jack_port_unset_alias(jack_port_t* port, const char* name) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_port_unset_alias"); -#endif + uintptr_t port_aux = (uintptr_t)port; jack_port_id_t myport = (jack_port_id_t)port_aux; if (!CheckPort(myport)) { @@ -679,9 +654,8 @@ LIB_EXPORT int jack_port_unset_alias(jack_port_t* port, const char* name) LIB_EXPORT int jack_port_get_aliases(const jack_port_t* port, char* const aliases[2]) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_port_get_aliases"); -#endif + uintptr_t port_aux = (uintptr_t)port; jack_port_id_t myport = (jack_port_id_t)port_aux; if (!CheckPort(myport)) { @@ -695,9 +669,8 @@ LIB_EXPORT int jack_port_get_aliases(const jack_port_t* port, char* const aliase LIB_EXPORT int jack_port_request_monitor(jack_port_t* port, int onoff) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_port_request_monitor"); -#endif + uintptr_t port_aux = (uintptr_t)port; jack_port_id_t myport = (jack_port_id_t)port_aux; if (!CheckPort(myport)) { @@ -711,9 +684,8 @@ LIB_EXPORT int jack_port_request_monitor(jack_port_t* port, int onoff) LIB_EXPORT int jack_port_request_monitor_by_name(jack_client_t* ext_client, const char* port_name, int onoff) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_port_request_monitor_by_name"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_port_request_monitor_by_name called with a NULL client"); @@ -734,9 +706,8 @@ LIB_EXPORT int jack_port_request_monitor_by_name(jack_client_t* ext_client, cons LIB_EXPORT int jack_port_ensure_monitor(jack_port_t* port, int onoff) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_port_ensure_monitor"); -#endif + uintptr_t port_aux = (uintptr_t)port; jack_port_id_t myport = (jack_port_id_t)port_aux; if (!CheckPort(myport)) { @@ -750,9 +721,8 @@ LIB_EXPORT int jack_port_ensure_monitor(jack_port_t* port, int onoff) LIB_EXPORT int jack_port_monitoring_input(jack_port_t* port) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_port_monitoring_input"); -#endif + uintptr_t port_aux = (uintptr_t)port; jack_port_id_t myport = (jack_port_id_t)port_aux; if (!CheckPort(myport)) { @@ -766,9 +736,8 @@ LIB_EXPORT int jack_port_monitoring_input(jack_port_t* port) LIB_EXPORT int jack_is_realtime(jack_client_t* ext_client) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_is_realtime"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_is_realtime called with a NULL client"); @@ -781,9 +750,8 @@ LIB_EXPORT int jack_is_realtime(jack_client_t* ext_client) LIB_EXPORT void jack_on_shutdown(jack_client_t* ext_client, JackShutdownCallback callback, void* arg) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_on_shutdown"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_on_shutdown called with a NULL client"); @@ -794,9 +762,8 @@ LIB_EXPORT void jack_on_shutdown(jack_client_t* ext_client, JackShutdownCallback LIB_EXPORT void jack_on_info_shutdown(jack_client_t* ext_client, JackInfoShutdownCallback callback, void* arg) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_on_info_shutdown"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_on_info_shutdown called with a NULL client"); @@ -807,9 +774,8 @@ LIB_EXPORT void jack_on_info_shutdown(jack_client_t* ext_client, JackInfoShutdow LIB_EXPORT int jack_set_process_callback(jack_client_t* ext_client, JackProcessCallback callback, void* arg) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_set_process_callback"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_set_process_callback called with a NULL client"); @@ -821,9 +787,8 @@ LIB_EXPORT int jack_set_process_callback(jack_client_t* ext_client, JackProcessC LIB_EXPORT jack_nframes_t jack_thread_wait(jack_client_t* ext_client, int status) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_thread_wait"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_thread_wait called with a NULL client"); @@ -836,9 +801,8 @@ LIB_EXPORT jack_nframes_t jack_thread_wait(jack_client_t* ext_client, int status LIB_EXPORT jack_nframes_t jack_cycle_wait(jack_client_t* ext_client) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_cycle_wait"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_cycle_wait called with a NULL client"); @@ -850,9 +814,8 @@ LIB_EXPORT jack_nframes_t jack_cycle_wait(jack_client_t* ext_client) LIB_EXPORT void jack_cycle_signal(jack_client_t* ext_client, int status) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_cycle_signal"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_cycle_signal called with a NULL client"); @@ -863,9 +826,8 @@ LIB_EXPORT void jack_cycle_signal(jack_client_t* ext_client, int status) LIB_EXPORT int jack_set_process_thread(jack_client_t* ext_client, JackThreadCallback fun, void *arg) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_set_process_thread"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_set_process_thread called with a NULL client"); @@ -877,9 +839,8 @@ LIB_EXPORT int jack_set_process_thread(jack_client_t* ext_client, JackThreadCall LIB_EXPORT int jack_set_freewheel_callback(jack_client_t* ext_client, JackFreewheelCallback freewheel_callback, void* arg) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_set_freewheel_callback"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_set_freewheel_callback called with a NULL client"); @@ -891,9 +852,8 @@ LIB_EXPORT int jack_set_freewheel_callback(jack_client_t* ext_client, JackFreewh LIB_EXPORT int jack_set_freewheel(jack_client_t* ext_client, int onoff) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_set_freewheel"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_set_freewheel called with a NULL client"); @@ -905,9 +865,8 @@ LIB_EXPORT int jack_set_freewheel(jack_client_t* ext_client, int onoff) LIB_EXPORT int jack_set_buffer_size(jack_client_t* ext_client, jack_nframes_t buffer_size) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_set_buffer_size"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_set_buffer_size called with a NULL client"); @@ -921,9 +880,8 @@ LIB_EXPORT int jack_set_buffer_size(jack_client_t* ext_client, jack_nframes_t bu LIB_EXPORT int jack_set_buffer_size_callback(jack_client_t* ext_client, JackBufferSizeCallback bufsize_callback, void* arg) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_set_buffer_size_callback"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_set_buffer_size_callback called with a NULL client"); @@ -935,9 +893,8 @@ LIB_EXPORT int jack_set_buffer_size_callback(jack_client_t* ext_client, JackBuff LIB_EXPORT int jack_set_sample_rate_callback(jack_client_t* ext_client, JackSampleRateCallback srate_callback, void* arg) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_set_sample_rate_callback"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_set_sample_rate_callback called with a NULL client"); @@ -949,9 +906,8 @@ LIB_EXPORT int jack_set_sample_rate_callback(jack_client_t* ext_client, JackSamp LIB_EXPORT int jack_set_client_registration_callback(jack_client_t* ext_client, JackClientRegistrationCallback registration_callback, void* arg) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_set_client_registration_callback"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_set_client_registration_callback called with a NULL client"); @@ -963,9 +919,8 @@ LIB_EXPORT int jack_set_client_registration_callback(jack_client_t* ext_client, LIB_EXPORT int jack_set_port_registration_callback(jack_client_t* ext_client, JackPortRegistrationCallback registration_callback, void* arg) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_set_port_registration_callback"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_set_port_registration_callback called with a NULL client"); @@ -977,9 +932,8 @@ LIB_EXPORT int jack_set_port_registration_callback(jack_client_t* ext_client, Ja LIB_EXPORT int jack_set_port_connect_callback(jack_client_t* ext_client, JackPortConnectCallback portconnect_callback, void* arg) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_set_port_connect_callback"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_set_port_connect_callback called with a NULL client"); @@ -991,9 +945,8 @@ LIB_EXPORT int jack_set_port_connect_callback(jack_client_t* ext_client, JackPor LIB_EXPORT int jack_set_port_rename_callback(jack_client_t* ext_client, JackPortRenameCallback rename_callback, void* arg) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_set_port_rename_callback"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_set_port_rename_callback called with a NULL client"); @@ -1005,9 +958,8 @@ LIB_EXPORT int jack_set_port_rename_callback(jack_client_t* ext_client, JackPort LIB_EXPORT int jack_set_graph_order_callback(jack_client_t* ext_client, JackGraphOrderCallback graph_callback, void* arg) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_set_graph_order_callback"); -#endif + JackClient* client = (JackClient*)ext_client; jack_log("jack_set_graph_order_callback ext_client %x client %x ", ext_client, client); if (client == NULL) { @@ -1020,9 +972,8 @@ LIB_EXPORT int jack_set_graph_order_callback(jack_client_t* ext_client, JackGrap LIB_EXPORT int jack_set_xrun_callback(jack_client_t* ext_client, JackXRunCallback xrun_callback, void* arg) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_set_xrun_callback"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_set_xrun_callback called with a NULL client"); @@ -1034,9 +985,8 @@ LIB_EXPORT int jack_set_xrun_callback(jack_client_t* ext_client, JackXRunCallbac LIB_EXPORT int jack_set_latency_callback(jack_client_t* ext_client, JackLatencyCallback latency_callback, void *arg) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_set_latency_callback"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_set_latency_callback called with a NULL client"); @@ -1048,9 +998,8 @@ LIB_EXPORT int jack_set_latency_callback(jack_client_t* ext_client, JackLatencyC LIB_EXPORT int jack_set_thread_init_callback(jack_client_t* ext_client, JackThreadInitCallback init_callback, void *arg) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_set_thread_init_callback"); -#endif + JackClient* client = (JackClient*)ext_client; jack_log("jack_set_thread_init_callback ext_client %x client %x ", ext_client, client); if (client == NULL) { @@ -1063,9 +1012,8 @@ LIB_EXPORT int jack_set_thread_init_callback(jack_client_t* ext_client, JackThre LIB_EXPORT int jack_activate(jack_client_t* ext_client) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_activate"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_activate called with a NULL client"); @@ -1077,9 +1025,8 @@ LIB_EXPORT int jack_activate(jack_client_t* ext_client) LIB_EXPORT int jack_deactivate(jack_client_t* ext_client) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_deactivate"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_deactivate called with a NULL client"); @@ -1091,9 +1038,8 @@ LIB_EXPORT int jack_deactivate(jack_client_t* ext_client) LIB_EXPORT jack_port_t* jack_port_register(jack_client_t* ext_client, const char* port_name, const char* port_type, unsigned long flags, unsigned long buffer_size) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_port_register"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_port_register called with a NULL client"); @@ -1108,9 +1054,8 @@ LIB_EXPORT jack_port_t* jack_port_register(jack_client_t* ext_client, const char LIB_EXPORT int jack_port_unregister(jack_client_t* ext_client, jack_port_t* port) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_port_unregister"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_port_unregister called with a NULL client"); @@ -1127,9 +1072,8 @@ LIB_EXPORT int jack_port_unregister(jack_client_t* ext_client, jack_port_t* port LIB_EXPORT int jack_port_is_mine(const jack_client_t* ext_client, const jack_port_t* port) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_port_is_mine"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_port_is_mine called with a NULL client"); @@ -1146,9 +1090,8 @@ LIB_EXPORT int jack_port_is_mine(const jack_client_t* ext_client, const jack_por LIB_EXPORT const char** jack_port_get_connections(const jack_port_t* port) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_port_get_connections"); -#endif + uintptr_t port_aux = (uintptr_t)port; jack_port_id_t myport = (jack_port_id_t)port_aux; if (!CheckPort(myport)) { @@ -1164,9 +1107,8 @@ LIB_EXPORT const char** jack_port_get_connections(const jack_port_t* port) // Calling client does not need to "own" the port LIB_EXPORT const char** jack_port_get_all_connections(const jack_client_t* ext_client, const jack_port_t* port) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_port_get_all_connections"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_port_get_all_connections called with a NULL client"); @@ -1187,9 +1129,8 @@ LIB_EXPORT const char** jack_port_get_all_connections(const jack_client_t* ext_c LIB_EXPORT jack_nframes_t jack_port_get_total_latency(jack_client_t* ext_client, jack_port_t* port) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_port_get_total_latency"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_port_get_total_latency called with a NULL client"); @@ -1215,9 +1156,8 @@ LIB_EXPORT jack_nframes_t jack_port_get_total_latency(jack_client_t* ext_client, LIB_EXPORT int jack_connect(jack_client_t* ext_client, const char* src, const char* dst) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_connect"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_connect called with a NULL client"); @@ -1232,9 +1172,8 @@ LIB_EXPORT int jack_connect(jack_client_t* ext_client, const char* src, const ch LIB_EXPORT int jack_disconnect(jack_client_t* ext_client, const char* src, const char* dst) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_disconnect"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_disconnect called with a NULL client"); @@ -1249,9 +1188,8 @@ LIB_EXPORT int jack_disconnect(jack_client_t* ext_client, const char* src, const LIB_EXPORT int jack_port_disconnect(jack_client_t* ext_client, jack_port_t* src) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_port_disconnect"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_port_disconnect called with a NULL client"); @@ -1268,9 +1206,8 @@ LIB_EXPORT int jack_port_disconnect(jack_client_t* ext_client, jack_port_t* src) LIB_EXPORT jack_nframes_t jack_get_sample_rate(jack_client_t* ext_client) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_get_sample_rate"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_get_sample_rate called with a NULL client"); @@ -1283,9 +1220,8 @@ LIB_EXPORT jack_nframes_t jack_get_sample_rate(jack_client_t* ext_client) LIB_EXPORT jack_nframes_t jack_get_buffer_size(jack_client_t* ext_client) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_get_buffer_size"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_get_buffer_size called with a NULL client"); @@ -1298,9 +1234,8 @@ LIB_EXPORT jack_nframes_t jack_get_buffer_size(jack_client_t* ext_client) LIB_EXPORT const char** jack_get_ports(jack_client_t* ext_client, const char* port_name_pattern, const char* type_name_pattern, unsigned long flags) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_get_ports"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_get_ports called with a NULL client"); @@ -1312,9 +1247,8 @@ LIB_EXPORT const char** jack_get_ports(jack_client_t* ext_client, const char* po LIB_EXPORT jack_port_t* jack_port_by_name(jack_client_t* ext_client, const char* portname) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_port_by_name"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_get_ports called with a NULL client"); @@ -1335,18 +1269,16 @@ LIB_EXPORT jack_port_t* jack_port_by_name(jack_client_t* ext_client, const char* LIB_EXPORT jack_port_t* jack_port_by_id(jack_client_t* ext_client, jack_port_id_t id) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_port_by_id"); -#endif + /* jack_port_t* type is actually the port index */ return (jack_port_t*)((uintptr_t)id); } LIB_EXPORT int jack_engine_takeover_timebase(jack_client_t* ext_client) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_engine_takeover_timebase"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_engine_takeover_timebase called with a NULL client"); @@ -1359,9 +1291,8 @@ LIB_EXPORT int jack_engine_takeover_timebase(jack_client_t* ext_client) LIB_EXPORT jack_nframes_t jack_frames_since_cycle_start(const jack_client_t* ext_client) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_frames_since_cycle_start"); -#endif + JackTimer timer; JackEngineControl* control = GetEngineControl(); if (control) { @@ -1374,17 +1305,15 @@ LIB_EXPORT jack_nframes_t jack_frames_since_cycle_start(const jack_client_t* ext LIB_EXPORT jack_time_t jack_get_time() { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_get_time"); -#endif + return GetMicroSeconds(); } LIB_EXPORT jack_time_t jack_frames_to_time(const jack_client_t* ext_client, jack_nframes_t frames) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_frames_to_time"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_frames_to_time called with a NULL client"); @@ -1403,9 +1332,8 @@ LIB_EXPORT jack_time_t jack_frames_to_time(const jack_client_t* ext_client, jack LIB_EXPORT jack_nframes_t jack_time_to_frames(const jack_client_t* ext_client, jack_time_t time) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_time_to_frames"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_time_to_frames called with a NULL client"); @@ -1424,26 +1352,23 @@ LIB_EXPORT jack_nframes_t jack_time_to_frames(const jack_client_t* ext_client, j LIB_EXPORT jack_nframes_t jack_frame_time(const jack_client_t* ext_client) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_frame_time"); -#endif + return jack_time_to_frames(ext_client, GetMicroSeconds()); } LIB_EXPORT jack_nframes_t jack_last_frame_time(const jack_client_t* ext_client) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_last_frame_time"); -#endif + JackEngineControl* control = GetEngineControl(); return (control) ? control->fFrameTimer.ReadCurrentState()->CurFrame() : 0; } LIB_EXPORT float jack_cpu_load(jack_client_t* ext_client) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_cpu_load"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_cpu_load called with a NULL client"); @@ -1456,9 +1381,8 @@ LIB_EXPORT float jack_cpu_load(jack_client_t* ext_client) LIB_EXPORT jack_native_thread_t jack_client_thread_id(jack_client_t* ext_client) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_client_thread_id"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_client_thread_id called with a NULL client"); @@ -1470,9 +1394,8 @@ LIB_EXPORT jack_native_thread_t jack_client_thread_id(jack_client_t* ext_client) LIB_EXPORT char* jack_get_client_name(jack_client_t* ext_client) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_get_client_name"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_get_client_name called with a NULL client"); @@ -1499,9 +1422,8 @@ LIB_EXPORT int jack_port_type_size(void) LIB_EXPORT size_t jack_port_type_get_buffer_size(jack_client_t* ext_client, const char* port_type) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_port_type_get_buffer_size"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_port_type_get_buffer_size called with a NULL client"); @@ -1520,9 +1442,8 @@ LIB_EXPORT size_t jack_port_type_get_buffer_size(jack_client_t* ext_client, cons // transport.h LIB_EXPORT int jack_release_timebase(jack_client_t* ext_client) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_release_timebase"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_release_timebase called with a NULL client"); @@ -1534,9 +1455,8 @@ LIB_EXPORT int jack_release_timebase(jack_client_t* ext_client) LIB_EXPORT int jack_set_sync_callback(jack_client_t* ext_client, JackSyncCallback sync_callback, void *arg) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_set_sync_callback"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_set_sync_callback called with a NULL client"); @@ -1548,9 +1468,8 @@ LIB_EXPORT int jack_set_sync_callback(jack_client_t* ext_client, JackSyncCallbac LIB_EXPORT int jack_set_sync_timeout(jack_client_t* ext_client, jack_time_t timeout) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_set_sync_timeout"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_set_sync_timeout called with a NULL client"); @@ -1562,9 +1481,8 @@ LIB_EXPORT int jack_set_sync_timeout(jack_client_t* ext_client, jack_time_t time LIB_EXPORT int jack_set_timebase_callback(jack_client_t* ext_client, int conditional, JackTimebaseCallback timebase_callback, void* arg) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_set_timebase_callback"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_set_timebase_callback called with a NULL client"); @@ -1576,9 +1494,8 @@ LIB_EXPORT int jack_set_timebase_callback(jack_client_t* ext_client, int conditi LIB_EXPORT int jack_transport_locate(jack_client_t* ext_client, jack_nframes_t frame) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_transport_locate"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_transport_locate called with a NULL client"); @@ -1591,9 +1508,8 @@ LIB_EXPORT int jack_transport_locate(jack_client_t* ext_client, jack_nframes_t f LIB_EXPORT jack_transport_state_t jack_transport_query(const jack_client_t* ext_client, jack_position_t* pos) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_transport_query"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_transport_query called with a NULL client"); @@ -1605,9 +1521,8 @@ LIB_EXPORT jack_transport_state_t jack_transport_query(const jack_client_t* ext_ LIB_EXPORT jack_nframes_t jack_get_current_transport_frame(const jack_client_t* ext_client) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_get_current_transport_frame"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_get_current_transport_frame called with a NULL client"); @@ -1619,9 +1534,8 @@ LIB_EXPORT jack_nframes_t jack_get_current_transport_frame(const jack_client_t* LIB_EXPORT int jack_transport_reposition(jack_client_t* ext_client, const jack_position_t* pos) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_transport_reposition"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_transport_reposition called with a NULL client"); @@ -1634,9 +1548,8 @@ LIB_EXPORT int jack_transport_reposition(jack_client_t* ext_client, const jack_p LIB_EXPORT void jack_transport_start(jack_client_t* ext_client) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_transport_start"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_transport_start called with a NULL client"); @@ -1647,9 +1560,8 @@ LIB_EXPORT void jack_transport_start(jack_client_t* ext_client) LIB_EXPORT void jack_transport_stop(jack_client_t* ext_client) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_transport_stop"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_transport_stop called with a NULL client"); @@ -1661,9 +1573,8 @@ LIB_EXPORT void jack_transport_stop(jack_client_t* ext_client) // deprecated LIB_EXPORT void jack_get_transport_info(jack_client_t* ext_client, jack_transport_info_t* tinfo) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_get_transport_info"); -#endif + jack_error("jack_get_transport_info: deprecated"); if (tinfo) memset(tinfo, 0, sizeof(jack_transport_info_t)); @@ -1671,9 +1582,8 @@ LIB_EXPORT void jack_get_transport_info(jack_client_t* ext_client, jack_transpor LIB_EXPORT void jack_set_transport_info(jack_client_t* ext_client, jack_transport_info_t* tinfo) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_set_transport_info"); -#endif + jack_error("jack_set_transport_info: deprecated"); if (tinfo) memset(tinfo, 0, sizeof(jack_transport_info_t)); @@ -1682,9 +1592,8 @@ LIB_EXPORT void jack_set_transport_info(jack_client_t* ext_client, jack_transpor // statistics.h LIB_EXPORT float jack_get_max_delayed_usecs(jack_client_t* ext_client) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_get_max_delayed_usecs"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_get_max_delayed_usecs called with a NULL client"); @@ -1697,9 +1606,8 @@ LIB_EXPORT float jack_get_max_delayed_usecs(jack_client_t* ext_client) LIB_EXPORT float jack_get_xrun_delayed_usecs(jack_client_t* ext_client) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_get_xrun_delayed_usecs"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_get_xrun_delayed_usecs called with a NULL client"); @@ -1712,9 +1620,8 @@ LIB_EXPORT float jack_get_xrun_delayed_usecs(jack_client_t* ext_client) LIB_EXPORT void jack_reset_max_delayed_usecs(jack_client_t* ext_client) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_reset_max_delayed_usecs"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_reset_max_delayed_usecs called with a NULL client"); @@ -1727,9 +1634,8 @@ LIB_EXPORT void jack_reset_max_delayed_usecs(jack_client_t* ext_client) // thread.h LIB_EXPORT int jack_client_real_time_priority(jack_client_t* ext_client) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_client_real_time_priority"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_client_real_time_priority called with a NULL client"); @@ -1742,9 +1648,8 @@ LIB_EXPORT int jack_client_real_time_priority(jack_client_t* ext_client) LIB_EXPORT int jack_client_max_real_time_priority(jack_client_t* ext_client) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_client_max_real_time_priority"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_client_max_real_time_priority called with a NULL client"); @@ -1770,9 +1675,8 @@ LIB_EXPORT int jack_client_create_thread(jack_client_t* client, thread_routine routine, void *arg) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_client_create_thread"); -#endif + JackEngineControl* control = GetEngineControl(); int res = JackThread::StartImp(thread, priority, realtime, routine, arg); return (res == 0) @@ -1787,17 +1691,15 @@ LIB_EXPORT int jack_drop_real_time_scheduling(jack_native_thread_t thread) LIB_EXPORT int jack_client_stop_thread(jack_client_t* client, jack_native_thread_t thread) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_client_stop_thread"); -#endif + return JackThread::StopImp(thread); } LIB_EXPORT int jack_client_kill_thread(jack_client_t* client, jack_native_thread_t thread) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_client_kill_thread"); -#endif + return JackThread::KillImp(thread); } @@ -1817,26 +1719,23 @@ LIB_EXPORT int jack_internal_client_new (const char* client_name, const char* load_name, const char* load_init) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_internal_client_new"); -#endif + jack_error("jack_internal_client_new: deprecated"); return -1; } LIB_EXPORT void jack_internal_client_close (const char* client_name) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_internal_client_close"); -#endif + jack_error("jack_internal_client_close: deprecated"); } LIB_EXPORT char* jack_get_internal_client_name(jack_client_t* ext_client, jack_intclient_t intclient) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_get_internal_client_name"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_get_internal_client_name called with a NULL client"); @@ -1851,9 +1750,8 @@ LIB_EXPORT char* jack_get_internal_client_name(jack_client_t* ext_client, jack_i LIB_EXPORT jack_intclient_t jack_internal_client_handle(jack_client_t* ext_client, const char* client_name, jack_status_t* status) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_internal_client_handle"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_internal_client_handle called with a NULL client"); @@ -1869,9 +1767,8 @@ LIB_EXPORT jack_intclient_t jack_internal_client_handle(jack_client_t* ext_clien static jack_intclient_t jack_internal_client_load_aux(jack_client_t* ext_client, const char* client_name, jack_options_t options, jack_status_t* status, va_list ap) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_internal_client_load_aux"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_internal_client_load called with a NULL client"); @@ -1899,9 +1796,8 @@ static jack_intclient_t jack_internal_client_load_aux(jack_client_t* ext_client, LIB_EXPORT jack_intclient_t jack_internal_client_load(jack_client_t *client, const char* client_name, jack_options_t options, jack_status_t *status, ...) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_internal_client_load"); -#endif + va_list ap; va_start(ap, status); jack_intclient_t res = jack_internal_client_load_aux(client, client_name, options, status, ap); @@ -1911,9 +1807,8 @@ LIB_EXPORT jack_intclient_t jack_internal_client_load(jack_client_t *client, con LIB_EXPORT jack_status_t jack_internal_client_unload(jack_client_t* ext_client, jack_intclient_t intclient) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_internal_client_load"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_internal_client_unload called with a NULL client"); @@ -1933,9 +1828,8 @@ LIB_EXPORT void jack_get_version(int *major_ptr, int *micro_ptr, int *proto_ptr) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_get_version"); -#endif + // FIXME: We need these comming from build system *major_ptr = 0; *minor_ptr = 0; @@ -1945,17 +1839,15 @@ LIB_EXPORT void jack_get_version(int *major_ptr, LIB_EXPORT const char* jack_get_version_string() { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_get_version_string"); -#endif + return VERSION; } LIB_EXPORT void jack_free(void* ptr) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_free"); -#endif + if (ptr) { free(ptr); } @@ -1964,9 +1856,8 @@ LIB_EXPORT void jack_free(void* ptr) // session.h LIB_EXPORT int jack_set_session_callback(jack_client_t* ext_client, JackSessionCallback session_callback, void* arg) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_set_session_callback"); -#endif + JackClient* client = (JackClient*)ext_client; jack_log("jack_set_session_callback ext_client %x client %x ", ext_client, client); if (client == NULL) { @@ -1979,9 +1870,8 @@ LIB_EXPORT int jack_set_session_callback(jack_client_t* ext_client, JackSessionC LIB_EXPORT jack_session_command_t* jack_session_notify(jack_client_t* ext_client, const char* target, jack_session_event_type_t ev_type, const char* path) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_session_notify"); -#endif + JackClient* client = (JackClient*)ext_client; jack_log("jack_session_notify ext_client %x client %x ", ext_client, client); if (client == NULL) { @@ -1994,9 +1884,8 @@ LIB_EXPORT jack_session_command_t* jack_session_notify(jack_client_t* ext_client LIB_EXPORT int jack_session_reply(jack_client_t* ext_client, jack_session_event_t *event) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_session_reply"); -#endif + JackClient* client = (JackClient*)ext_client; jack_log("jack_session_reply ext_client %x client %x ", ext_client, client); if (client == NULL) { @@ -2009,9 +1898,8 @@ LIB_EXPORT int jack_session_reply(jack_client_t* ext_client, jack_session_event_ LIB_EXPORT void jack_session_event_free(jack_session_event_t* ev) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_session_event_free"); -#endif + if (ev) { if (ev->session_dir) free((void *)ev->session_dir); @@ -2025,9 +1913,8 @@ LIB_EXPORT void jack_session_event_free(jack_session_event_t* ev) LIB_EXPORT char *jack_client_get_uuid(jack_client_t* ext_client) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_client_get_uuid"); -#endif + JackClient* client = (JackClient*)ext_client; if (client == NULL) { jack_error("jack_client_get_uuid called with a NULL client"); @@ -2041,9 +1928,8 @@ LIB_EXPORT char *jack_client_get_uuid(jack_client_t* ext_client) LIB_EXPORT char* jack_get_uuid_for_client_name(jack_client_t* ext_client, const char* client_name) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_get_uuid_for_client_name"); -#endif + JackClient* client = (JackClient*)ext_client; jack_log("jack_get_uuid_for_client_name ext_client %x client %x ", ext_client, client); if (client == NULL) { @@ -2056,9 +1942,8 @@ LIB_EXPORT char* jack_get_uuid_for_client_name(jack_client_t* ext_client, const LIB_EXPORT char* jack_get_client_name_by_uuid(jack_client_t* ext_client, const char* client_uuid) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_get_client_name_by_uuid"); -#endif + JackClient* client = (JackClient*)ext_client; jack_log("jack_get_uuid_for_client_name ext_client %x client %x ", ext_client, client); if (client == NULL) { @@ -2071,9 +1956,8 @@ LIB_EXPORT char* jack_get_client_name_by_uuid(jack_client_t* ext_client, const c LIB_EXPORT int jack_reserve_client_name(jack_client_t* ext_client, const char* client_name, const char* uuid) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_reserve_client_name"); -#endif + JackClient* client = (JackClient*)ext_client; jack_log("jack_reserve_client_name ext_client %x client %x ", ext_client, client); if (client == NULL) { @@ -2086,9 +1970,8 @@ LIB_EXPORT int jack_reserve_client_name(jack_client_t* ext_client, const char* c LIB_EXPORT void jack_session_commands_free(jack_session_command_t *cmds) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_session_commands_free"); -#endif + if (!cmds) { return; @@ -2116,9 +1999,8 @@ LIB_EXPORT void jack_session_commands_free(jack_session_command_t *cmds) LIB_EXPORT int jack_client_has_session_callback(jack_client_t* ext_client, const char* client_name) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_client_has_session_callback"); -#endif + JackClient* client = (JackClient*)ext_client; jack_log("jack_client_has_session_callback ext_client %x client %x ", ext_client, client); if (client == NULL) { diff --git a/common/JackGlobals.cpp b/common/JackGlobals.cpp index 5bd3b52a..7a5fe3b2 100644 --- a/common/JackGlobals.cpp +++ b/common/JackGlobals.cpp @@ -39,6 +39,8 @@ jack_thread_creator_t JackGlobals::fJackThreadCreator = pthread_create; #endif #ifdef __CLIENTDEBUG__ + +#include "JackLibGlobals.h" std::ofstream* JackGlobals::fStream = NULL; void JackGlobals::CheckContext(const char* name) @@ -59,6 +61,12 @@ void JackGlobals::CheckContext(const char* name) } (*fStream) << "JACK API call : " << name << ", calling thread : " << pthread_self() << std::endl; } + +#else + +void JackGlobals::CheckContext(const char* name) +{} + #endif } // end of namespace diff --git a/common/JackGlobals.h b/common/JackGlobals.h index 6f215e7d..b724b594 100644 --- a/common/JackGlobals.h +++ b/common/JackGlobals.h @@ -49,8 +49,8 @@ struct JackGlobals { #ifdef __CLIENTDEBUG__ static std::ofstream* fStream; - static void CheckContext(const char* name); #endif + static void CheckContext(const char* name); }; // Each "side" server and client will implement this to get the shared graph manager, engine control and inter-process synchro table. diff --git a/common/JackLibAPI.cpp b/common/JackLibAPI.cpp index 1b2fa589..83e8dc6a 100644 --- a/common/JackLibAPI.cpp +++ b/common/JackLibAPI.cpp @@ -166,9 +166,8 @@ static jack_client_t* jack_client_open_aux(const char* client_name, jack_options LIB_EXPORT jack_client_t* jack_client_open(const char* ext_client_name, jack_options_t options, jack_status_t* status, ...) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_client_open"); -#endif + try { assert(JackGlobals::fOpenMutex); JackGlobals::fOpenMutex->Lock(); @@ -189,9 +188,8 @@ LIB_EXPORT jack_client_t* jack_client_open(const char* ext_client_name, jack_opt LIB_EXPORT int jack_client_close(jack_client_t* ext_client) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_client_close"); -#endif + assert(JackGlobals::fOpenMutex); JackGlobals::fOpenMutex->Lock(); int res = -1; diff --git a/common/JackServerAPI.cpp b/common/JackServerAPI.cpp index 9cd36282..9af1f9d5 100644 --- a/common/JackServerAPI.cpp +++ b/common/JackServerAPI.cpp @@ -151,9 +151,8 @@ jack_client_t* jack_client_open_aux(const char* client_name, jack_options_t opti SERVER_EXPORT jack_client_t* jack_client_open(const char* ext_client_name, jack_options_t options, jack_status_t* status, ...) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_client_open"); -#endif + try { assert(JackGlobals::fOpenMutex); JackGlobals::fOpenMutex->Lock(); @@ -174,9 +173,8 @@ SERVER_EXPORT jack_client_t* jack_client_open(const char* ext_client_name, jack_ SERVER_EXPORT int jack_client_close(jack_client_t* ext_client) { -#ifdef __CLIENTDEBUG__ JackGlobals::CheckContext("jack_client_close"); -#endif + assert(JackGlobals::fOpenMutex); JackGlobals::fOpenMutex->Lock(); int res = -1;