diff options
| author | Robin Gareus <robin@gareus.org> | 2015-07-04 09:52:04 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2015-07-04 09:52:04 +0200 |
| commit | 416ef936358074c1896223c6b66b8683058d1529 (patch) | |
| tree | 0fa5a5b04b827163eeb4f16140fd5c184fd42851 /libs | |
| parent | 58a7b0e1376d9d8daaf8c0770850a6a6859a6650 (diff) | |
use a trick to compile JACK/win with new and old headers
jack/systemdeps.h is jack2-only and contains many
windows-specific typedefs (native windows threads, ptw32 threads, MSVC
special cases etc etc.) which are not present in jack1/shared headers.
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/backends/jack/jack_audiobackend.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/backends/jack/jack_audiobackend.cc b/libs/backends/jack/jack_audiobackend.cc index 02e831f72f..0960d3bb6e 100644 --- a/libs/backends/jack/jack_audiobackend.cc +++ b/libs/backends/jack/jack_audiobackend.cc @@ -838,7 +838,7 @@ JACKAudioBackend::join_process_threads () for (std::vector<jack_native_thread_t>::const_iterator i = _jack_threads.begin (); i != _jack_threads.end(); i++) { -#if defined(USING_JACK2_EXPANSION_OF_JACK_API) +#if defined(USING_JACK2_EXPANSION_OF_JACK_API) || defined __jack_systemdeps_h__ // jack_client is not used by JACK2's implementation // also jack_client_close() leaves threads active if (jack_client_stop_thread (NULL, *i) != 0) @@ -860,7 +860,7 @@ JACKAudioBackend::join_process_threads () bool JACKAudioBackend::in_process_thread () { -#if (defined COMPILER_MINGW && !defined PTW32_VERSION) +#if (defined COMPILER_MINGW && !defined PTW32_VERSION) || defined __jack_systemdeps_h__ if (_main_thread == GetCurrentThread()) { return true; } @@ -873,7 +873,7 @@ JACKAudioBackend::in_process_thread () for (std::vector<jack_native_thread_t>::const_iterator i = _jack_threads.begin (); i != _jack_threads.end(); i++) { -#if (defined COMPILER_MINGW && !defined PTW32_VERSION) +#if (defined COMPILER_MINGW && !defined PTW32_VERSION) || defined __jack_systemdeps_h__ if (*i == GetCurrentThread()) { return true; } @@ -917,7 +917,7 @@ JACKAudioBackend::process_thread () /* JACK doesn't do this for us when we use the wait API */ -#if (defined COMPILER_MINGW && !defined PTW32_VERSION) +#if (defined COMPILER_MINGW && !defined PTW32_VERSION) || defined __jack_systemdeps_h__ _main_thread = GetCurrentThread(); #else _main_thread = pthread_self (); |