ardour/livetrax
13
0
Fork 0
Code

Implement the new pthread macros (for the Waves audio backend)

Browse Source
This commit is contained in:
John Emmas 2014-09-09 12:05:14 +01:00
parent 61e0705a94
commit 16b25a3028
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libs/backends/wavesaudio/wavesapi/devicemanager/WCMRNativeAudio.cpp
View File

@ -12,6 +12,7 @@
#endif #endif
#include "WCMRNativeAudio.h" #include "WCMRNativeAudio.h"
#include "MiscUtils/pthread_utils.h"
#include "MiscUtils/safe_delete.h" #include "MiscUtils/safe_delete.h"
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
@ -34,11 +35,12 @@
//********************************************************************************************** //**********************************************************************************************
WCMRNativeAudioNoneDevice::WCMRNativeAudioNoneDevice (WCMRAudioDeviceManager *pManager) WCMRNativeAudioNoneDevice::WCMRNativeAudioNoneDevice (WCMRAudioDeviceManager *pManager)
: WCMRNativeAudioDevice (pManager, false /*useMultiThreading*/) : WCMRNativeAudioDevice (pManager, false /*useMultiThreading*/)
, m_SilenceThread(0)
#if defined (PLATFORM_WINDOWS) #if defined (PLATFORM_WINDOWS)
, _waitableTimerForUsleep (CreateWaitableTimer(NULL, TRUE, NULL)) , _waitableTimerForUsleep (CreateWaitableTimer(NULL, TRUE, NULL))
#endif #endif
{ {
mark_pthread_inactive (m_SilenceThread);
m_DeviceName = NONE_DEVICE_NAME; m_DeviceName = NONE_DEVICE_NAME;
m_SamplingRates = boost::assign::list_of (m_CurrentSamplingRate=44100)(48000)(88200)(96000); m_SamplingRates = boost::assign::list_of (m_CurrentSamplingRate=44100)(48000)(88200)(96000);
@ -137,7 +139,7 @@ WTErr WCMRNativeAudioNoneDevice::SetStreaming (bool newState)
if (Streaming()) if (Streaming())
{ {
if (m_SilenceThread) if (is_pthread_active (m_SilenceThread))
std::cerr << "\t\t\t\t\t !!!!!!!!!!!!!!! Warning: the inactive NONE-DEVICE was streaming!" << std::endl; std::cerr << "\t\t\t\t\t !!!!!!!!!!!!!!! Warning: the inactive NONE-DEVICE was streaming!" << std::endl;
pthread_attr_t attributes; pthread_attr_t attributes;
@ -156,19 +158,19 @@ WTErr WCMRNativeAudioNoneDevice::SetStreaming (bool newState)
} }
if (pthread_create (&m_SilenceThread, &attributes, __SilenceThread, this)) { if (pthread_create (&m_SilenceThread, &attributes, __SilenceThread, this)) {
m_SilenceThread = 0; mark_pthread_inactive (m_SilenceThread);
std::cerr << "WCMRNativeAudioNoneDevice::SetStreaming (): pthread_create () failed!" << std::endl; std::cerr << "WCMRNativeAudioNoneDevice::SetStreaming (): pthread_create () failed!" << std::endl;
return eGenericErr; return eGenericErr;
} }
} }
else else
{ {
if (!m_SilenceThread) if (!is_pthread_active (m_SilenceThread))
{ {
std::cerr << "\t\t\t\t\t !!!!!!!!!!!!!!! Warning: the active NONE-DEVICE was NOT streaming!" << std::endl; std::cerr << "\t\t\t\t\t !!!!!!!!!!!!!!! Warning: the active NONE-DEVICE was NOT streaming!" << std::endl;
} }
while (m_SilenceThread) while (is_pthread_active (m_SilenceThread))
{ {
_usleep(1); //now wait for ended thread; _usleep(1); //now wait for ended thread;
} }
@ -220,7 +222,7 @@ void WCMRNativeAudioNoneDevice::_SilenceThread()
} }
audioCallbackData.acdCycleStartTimeNanos = cycleEndTimeNanos+1; audioCallbackData.acdCycleStartTimeNanos = cycleEndTimeNanos+1;
} }
m_SilenceThread = 0; mark_pthread_inactive (m_SilenceThread);
} }
void* WCMRNativeAudioNoneDevice::__SilenceThread(void *This) void* WCMRNativeAudioNoneDevice::__SilenceThread(void *This)