Commit a560d449 authored by Dipl.-Ing. Jonas Stienen's avatar Dipl.-Ing. Jonas Stienen
Browse files

MSVC 14 compat and removing ITA atomic types and replacing them with c++11 atomics

parent 9360463a
...@@ -23,12 +23,12 @@ ...@@ -23,12 +23,12 @@
#include <ITACriticalSection.h> #include <ITACriticalSection.h>
#include <ITASampleBuffer.h> #include <ITASampleBuffer.h>
#include <ITAAtomicPrimitives.h>
#include <VistaInterProcComm/Concurrency/VistaThreadEvent.h> #include <VistaInterProcComm/Concurrency/VistaThreadEvent.h>
#include <tbb/concurrent_queue.h> #include <tbb/concurrent_queue.h>
#include <atomic>
#include <map> #include <map>
#include <string> #include <string>
#include <vector> #include <vector>
...@@ -182,7 +182,7 @@ private: ...@@ -182,7 +182,7 @@ private:
tbb::concurrent_queue<CAudioSignalSource*> m_qpNewSources; //!< Lock-free queue: New sources tbb::concurrent_queue<CAudioSignalSource*> m_qpNewSources; //!< Lock-free queue: New sources
tbb::concurrent_queue<CAudioSignalSource*> m_qpDelReqSources; //!< Lock-free queue: Request delete sources tbb::concurrent_queue<CAudioSignalSource*> m_qpDelReqSources; //!< Lock-free queue: Request delete sources
ITAAtomicInt m_iStreamCounter; //!< Counts the number of processed stream blocks std::atomic< int > m_iStreamCounter; //!< Counts the number of processed stream blocks
VistaThreadEvent m_evStreamCounterInc; //!< Event: Stream counter incremented VistaThreadEvent m_evStreamCounterInc; //!< Event: Stream counter incremented
//! Signal source find by ID //! Signal source find by ID
......
...@@ -16,11 +16,11 @@ ...@@ -16,11 +16,11 @@
#include <VAAudioSignalSource.h> #include <VAAudioSignalSource.h>
#include <ITAAtomicPrimitives.h>
#include <ITADataSourceDelegator.h> #include <ITADataSourceDelegator.h>
#include <ITASampleBuffer.h> #include <ITASampleBuffer.h>
#include <ITASampleFrame.h> #include <ITASampleFrame.h>
#include <atomic>
#include <string> #include <string>
class ITABufferDatasource; class ITABufferDatasource;
...@@ -57,8 +57,8 @@ public: ...@@ -57,8 +57,8 @@ public:
private: private:
IVAInterface* m_pAssociatedCore; IVAInterface* m_pAssociatedCore;
ITABufferDatasource* m_pBufferDataSource; ITABufferDatasource* m_pBufferDataSource;
ITAAtomicInt m_iCurrentPlayState; std::atomic< int > m_iCurrentPlayState;
ITAAtomicInt m_iRequestedPlaybackAction; //!< User-triggered playback action std::atomic< int > m_iRequestedPlaybackAction; //!< User-triggered playback action
ITASampleBuffer m_sbOutBuffer; ITASampleBuffer m_sbOutBuffer;
ITASampleFrame m_sfAudioBuffer; //!< Audio buffer with multiple channels for smooth switching on update ITASampleFrame m_sfAudioBuffer; //!< Audio buffer with multiple channels for smooth switching on update
int m_iActiveAudioBufferChannel; int m_iActiveAudioBufferChannel;
......
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
#include <ITADataSourceRealization.h> #include <ITADataSourceRealization.h>
#include <ITASampleBuffer.h> #include <ITASampleBuffer.h>
#include <ITAAtomicPrimitives.h>
#include <atomic>
#include <map> #include <map>
class CVACoreImpl; class CVACoreImpl;
...@@ -62,7 +62,7 @@ private: ...@@ -62,7 +62,7 @@ private:
Config m_oConfig; Config m_oConfig;
ITASampleBuffer m_sbBuffer; ITASampleBuffer m_sbBuffer;
std::map< double, double > m_lFreqModesPhase; std::map< double, double > m_lFreqModesPhase;
ITAAtomicFloat m_fK; // engine number std::atomic< float > m_fK; // engine number
}; };
#endif // IW_VACORE_ENGINESIGNALSOURCE #endif // IW_VACORE_ENGINESIGNALSOURCE
...@@ -246,7 +246,8 @@ void CVAMachineSignalSource::HandleUnregistration( IVAInterface* ) ...@@ -246,7 +246,8 @@ void CVAMachineSignalSource::HandleUnregistration( IVAInterface* )
std::string CVAMachineSignalSource::GetStateString() const std::string CVAMachineSignalSource::GetStateString() const
{ {
return GetMachineStateString( MachineState( m_iCurrentState.get() ) ); MachineState iState = (MachineState) (int) m_iCurrentState;
return GetMachineStateString( iState );
} }
std::string CVAMachineSignalSource::GetMachineStateString( MachineState iState ) const std::string CVAMachineSignalSource::GetMachineStateString( MachineState iState ) const
......
...@@ -19,7 +19,8 @@ ...@@ -19,7 +19,8 @@
#include <ITADataSourceRealization.h> #include <ITADataSourceRealization.h>
#include <ITASampleBuffer.h> #include <ITASampleBuffer.h>
#include <ITAAtomicPrimitives.h>
#include <atomic>
class CVACoreImpl; class CVACoreImpl;
class IITASampleInterpolationRoutine; class IITASampleInterpolationRoutine;
...@@ -145,15 +146,15 @@ private: ...@@ -145,15 +146,15 @@ private:
ITASampleBuffer m_sbIdleSound, m_sbIdleSoundNew; ITASampleBuffer m_sbIdleSound, m_sbIdleSoundNew;
ITASampleBuffer m_sbStopSound, m_sbStopSoundNew; ITASampleBuffer m_sbStopSound, m_sbStopSoundNew;
ITASampleBuffer m_sbInterpolationSrc; ITASampleBuffer m_sbInterpolationSrc;
ITAAtomicBool m_bStartSoundNew, m_bIdleSoundNew, m_bStopSoundNew; std::atomic< bool > m_bStartSoundNew, m_bIdleSoundNew, m_bStopSoundNew;
ITASampleBuffer m_sbOut; ITASampleBuffer m_sbOut;
ITAAtomicInt m_iCurrentState; std::atomic< int > m_iCurrentState;
ITAAtomicInt m_iNewTransition; std::atomic< int > m_iNewTransition;
ITAAtomicFloat m_fMachineSpeed; std::atomic< float > m_fMachineSpeed;
ITAAtomicBool m_bHasStartSound; std::atomic< bool > m_bHasStartSound;
ITAAtomicBool m_bHasIdleSound; std::atomic< bool > m_bHasIdleSound;
ITAAtomicBool m_bHasStopSound; std::atomic< bool > m_bHasStopSound;
ITAAtomicBool m_bCrossfadeSounds; std::atomic< bool > m_bCrossfadeSounds;
int m_iStartingSoundCursor; int m_iStartingSoundCursor;
int m_iIdlingSoundCursor; int m_iIdlingSoundCursor;
......
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
#include <ITADataSourceRealization.h> #include <ITADataSourceRealization.h>
#include <ITASampleBuffer.h> #include <ITASampleBuffer.h>
#include <ITAAudioSample.h> #include <ITAAudioSample.h>
#include <ITAAtomicPrimitives.h>
#include <atomic>
#include <unordered_set> #include <unordered_set>
class ITABufferDatasource; class ITABufferDatasource;
...@@ -137,7 +137,7 @@ private: ...@@ -137,7 +137,7 @@ private:
ITASampleBuffer m_sbOut; ITASampleBuffer m_sbOut;
//this mutable keyword here is necessary since the inherited method GetParameters() is const, however we want to be able to change some parts (not very clean code, sorry) //this mutable keyword here is necessary since the inherited method GetParameters() is const, however we want to be able to change some parts (not very clean code, sorry)
ITAAtomicInt m_iCurrentPlayState; std::atomic< int > m_iCurrentPlayState;
ITABufferDatasource* m_pBufferDataSource; ITABufferDatasource* m_pBufferDataSource;
ITASampleFrame* m_pFrameToDelete;//this is set if the sample should be freed after playback ITASampleFrame* m_pFrameToDelete;//this is set if the sample should be freed after playback
......
...@@ -17,13 +17,14 @@ ...@@ -17,13 +17,14 @@
#include "VAAudioDriverBackend.h" #include "VAAudioDriverBackend.h"
#include "VAAudioDriverConfig.h" #include "VAAudioDriverConfig.h"
#include <ITAAtomicPrimitives.h>
#include <ITAException.h> #include <ITAException.h>
#include <ITAStreamProperties.h> #include <ITAStreamProperties.h>
#include <VistaInterProcComm/Concurrency/VistaThreadLoop.h> #include <VistaInterProcComm/Concurrency/VistaThreadLoop.h>
#include <VistaInterProcComm/Concurrency/VistaThreadEvent.h> #include <VistaInterProcComm/Concurrency/VistaThreadEvent.h>
#include <atomic>
/** /**
* Diese Klasse implementiert die Schnittstelle IVAAudioDriverArchBackend * Diese Klasse implementiert die Schnittstelle IVAAudioDriverArchBackend
* fr ASIO mittels des ITAsioInterface * fr ASIO mittels des ITAsioInterface
...@@ -91,7 +92,7 @@ private: ...@@ -91,7 +92,7 @@ private:
}; };
CVAASIOBackend* m_pParent; CVAASIOBackend* m_pParent;
ITAAtomicInt m_iOperation; std::atomic< int > m_iOperation;
int m_iResult; int m_iResult;
ITAException m_oException; ITAException m_oException;
VistaThreadEvent m_evStart; VistaThreadEvent m_evStart;
...@@ -107,7 +108,7 @@ private: ...@@ -107,7 +108,7 @@ private:
MediatorThread* m_pMediator; MediatorThread* m_pMediator;
CVAAudioDriverConfig* m_pConfig; CVAAudioDriverConfig* m_pConfig;
ITAStreamProperties m_oOutputStreamProps; ITAStreamProperties m_oOutputStreamProps;
ITAAtomicBool m_bStreaming; std::atomic< bool > m_bStreaming;
}; };
#endif // IW_VACORE_ASIOBACKEND #endif // IW_VACORE_ASIOBACKEND
...@@ -17,12 +17,13 @@ ...@@ -17,12 +17,13 @@
#include "VAAudioDriverBackend.h" #include "VAAudioDriverBackend.h"
#include "VAAudioDriverConfig.h" #include "VAAudioDriverConfig.h"
#include <ITAAtomicPrimitives.h>
#include <ITAException.h> #include <ITAException.h>
#include <ITAStreamProperties.h> #include <ITAStreamProperties.h>
#include <VistaInterProcComm/Concurrency/VistaThreadLoop.h> #include <VistaInterProcComm/Concurrency/VistaThreadLoop.h>
#include <VistaInterProcComm/Concurrency/VistaThreadEvent.h> #include <VistaInterProcComm/Concurrency/VistaThreadEvent.h>
#include <atomic>
class ITAPortaudioInterface; class ITAPortaudioInterface;
//! VA Portaudio Backend Klasse //! VA Portaudio Backend Klasse
...@@ -83,7 +84,7 @@ private: ...@@ -83,7 +84,7 @@ private:
CVAPortaudioBackend* m_pParent; CVAPortaudioBackend* m_pParent;
ITAPortaudioInterface* m_pPA; ITAPortaudioInterface* m_pPA;
ITAAtomicInt m_iOperation; std::atomic< int > m_iOperation;
int m_iResult; int m_iResult;
ITAException m_oException; ITAException m_oException;
VistaThreadEvent m_evStart; VistaThreadEvent m_evStart;
...@@ -100,7 +101,7 @@ private: ...@@ -100,7 +101,7 @@ private:
ITAPortaudioInterface* m_pITAPA; ITAPortaudioInterface* m_pITAPA;
CVAAudioDriverConfig* m_pConfig; CVAAudioDriverConfig* m_pConfig;
ITAStreamProperties m_oOutputStreamProps; ITAStreamProperties m_oOutputStreamProps;
ITAAtomicBool m_bStreaming; std::atomic< bool > m_bStreaming;
}; };
#endif // IW_VACORE_PORTAUDIOBACKEND #endif // IW_VACORE_PORTAUDIOBACKEND
...@@ -74,7 +74,8 @@ private: ...@@ -74,7 +74,8 @@ private:
CVASceneState* m_pNewSceneState; CVASceneState* m_pNewSceneState;
CVASceneState* m_pCurSceneState; CVASceneState* m_pCurSceneState;
std::atomic< bool > m_bIndicateReset, m_bResetAck; std::atomic< bool > m_bIndicateReset;
std::atomic< bool > m_bResetAck;
inline CVAAmbientMixerAudioRenderer operator=( const CVAAmbientMixerAudioRenderer & ) { VA_EXCEPT_NOT_IMPLEMENTED; }; inline CVAAmbientMixerAudioRenderer operator=( const CVAAmbientMixerAudioRenderer & ) { VA_EXCEPT_NOT_IMPLEMENTED; };
}; };
......
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
#include <ITAUPConvolution.h> #include <ITAUPConvolution.h>
#include <ITAUPFilter.h> #include <ITAUPFilter.h>
#include <ITAUPFilterPool.h> #include <ITAUPFilterPool.h>
#include <ITAAtomicPrimitives.h>
#include <ITAClock.h> #include <ITAClock.h>
#include <ITACriticalSection.h> #include <ITACriticalSection.h>
#include <ITADataSourceRealization.h> #include <ITADataSourceRealization.h>
...@@ -53,6 +52,7 @@ ...@@ -53,6 +52,7 @@
#include <VistaInterProcComm/Concurrency/VistaThreadEvent.h> #include <VistaInterProcComm/Concurrency/VistaThreadEvent.h>
// STL includes // STL includes
#include <atomic>
#include <algorithm> #include <algorithm>
#include <cassert> #include <cassert>
#include <fstream> #include <fstream>
...@@ -108,7 +108,7 @@ public: ...@@ -108,7 +108,7 @@ public:
CDirectivityState oDirectivityStateCur; CDirectivityState oDirectivityStateCur;
CDirectivityState oDirectivityStateNew; CDirectivityState oDirectivityStateNew;
ITAAtomicBool bDelete; std::atomic< bool > bDelete;
CITAThirdOctaveFilterbank* pThirdOctaveFilterBank; CITAThirdOctaveFilterbank* pThirdOctaveFilterBank;
CITAVariableDelayLine* pVariableDelayLineCh; CITAVariableDelayLine* pVariableDelayLineCh;
......
...@@ -313,7 +313,7 @@ private: ...@@ -313,7 +313,7 @@ private:
int m_iNumChannels; int m_iNumChannels;
bool m_bDumpListeners; bool m_bDumpListeners;
double m_dDumpListenersGain; double m_dDumpListenersGain;
ITAAtomicInt m_iDumpListenersFlag; std::atomic< int > m_iDumpListenersFlag;
int m_iDefaultVDLSwitchingAlgorithm; int m_iDefaultVDLSwitchingAlgorithm;
double m_dAdditionalStaticDelaySeconds; //!< Additional delay in seconds for delay compensation double m_dAdditionalStaticDelaySeconds; //!< Additional delay in seconds for delay compensation
...@@ -353,8 +353,8 @@ private: ...@@ -353,8 +353,8 @@ private:
std::list< CVAAFFSource* > m_lSources; //!< List of sources std::list< CVAAFFSource* > m_lSources; //!< List of sources
std::list< CVAAFFListener* > m_lListeners; //!< List of listeners std::list< CVAAFFListener* > m_lListeners; //!< List of listeners
ITASampleBuffer m_sbTemp; //!< Temporally used buffer to store a block of samples during processing ITASampleBuffer m_sbTemp; //!< Temporally used buffer to store a block of samples during processing
ITAAtomicInt m_iResetFlag; //!< Reset status flag: 0=normal_op, 1=reset_request, 2=reset_ack std::atomic< int > m_iResetFlag; //!< Reset status flag: 0=normal_op, 1=reset_request, 2=reset_ack
ITAAtomicInt m_iStatus; //!< Current status flag: 0=stopped, 1=running std::atomic< int > m_iStatus; //!< Current status flag: 0=stopped, 1=running
} ctxAudio; } ctxAudio;
void Init( const CVAStruct& oArgs ); void Init( const CVAStruct& oArgs );
......
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
#include <ITAUPConvolution.h> #include <ITAUPConvolution.h>
#include <ITAUPFilter.h> #include <ITAUPFilter.h>
#include <ITAUPFilterPool.h> #include <ITAUPFilterPool.h>
#include <ITAAtomicPrimitives.h>
#include <ITAThirdOctaveFilterbank.h> #include <ITAThirdOctaveFilterbank.h>
#include <ITAClock.h> #include <ITAClock.h>
#include <ITACriticalSection.h> #include <ITACriticalSection.h>
...@@ -54,7 +53,8 @@ ...@@ -54,7 +53,8 @@
#include <VistaInterProcComm/Concurrency/VistaThreadEvent.h> #include <VistaInterProcComm/Concurrency/VistaThreadEvent.h>
// STL includes // STL includes
#include <assert.h> #include <atomic>
#include <cassert>
#include <fstream> #include <fstream>
#include <iomanip> #include <iomanip>
...@@ -169,7 +169,7 @@ public: ...@@ -169,7 +169,7 @@ public:
double dGroundReflectionPlanePosition; //!< Height of ground, defaults to 0 double dGroundReflectionPlanePosition; //!< Height of ground, defaults to 0
ITAAtomicBool bDelete; //!< Schallpfad zur Lschung markiert? std::atomic< bool > bDelete; //!< Schallpfad zur Lschung markiert?
inline void PreRequest() inline void PreRequest()
{ {
......
...@@ -287,8 +287,8 @@ private: ...@@ -287,8 +287,8 @@ private:
std::list< CVABATNSoundReceiver* > m_lListener; //!< List of listeners std::list< CVABATNSoundReceiver* > m_lListener; //!< List of listeners
ITASampleBuffer m_sbTempBufD; //!< Temporally used buffer to store a block of samples during processing (direct sound) ITASampleBuffer m_sbTempBufD; //!< Temporally used buffer to store a block of samples during processing (direct sound)
ITASampleBuffer m_sbTempBufR; //!< Temporally used buffer to store a block of samples during processing (reflected sound) ITASampleBuffer m_sbTempBufR; //!< Temporally used buffer to store a block of samples during processing (reflected sound)
ITAAtomicInt m_iResetFlag; //!< Reset status flag: 0=normal_op, 1=reset_request, 2=reset_ack std::atomic< int > m_iResetFlag; //!< Reset status flag: 0=normal_op, 1=reset_request, 2=reset_ack
ITAAtomicInt m_iStatus; //!< Current status flag: 0=stopped, 1=running std::atomic< int > m_iStatus; //!< Current status flag: 0=stopped, 1=running
} ctxAudio; } ctxAudio;
void Init( const CVAStruct& oArgs ); void Init( const CVAStruct& oArgs );
......
...@@ -34,7 +34,6 @@ ...@@ -34,7 +34,6 @@
#include <ITAUPConvolution.h> #include <ITAUPConvolution.h>
#include <ITAUPFilter.h> #include <ITAUPFilter.h>
#include <ITAUPFilterPool.h> #include <ITAUPFilterPool.h>
#include <ITAAtomicPrimitives.h>
#include <ITAVariableDelayLine.h> #include <ITAVariableDelayLine.h>
#include <ITAThirdOctaveFilterbank.h> #include <ITAThirdOctaveFilterbank.h>
#include <ITAClock.h> #include <ITAClock.h>
...@@ -49,7 +48,8 @@ ...@@ -49,7 +48,8 @@
#include <ITAFastMath.h> #include <ITAFastMath.h>
// STL includes // STL includes
#include <assert.h> #include <atomic>
#include <cassert>
#include <algorithm> #include <algorithm>
#include <iomanip> #include <iomanip>
#include <set> #include <set>
...@@ -82,7 +82,7 @@ public: ...@@ -82,7 +82,7 @@ public:
CITAVariableDelayLine* pVariableDelayLine; //!< DSP CITAVariableDelayLine* pVariableDelayLine; //!< DSP
ITAAtomicBool bMarkedForDeletion; std::atomic< bool > bMarkedForDeletion;
void PreRequest() void PreRequest()
{ {
...@@ -207,7 +207,7 @@ public: ...@@ -207,7 +207,7 @@ public:
private: private:
tbb::concurrent_queue< CVABinauralArtificialReverbAudioRenderer::Listener* > m_lTasks; tbb::concurrent_queue< CVABinauralArtificialReverbAudioRenderer::Listener* > m_lTasks;
CVABinauralArtificialReverbAudioRenderer* m_pParentRenderer; CVABinauralArtificialReverbAudioRenderer* m_pParentRenderer;
ITAAtomicInt m_iState; std::atomic< int > m_iState;
}; };
...@@ -714,7 +714,7 @@ void CVABinauralArtificialReverbAudioRenderer::ManageArtificialReverbPaths( cons ...@@ -714,7 +714,7 @@ void CVABinauralArtificialReverbAudioRenderer::ManageArtificialReverbPaths( cons
void CVABinauralArtificialReverbAudioRenderer::ProcessStream( const ITAStreamInfo* pStreamInfo ) void CVABinauralArtificialReverbAudioRenderer::ProcessStream( const ITAStreamInfo* pStreamInfo )
{ {
// If streaming is active, set // If streaming is active, set
ctxAudio.m_iStatus.set( 1 ); ctxAudio.m_iStatus = 1;
// Swap forced update and check later if another process requests another forced update // Swap forced update and check later if another process requests another forced update
bool bForceARUpdateOnceLocalCopy = m_bForceARUpdateOnce; bool bForceARUpdateOnceLocalCopy = m_bForceARUpdateOnce;
......
...@@ -112,7 +112,7 @@ protected: ...@@ -112,7 +112,7 @@ protected:
IVADirectivity* pCurHRIR; IVADirectivity* pCurHRIR;
IVADirectivity* pNewHRIR; IVADirectivity* pNewHRIR;
ITAAtomicBool bARFilterUpdateRequired; std::atomic< bool > bARFilterUpdateRequired;
void PreRequest() void PreRequest()
{ {
...@@ -215,7 +215,7 @@ private: ...@@ -215,7 +215,7 @@ private:
IVAObjectPool* m_pListenerPool; //!< Storage manager for listener IVAObjectPool* m_pListenerPool; //!< Storage manager for listener
CBARSimulator* m_pARSimulator; //!< Artificial reverberation simulation instance CBARSimulator* m_pARSimulator; //!< Artificial reverberation simulation instance
ITAAtomicBool m_bForceARUpdateOnce; //!< Triggers a forced AR update on next stream process loop std::atomic< bool > m_bForceARUpdateOnce; //!< Triggers a forced AR update on next stream process loop
std::map< int, Source* > m_mSources; //!< Internal list of sources std::map< int, Source* > m_mSources; //!< Internal list of sources
std::map< int, Listener* > m_mListener; //!< Internal list of listener std::map< int, Listener* > m_mListener; //!< Internal list of listener
...@@ -234,8 +234,8 @@ private: ...@@ -234,8 +234,8 @@ private:
tbb::concurrent_queue< Listener* > m_qpNewListeners; //!< Lock-free queue: new listener tbb::concurrent_queue< Listener* > m_qpNewListeners; //!< Lock-free queue: new listener
tbb::concurrent_queue< Listener* > m_qpDelListeners; //!< Lock-free queue: removed listener tbb::concurrent_queue< Listener* > m_qpDelListeners; //!< Lock-free queue: removed listener
ITASampleBuffer m_sbTempBuf1; ITASampleBuffer m_sbTempBuf1;
ITAAtomicInt m_iResetFlag; // 0=normal_op, 1=reset_request, 2=reset_ack std::atomic< int > m_iResetFlag; // 0=normal_op, 1=reset_request, 2=reset_ack
ITAAtomicInt m_iStatus; // 0=stopped, 1=running std::atomic< int > m_iStatus; // 0=stopped, 1=running
} ctxAudio; } ctxAudio;
......
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
#include <ITAUPConvolution.h> #include <ITAUPConvolution.h>
#include <ITAUPFilter.h> #include <ITAUPFilter.h>
#include <ITAUPFilterPool.h> #include <ITAUPFilterPool.h>
#include <ITAAtomicPrimitives.h>
#include <ITAClock.h> #include <ITAClock.h>
#include <ITACriticalSection.h> #include <ITACriticalSection.h>
#include <ITADataSourceRealization.h> #include <ITADataSourceRealization.h>
...@@ -57,6 +56,7 @@ ...@@ -57,6 +56,7 @@
#include <VistaBase/VistaQuaternion.h> #include <VistaBase/VistaQuaternion.h>
// STL includes // STL includes
#include <atomic>
#include <algorithm> #include <algorithm>
#include <cassert> #include <cassert>
#include <fstream> #include <fstream>
...@@ -140,7 +140,7 @@ public: ...@@ -140,7 +140,7 @@ public:
CHRIRState oHRIRStateCur; CHRIRState oHRIRStateCur;
CHRIRState oHRIRStateNew; CHRIRState oHRIRStateNew;
ITAAtomicBool bDelete; std::atomic< bool > bDelete;
CITAThirdOctaveFilterbank* pThirdOctaveFilterBank; CITAThirdOctaveFilterbank* pThirdOctaveFilterBank;
CITAVariableDelayLine* pVariableDelayLineChL; CITAVariableDelayLine* pVariableDelayLineChL;
......