smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 15:25:01 +01:00
Code Issues Projects Releases Wiki Activity

JACK: accomodate MSVC in DEBUG_TRACE stmts involving pthread_self

Browse source
This commit is contained in:
Paul Davis 2023-09-14 06:59:29 -06:00
parent f5d3b1c79f
commit eff61bde32
2 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

20
libs/backends/jack/jack_audiobackend.cc
View file

@ -48,7 +48,7 @@ using std::vector;
#define GET_PRIVATE_JACK_POINTER(localvar) jack_client_t* localvar = _jack_connection->jack(); if (!(localvar)) { return; } #define GET_PRIVATE_JACK_POINTER(localvar) jack_client_t* localvar = _jack_connection->jack(); if (!(localvar)) { return; }
#define GET_PRIVATE_JACK_POINTER_RET(localvar,r) jack_client_t* localvar = _jack_connection->jack(); if (!(localvar)) { return r; } #define GET_PRIVATE_JACK_POINTER_RET(localvar,r) jack_client_t* localvar = _jack_connection->jack(); if (!(localvar)) { return r; }
// #define JACK_SERVER_CALL(expr) { std::cerr << "JACK SERVER CALL: " << pthread_self() << '/' << pthread_name() << ' ' << #expr << std::endl; Glib::Threads::Mutex::Lock lm (server_call_mutex); expr; } // #define JACK_SERVER_CALL(expr) { std::cerr << "JACK SERVER CALL: " << DEBUG_THREAD_SELF << '/' << pthread_name() << ' ' << #expr << std::endl; Glib::Threads::Mutex::Lock lm (server_call_mutex); expr; }
#define JACK_SERVER_CALL(expr) { Glib::Threads::Mutex::Lock lm (server_call_mutex); expr; } #define JACK_SERVER_CALL(expr) { Glib::Threads::Mutex::Lock lm (server_call_mutex); expr; }
JACKAudioBackend::JACKAudioBackend (AudioEngine& e, AudioBackendInfo& info, std::shared_ptr<JackConnection> jc) JACKAudioBackend::JACKAudioBackend (AudioEngine& e, AudioBackendInfo& info, std::shared_ptr<JackConnection> jc)
@ -771,7 +771,7 @@ void
JACKAudioBackend::_jack_timebase_callback (jack_transport_state_t state, pframes_t nframes, JACKAudioBackend::_jack_timebase_callback (jack_transport_state_t state, pframes_t nframes,
jack_position_t* pos, int new_position, void *arg) jack_position_t* pos, int new_position, void *arg)
{ {
DEBUG_TRACE (DEBUG::BackendCallbacks, string_compose ("%1/%2 jack timebase callback\n", pthread_self(), pthread_name())); DEBUG_TRACE (DEBUG::BackendCallbacks, string_compose ("%1/%2 jack timebase callback\n", DEBUG_THREAD_SELF, pthread_name()));
static_cast<JACKAudioBackend*> (arg)->jack_timebase_callback (state, nframes, pos, new_position); static_cast<JACKAudioBackend*> (arg)->jack_timebase_callback (state, nframes, pos, new_position);
} }
@ -790,7 +790,7 @@ JACKAudioBackend::jack_timebase_callback (jack_transport_state_t state, pframes_
int int
JACKAudioBackend::_jack_sync_callback (jack_transport_state_t state, jack_position_t* pos, void* arg) JACKAudioBackend::_jack_sync_callback (jack_transport_state_t state, jack_position_t* pos, void* arg)
{ {
DEBUG_TRACE (DEBUG::BackendCallbacks, string_compose ("%1/%2 jack sync callback\n", pthread_self(), pthread_name())); DEBUG_TRACE (DEBUG::BackendCallbacks, string_compose ("%1/%2 jack sync callback\n", DEBUG_THREAD_SELF, pthread_name()));
return static_cast<JACKAudioBackend*> (arg)->jack_sync_callback (state, pos); return static_cast<JACKAudioBackend*> (arg)->jack_sync_callback (state, pos);
} }
@ -829,7 +829,7 @@ JACKAudioBackend::jack_sync_callback (jack_transport_state_t state, jack_positio
int int
JACKAudioBackend::_xrun_callback (void *arg) JACKAudioBackend::_xrun_callback (void *arg)
{ {
DEBUG_TRACE (DEBUG::BackendCallbacks, string_compose ("%1/%2 jack sync callback\n", pthread_self(), pthread_name())); DEBUG_TRACE (DEBUG::BackendCallbacks, string_compose ("%1/%2 jack sync callback\n", DEBUG_THREAD_SELF, pthread_name()));
JACKAudioBackend* jab = static_cast<JACKAudioBackend*> (arg); JACKAudioBackend* jab = static_cast<JACKAudioBackend*> (arg);
if (jab->available()) { if (jab->available()) {
@ -841,7 +841,7 @@ JACKAudioBackend::_xrun_callback (void *arg)
void void
JACKAudioBackend::_session_callback (jack_session_event_t *event, void *arg) JACKAudioBackend::_session_callback (jack_session_event_t *event, void *arg)
{ {
DEBUG_TRACE (DEBUG::BackendCallbacks, string_compose ("%1/%2 jack session callback\n", pthread_self(), pthread_name())); DEBUG_TRACE (DEBUG::BackendCallbacks, string_compose ("%1/%2 jack session callback\n", DEBUG_THREAD_SELF, pthread_name()));
JACKAudioBackend* jab = static_cast<JACKAudioBackend*> (arg); JACKAudioBackend* jab = static_cast<JACKAudioBackend*> (arg);
ARDOUR::Session* session = jab->engine.session(); ARDOUR::Session* session = jab->engine.session();
@ -855,7 +855,7 @@ JACKAudioBackend::_session_callback (jack_session_event_t *event, void *arg)
void void
JACKAudioBackend::_freewheel_callback (int onoff, void *arg) JACKAudioBackend::_freewheel_callback (int onoff, void *arg)
{ {
DEBUG_TRACE (DEBUG::BackendCallbacks, string_compose ("%1/%2 jack freewheel callback\n", pthread_self(), pthread_name())); DEBUG_TRACE (DEBUG::BackendCallbacks, string_compose ("%1/%2 jack freewheel callback\n", DEBUG_THREAD_SELF, pthread_name()));
static_cast<JACKAudioBackend*>(arg)->freewheel_callback (onoff); static_cast<JACKAudioBackend*>(arg)->freewheel_callback (onoff);
} }
@ -869,7 +869,7 @@ JACKAudioBackend::freewheel_callback (int onoff)
void void
JACKAudioBackend::_latency_callback (jack_latency_callback_mode_t mode, void* arg) JACKAudioBackend::_latency_callback (jack_latency_callback_mode_t mode, void* arg)
{ {
DEBUG_TRACE (DEBUG::BackendCallbacks, string_compose ("%1/%2 jack latency callback\n", pthread_self(), pthread_name())); DEBUG_TRACE (DEBUG::BackendCallbacks, string_compose ("%1/%2 jack latency callback\n", DEBUG_THREAD_SELF, pthread_name()));
return static_cast<JACKAudioBackend*> (arg)->jack_latency_callback (mode); return static_cast<JACKAudioBackend*> (arg)->jack_latency_callback (mode);
} }
@ -938,7 +938,7 @@ JACKAudioBackend::in_process_thread ()
return true; return true;
} }
#else // pthreads #else // pthreads
if (pthread_equal (thread, pthread_self()) != 0) { if (pthread_equal (thread, DEBUG_THREAD_SELF) != 0) {
return true; return true;
} }
#endif #endif
@ -1014,7 +1014,7 @@ JACKAudioBackend::process_thread ()
int int
JACKAudioBackend::_sample_rate_callback (pframes_t nframes, void *arg) JACKAudioBackend::_sample_rate_callback (pframes_t nframes, void *arg)
{ {
DEBUG_TRACE (DEBUG::BackendCallbacks, string_compose ("%1/%2 jack sample rate callback\n", pthread_self(), pthread_name())); DEBUG_TRACE (DEBUG::BackendCallbacks, string_compose ("%1/%2 jack sample rate callback\n", DEBUG_THREAD_SELF, pthread_name()));
return static_cast<JACKAudioBackend*> (arg)->jack_sample_rate_callback (nframes); return static_cast<JACKAudioBackend*> (arg)->jack_sample_rate_callback (nframes);
} }
@ -1034,7 +1034,7 @@ JACKAudioBackend::jack_latency_callback (jack_latency_callback_mode_t mode)
int int
JACKAudioBackend::_bufsize_callback (pframes_t nframes, void *arg) JACKAudioBackend::_bufsize_callback (pframes_t nframes, void *arg)
{ {
DEBUG_TRACE (DEBUG::BackendCallbacks, string_compose ("%1/%2 jack buffer size callback\n", pthread_self(), pthread_name())); DEBUG_TRACE (DEBUG::BackendCallbacks, string_compose ("%1/%2 jack buffer size callback\n", DEBUG_THREAD_SELF, pthread_name()));
return static_cast<JACKAudioBackend*> (arg)->jack_bufsize_callback (nframes); return static_cast<JACKAudioBackend*> (arg)->jack_bufsize_callback (nframes);
} }

8
libs/backends/jack/jack_portengine.cc
View file

@ -38,7 +38,7 @@ using std::vector;
#define GET_PRIVATE_JACK_POINTER(localvar) jack_client_t* localvar = _jack_connection->jack(); if (!(localvar)) { return; } #define GET_PRIVATE_JACK_POINTER(localvar) jack_client_t* localvar = _jack_connection->jack(); if (!(localvar)) { return; }
#define GET_PRIVATE_JACK_POINTER_RET(localvar,r) jack_client_t* localvar = _jack_connection->jack(); if (!(localvar)) { return r; } #define GET_PRIVATE_JACK_POINTER_RET(localvar,r) jack_client_t* localvar = _jack_connection->jack(); if (!(localvar)) { return r; }
// #define JACK_SERVER_CALL(expr) { std::cerr << "JACK SERVER CALL: " << pthread_self() << '/' << pthread_name() << ' ' << #expr << std::endl; Glib::Threads::Mutex::Lock lm (server_call_mutex); expr; } // #define JACK_SERVER_CALL(expr) { std::cerr << "JACK SERVER CALL: " << DEBUG_THREAD_SELF << '/' << pthread_name() << ' ' << #expr << std::endl; Glib::Threads::Mutex::Lock lm (server_call_mutex); expr; }
#define JACK_SERVER_CALL(expr) { Glib::Threads::Mutex::Lock lm (server_call_mutex); expr; } #define JACK_SERVER_CALL(expr) { Glib::Threads::Mutex::Lock lm (server_call_mutex); expr; }
static uint32_t static uint32_t
@ -227,7 +227,7 @@ JACKAudioBackend::get_port_by_name (const std::string& name) const
void void
JACKAudioBackend::_registration_callback (jack_port_id_t id, int reg, void* arg) JACKAudioBackend::_registration_callback (jack_port_id_t id, int reg, void* arg)
{ {
DEBUG_TRACE (DEBUG::BackendCallbacks, string_compose ("%1/%2 jack port registration callback\n", pthread_self(), pthread_name())); DEBUG_TRACE (DEBUG::BackendCallbacks, string_compose ("%1/%2 jack port registration callback\n", DEBUG_THREAD_SELF, pthread_name()));
/* we don't use a virtual method for the registration callback, because /* we don't use a virtual method for the registration callback, because
JACK is the only backend that delivers the arguments shown above. So JACK is the only backend that delivers the arguments shown above. So
@ -297,14 +297,14 @@ JACKAudioBackend::jack_registration_callback (jack_port_id_t id, int reg)
int int
JACKAudioBackend::_graph_order_callback (void *arg) JACKAudioBackend::_graph_order_callback (void *arg)
{ {
DEBUG_TRACE (DEBUG::BackendCallbacks, string_compose ("%1/%2 jack graph order callback\n", pthread_self(), pthread_name())); DEBUG_TRACE (DEBUG::BackendCallbacks, string_compose ("%1/%2 jack graph order callback\n", DEBUG_THREAD_SELF, pthread_name()));
return static_cast<JACKAudioBackend*> (arg)->manager.graph_order_callback (); return static_cast<JACKAudioBackend*> (arg)->manager.graph_order_callback ();
} }
void void
JACKAudioBackend::_connect_callback (jack_port_id_t id_a, jack_port_id_t id_b, int conn, void* arg) JACKAudioBackend::_connect_callback (jack_port_id_t id_a, jack_port_id_t id_b, int conn, void* arg)
{ {
DEBUG_TRACE (DEBUG::BackendCallbacks, string_compose ("%1/%2 jack connect/disconnect callback\n", pthread_self(), pthread_name())); DEBUG_TRACE (DEBUG::BackendCallbacks, string_compose ("%1/%2 jack connect/disconnect callback\n", DEBUG_THREAD_SELF, pthread_name()));
static_cast<JACKAudioBackend*> (arg)->connect_callback (id_a, id_b, conn); static_cast<JACKAudioBackend*> (arg)->connect_callback (id_a, id_b, conn);
} }