ardour/livetrax
13
0
Fork 0
Code

fix jack/pthread windows condition

Browse Source
This commit is contained in:
Robin Gareus 2015-07-04 11:49:44 +02:00
parent 9ccfb921d4
commit a68221e323
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -860,7 +860,7 @@ JACKAudioBackend::join_process_threads ()
bool bool
JACKAudioBackend::in_process_thread () JACKAudioBackend::in_process_thread ()
{ {
#if (defined COMPILER_MINGW && !defined PTW32_VERSION) || defined __jack_systemdeps_h__ #if defined COMPILER_MINGW && (!defined PTW32_VERSION || defined __jack_systemdeps_h__)
if (_main_thread == GetCurrentThread()) { if (_main_thread == GetCurrentThread()) {
return true; return true;
} }
@ -873,7 +873,7 @@ JACKAudioBackend::in_process_thread ()
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 ();
i != _jack_threads.end(); i++) { i != _jack_threads.end(); i++) {
#if (defined COMPILER_MINGW && !defined PTW32_VERSION) || defined __jack_systemdeps_h__ #if defined COMPILER_MINGW && (!defined PTW32_VERSION || defined __jack_systemdeps_h__)
if (*i == GetCurrentThread()) { if (*i == GetCurrentThread()) {
return true; return true;
} }
@ -917,7 +917,7 @@ JACKAudioBackend::process_thread ()
/* JACK doesn't do this for us when we use the wait API /* JACK doesn't do this for us when we use the wait API
*/ */
#if (defined COMPILER_MINGW && !defined PTW32_VERSION) || defined __jack_systemdeps_h__ #if defined COMPILER_MINGW && (!defined PTW32_VERSION || defined __jack_systemdeps_h__)
_main_thread = GetCurrentThread(); _main_thread = GetCurrentThread();
#else #else
_main_thread = pthread_self (); _main_thread = pthread_self ();