diff options
| author | Robin Gareus <robin@gareus.org> | 2015-06-30 09:11:05 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2015-06-30 09:11:05 +0200 |
| commit | 5ab0288c991de3020d61c4f714aac36044a351fe (patch) | |
| tree | 90acd9cc78cb2972f59511d7c042aa1018621137 /libs/backends/wavesaudio | |
| parent | f1aa1a0a11d6f68a67aa91cff56cac5288e107c9 (diff) | |
at least make it compile with mingw.
Diffstat (limited to 'libs/backends/wavesaudio')
| -rw-r--r-- | libs/backends/wavesaudio/waves_audiobackend.cc | 6 | ||||
| -rw-r--r-- | libs/backends/wavesaudio/wavesapi/devicemanager/WCMRNativeAudio.cpp | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/libs/backends/wavesaudio/waves_audiobackend.cc b/libs/backends/wavesaudio/waves_audiobackend.cc index f8dc61f222..2b0a98f236 100644 --- a/libs/backends/wavesaudio/waves_audiobackend.cc +++ b/libs/backends/wavesaudio/waves_audiobackend.cc @@ -749,8 +749,12 @@ WavesAudioBackend::_audio_device_callback (const float* input_buffer, AudioEngine::thread_init_callback (this); } - if (_main_thread != pthread_self() ) { + if (pthread_equal (_main_thread, pthread_self()) != 0) { +#ifdef PTW32_VERSION + std::cerr << "Process thread ID has changed. Expected thread: " << _main_thread.p << " current thread: " << pthread_self().p << std::dec << " !" << std::endl; +#else std::cerr << "Process thread ID has changed. Expected thread: " << _main_thread << " current thread: " << pthread_self() << std::dec << " !" << std::endl; +#endif _main_thread = pthread_self(); } diff --git a/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRNativeAudio.cpp b/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRNativeAudio.cpp index f3565e2546..2e0490b02e 100644 --- a/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRNativeAudio.cpp +++ b/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRNativeAudio.cpp @@ -35,7 +35,9 @@ //********************************************************************************************** WCMRNativeAudioNoneDevice::WCMRNativeAudioNoneDevice (WCMRAudioDeviceManager *pManager) : WCMRNativeAudioDevice (pManager, false /*useMultiThreading*/) +#ifndef PTW32_VERSION , m_SilenceThread(0) +#endif #if defined (PLATFORM_WINDOWS) , _waitableTimerForUsleep (CreateWaitableTimer(NULL, TRUE, NULL)) #endif |