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

use a trick to compile JACK/win with new and old headers

Browse source 
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.
This commit is contained in:
Robin Gareus 2015-07-04 09:52:04 +02:00
parent 58a7b0e137
commit 416ef93635
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -838,7 +838,7 @@ JACKAudioBackend::join_process_threads ()
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(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 // 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 (NULL, *i) != 0)
@ -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) #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) #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) #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 ();