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

Some style updates

parent 33fa89e9
......@@ -798,20 +798,19 @@ void ComplexSoundPath::UpdateDiffuseDecay( const int iLeadingZeroOffset, const I
fFilterEnergy[ 1 ] = sqrt( fFilterEnergy[ 1 ] );
float fFilterEnergyMax = max( fFilterEnergy[ 0 ], fFilterEnergy[ 1 ] );
float fFilterEnergyMaximum = 3;
float fFilterEnergyMaximum = 15;
if( fFilterEnergy[ 0 ] > fFilterEnergyMaximum || fFilterEnergy[ 1 ] > fFilterEnergyMaximum )
{
VA_WARN( "ComplexSoundPath", "Diffuse Decay filter energy on update "
VA_WARN( "ComplexSoundPath", " SKIPPING diffuse decay filter update, energy of update #"
<< oProfiler.uiCyclesUpdateDD
<< " too high (" << FloatToString( fFilterEnergyMax, 2 )
<< ")! Exporting filter." );
<< ")! Exporting result filter to 'ComplexSoundPath_corrupt_RT_filter.wav'." );
writeAudiofile( "ComplexSoundPath_corrupt_RT_filter.wav", psfFilterPart, dSampleRate, ITAQuantization::ITA_FLOAT );
oProfiler.uiCyclesUpdateDD++;
return;
}
m_csRIRDiffuseDecayAssembly.enter();
......
......@@ -41,7 +41,7 @@
// 3rdParty includes
#include <tbb/concurrent_queue.h>
//! Binaural Freefield sound path
//! Generic sound path
class CVAPTGenericSoundPath : public CVAPoolObject
{
public:
......@@ -51,7 +51,7 @@ public:
ITAAtomicBool bDelete;
std::vector< ITAUPConvolution* > vpFIRConvolver; // N-channel convolver
void PreRequest()
inline void PreRequest()
{
pSource = nullptr;
pListener = nullptr;
......@@ -69,17 +69,17 @@ private:
class CVAPTGenericSoundPathFactory : public IVAPoolObjectFactory
{
public:
CVAPTGenericSoundPathFactory( double dSampleRate, int iBlockLength, int iNumChannels, int iIRFilterLength )
: m_dSampleRate( dSampleRate )
, m_iBlockLength( iBlockLength )
, m_iNumChannels( iNumChannels )
, m_iIRFilterLengthSamples( iIRFilterLength )
{}
inline CVAPTGenericSoundPathFactory( double dSampleRate, int iBlockLength, int iNumChannels, int iIRFilterLength )
: m_dSampleRate( dSampleRate )
, m_iBlockLength( iBlockLength )
, m_iNumChannels( iNumChannels )
, m_iIRFilterLengthSamples( iIRFilterLength )
{};
CVAPoolObject* CreatePoolObject()
inline CVAPoolObject* CreatePoolObject()
{
return new CVAPTGenericSoundPath( m_dSampleRate, m_iBlockLength, m_iNumChannels, m_iIRFilterLengthSamples );
}
};
private:
double m_dSampleRate;
......@@ -91,12 +91,12 @@ private:
class CVAPTGPListenerPoolFactory : public IVAPoolObjectFactory
{
public:
CVAPTGPListenerPoolFactory( CVACoreImpl* pCore )
inline CVAPTGPListenerPoolFactory( CVACoreImpl* pCore )
: m_pCore( pCore )
{
};
CVAPoolObject* CreatePoolObject()
inline CVAPoolObject* CreatePoolObject()
{
CVAPTGenericPathAudioRenderer::CVAPTGPListener* pListener;
pListener = new CVAPTGenericPathAudioRenderer::CVAPTGPListener();
......@@ -111,11 +111,11 @@ private:
class CVAPTGPSourcePoolFactory : public IVAPoolObjectFactory
{
public:
CVAPTGPSourcePoolFactory()
inline CVAPTGPSourcePoolFactory()
{
};
CVAPoolObject* CreatePoolObject()
inline CVAPoolObject* CreatePoolObject()
{
CVAPTGenericPathAudioRenderer::CVAPTGPSource* pSource;
pSource = new CVAPTGenericPathAudioRenderer::CVAPTGPSource();
......
......@@ -63,7 +63,7 @@ public:
CVAPTGenericPathAudioRenderer( const CVAAudioRendererInitParams& oParams );
virtual ~CVAPTGenericPathAudioRenderer();
void Reset();
void LoadScene( const std::string& ) {};
inline void LoadScene( const std::string& ) {};
void UpdateScene( CVASceneState* );
void UpdateGlobalAuralizationMode( int );
ITADatasource* GetOutputDatasource();
......@@ -134,7 +134,7 @@ private:
std::list< CVAPTGenericSoundPath* > vNewPaths;
std::list< CVAPTGenericSoundPath* > vDelPaths;
void PreRequest()
inline void PreRequest()
{
vNewSources.clear();
vDelSources.clear();
......@@ -142,7 +142,7 @@ private:
vDelListeners.clear();
vNewPaths.clear();
vDelPaths.clear();
}
};
};
IVAObjectPool* m_pUpdateMessagePool; // really necessary?
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment