ardour/livetrax
13
0
Fork 0
Code

JACKAudioBackend::join_process_threads: Don’t pass NULL for jack_client_stop_thread

Browse Source 
This is needed for PipeWire’s JACK frontend, which implements this
function and expects the first argument to be non-null.
This commit is contained in:
+merlan #flirora 2022-10-20 01:34:26 -04:00 committed by Robin Gareus
parent f9edc474ef
commit 79f55742d6
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/backends/jack/jack_audiobackend.cc
View File

@ -876,6 +876,8 @@ JACKAudioBackend::create_process_thread (boost::function<void()> f)
int int
JACKAudioBackend::join_process_threads () JACKAudioBackend::join_process_threads ()
{ {
GET_PRIVATE_JACK_POINTER_RET (_priv_jack, -1);
int ret = 0; int ret = 0;
for (std::vector<jack_native_thread_t>::const_iterator i = _jack_threads.begin (); for (std::vector<jack_native_thread_t>::const_iterator i = _jack_threads.begin ();
@ -884,7 +886,7 @@ JACKAudioBackend::join_process_threads ()
#if defined(USING_JACK2_EXPANSION_OF_JACK_API) || defined __jack_systemdeps_h__ #if defined(USING_JACK2_EXPANSION_OF_JACK_API) || defined __jack_systemdeps_h__
// jack_client is not used by JACK2's implementation // jack_client is not used by JACK2's implementation
// also jack_client_close() leaves threads active // also jack_client_close() leaves threads active
if (jack_client_stop_thread (NULL, *i) != 0) if (jack_client_stop_thread (_priv_jack, *i) != 0)
#else #else
void* status; void* status;
if (pthread_join (*i, &status) != 0) if (pthread_join (*i, &status) != 0)