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

Updating version to v2017a and also some style changes

parent 34863df2
......@@ -53,7 +53,7 @@ if( NOT DEFINED ITA_VACORE_VERSION_MAJOR )
set( ITA_VACORE_VERSION_MAJOR "v2017" CACHE STRING "VACore version major (usually 'v' and year)" )
endif( )
if( NOT DEFINED ITA_VACORE_VERSION_MINOR )
set( ITA_VACORE_VERSION_MINOR "a" CACHE STRING "VACore version minor (usually a,b,c ...)" )
set( ITA_VACORE_VERSION_MINOR "ba" CACHE STRING "VACore version minor (usually a,b,c ...)" )
endif( )
# Settings
......
......@@ -64,7 +64,7 @@ public:
bCrossfadeSounds = bRequiresStartSound = bRequiresIdleSound = bRequiresStopSound = true;
dMaximumSpeed = 10.0f;
bDisableInterpolation = false;
bUseSplineInterpolation = true;
bUseSplineInterpolation = false;
};
private:
......
This diff is collapsed.
......@@ -850,7 +850,7 @@ CVABFFSoundPath* CVABinauralFreeFieldAudioRenderer::CreateSoundPath( CVABFFSourc
pPath->pListener = pListener;
pPath->bDelete = false;
CVASoundSourceState* pSourceNew = (m_pNewSceneState ? m_pNewSceneState->GetSoundSourceState( iSourceID ) : nullptr );
if( pSourceNew != nullptr )
pPath->oDirectivityStateNew.pData = (IVADirectivity*) pSourceNew->GetDirectivityData();
......@@ -859,6 +859,11 @@ CVABFFSoundPath* CVABinauralFreeFieldAudioRenderer::CreateSoundPath( CVABFFSourc
if( pListenerNew != nullptr )
pPath->oHRIRStateNew.pData = (IVAHRIRDataset*) pListenerNew->GetHRIRDataset();
// Configure DSP elements
pPath->pVariableDelayLineChL->SetAlgorithm( m_iDefaultVDLSwitchingAlgorithm );
pPath->pVariableDelayLineChR->SetAlgorithm( m_iDefaultVDLSwitchingAlgorithm );
m_lSoundPaths.push_back( pPath );
m_pUpdateMessage->vNewPaths.push_back( pPath );
......
......@@ -2,14 +2,14 @@
*
* VVV VVV A
* VVV VVV AAA Acoustics
* VVV VVV AAA Real-time auralisation for reality
* VVV VVV AAA Real-time auralisation for reality
* VVV VVV AAA
* VVVVVV AAA (c) Copyright Institut fr Technische Akustik (ITA)
* VVVV AAA RWTH Aachen (http://www.akustik.rwth-aachen.de)
*
* ---------------------------------------------------------------------------------
*
* Datei: VABinauralFreeFieldAudioRenderer.h
* Datei: VABinauralFreeFieldAudioRenderer.h
*
* Zweck: Binaural free field audio renderer implementation
*
......@@ -18,7 +18,7 @@
*
* ---------------------------------------------------------------------------------
*/
// $Id: $
#ifndef __VA_BINAURALFREEFIELDAUDIORENDERER__
......@@ -66,9 +66,9 @@ class CVABFFSoundPathFactory;
//! Binaural Freefield Audio Renderer
/**
* The binaural freefield audio renderer implements sound propagation with
* no propagation disturbance in the medium, i.e. by reflecting surfaces.
* no propagation disturbance in the medium (for eample no reflecting surfaces).
*
* It accounts for
* It accounts for
* - source directivity
* - medium propagation delay
* - medium absorption over distance
......@@ -77,7 +77,7 @@ class CVABFFSoundPathFactory;
* - Doppler shifts (source and listener movement in medium of finite speed of sound)
*
*/
class CVABinauralFreeFieldAudioRenderer : public IVAAudioRenderer, public ITADatasourceRealization, public CVAObject
class CVABinauralFreeFieldAudioRenderer : public IVAAudioRenderer, public ITADatasourceRealization, public CVAObject
{
public:
CVABinauralFreeFieldAudioRenderer( const CVAAudioRendererInitParams& oParams );
......@@ -90,13 +90,13 @@ public:
* scene. This call should be blocking until reset is done.
*/
void Reset();
//! Load a user requested scene
/**
* This method loads a scene, usually a file path to geometry data.
*/
void LoadScene( const std::string& sFilename ) {};
inline void LoadScene( const std::string& sFilename ) {};
//! Handle a scene state change
/**
* This method updates the internal representation of the VA Scene
......@@ -113,7 +113,7 @@ public:
* of the sound path entities
*/
void UpdateGlobalAuralizationMode( int iGlobalAuralizationMode );
//! Render output sample blocks
/**
* This method renders the sound propagation based on the binaural approach
......@@ -128,15 +128,15 @@ public:
// --= Module interface =--
int CallObject(const CVAStruct& oArgs, CVAStruct& oReturn);
int CallObject( const CVAStruct& oArgs, CVAStruct& oReturn );
void onStartDumpListeners(const std::string& sFilenameFormat);
void onStartDumpListeners( const std::string& sFilenameFormat );
void onStopDumpListeners();
protected:
//! Internal source representation
class CVABFFSource : public CVAPoolObject
class CVABFFSource : public CVAPoolObject
{
public:
class Config
......@@ -151,7 +151,7 @@ protected:
int iMotionModelNumHistoryKeys;
};
CVABFFSource( const Config& oConf_ )
inline CVABFFSource( const Config& oConf_ )
: oConf( oConf_ )
{};
......@@ -165,7 +165,7 @@ protected:
bool bValidTrajectoryPresent; //!< Estimation possible -> valid trajectory present
//! Pool-Konstruktor
void PreRequest()
inline void PreRequest()
{
pData = nullptr;
......@@ -180,15 +180,15 @@ protected:
bValidTrajectoryPresent = false;
};
void PreRelease()
inline void PreRelease()
{
delete pMotionModel;
pMotionModel = nullptr;
};
double GetCreationTimestamp() const
{
return m_dCreationTimeStamp;
inline double GetCreationTimestamp() const
{
return m_dCreationTimeStamp;
};
private:
......@@ -197,7 +197,7 @@ protected:
//! Internal listener representation
class CVABFFListener : public CVAPoolObject
class CVABFFListener : public CVAPoolObject
{
public:
class Config
......@@ -212,8 +212,9 @@ protected:
int iMotionModelNumHistoryKeys;
};
CVABFFListener( CVACoreImpl* pCore, const Config& oConf )
: pCore( pCore ), oConf( oConf )
inline CVABFFListener( CVACoreImpl* pCore, const Config& oConf )
: pCore( pCore )
, oConf( oConf )
{};
CVACoreImpl* pCore;
......@@ -229,9 +230,9 @@ protected:
ITASampleFrame* psfOutput; //!< Accumulated listener output signals
ITAAudiofileWriter* pListenerOutputAudioFileWriter; //!< File writer used for dumping the listener signals
void PreRequest()
{
inline void PreRequest()
{
pData = nullptr;
CVABasicMotionModel::Config oListenerMotionConfig;
......@@ -248,7 +249,7 @@ protected:
psfOutput = nullptr;
};
void PreRelease()
inline void PreRelease()
{
delete pMotionModel;
pMotionModel = nullptr;
......@@ -257,25 +258,26 @@ protected:
FinalizeDump();
};
void InitDump(const std::string& sFilename) {
std::string sOutput(sFilename);
sOutput = SubstituteMacro(sOutput, "ListenerName", pData->sName);
sOutput = SubstituteMacro(sOutput, "ListenerID", IntToString( pData->iID ) );
inline void InitDump( const std::string& sFilename )
{
std::string sOutput( sFilename );
sOutput = SubstituteMacro( sOutput, "ListenerName", pData->sName );
sOutput = SubstituteMacro( sOutput, "ListenerID", IntToString( pData->iID ) );
ITAAudiofileProperties props;
props.dSampleRate = pCore->GetCoreConfig()->oAudioDriverConfig.dSampleRate;
props.eDomain = ITADomain::ITA_TIME_DOMAIN;
props.eQuantization = ITAQuantization::ITA_FLOAT;
props.iChannels = 2;
props.iLength = 0;
pListenerOutputAudioFileWriter = ITABufferedAudiofileWriter::create(sOutput, props);
}
pListenerOutputAudioFileWriter = ITABufferedAudiofileWriter::create( sOutput, props );
};
void FinalizeDump()
inline void FinalizeDump()
{
delete pListenerOutputAudioFileWriter;
pListenerOutputAudioFileWriter = nullptr;
}
};
};
private:
......@@ -288,7 +290,7 @@ private:
CVASceneState* m_pNewSceneState;
int m_iCurGlobalAuralizationMode;
IVAObjectPool* m_pSoundPathPool;
CVABFFSoundPathFactory* m_pSoundPathFactory;
std::list< CVABFFSoundPath* > m_lSoundPaths; //!< List of sound paths in user context (VACore calls)
......@@ -303,7 +305,7 @@ private:
bool m_bDumpListeners;
double m_dDumpListenersGain;
ITAAtomicInt m_iDumpListenersFlag;
int m_iHRIRFilterLength; //!< Length of the HRIR filter DSP module
int m_iDefaultVDLSwitchingAlgorithm;
......@@ -351,9 +353,7 @@ private:
void Init( const CVAStruct& oArgs );
void ManageSoundPaths( const CVASceneState* pCurScene,
const CVASceneState* pNewScene,
const CVASceneStateDiff* pDiff );
void ManageSoundPaths( const CVASceneState* pCurScene, const CVASceneState* pNewScene, const CVASceneStateDiff* pDiff );
void UpdateSources();
CVABFFListener* CreateListener( int iID, const CVAListenerState* );
void DeleteListener( int iID );
......@@ -361,7 +361,7 @@ private:
void DeleteSource( int iID );
CVABFFSoundPath* CreateSoundPath( CVABFFSource*, CVABFFListener* );
void DeleteSoundPath( CVABFFSoundPath* );
void UpdateTrajectories();
void UpdateSoundPaths();
......
......@@ -1377,7 +1377,7 @@ void CVACoreImpl::SetAudiofileSignalSourcePlaybackAction( const std::string& sSi
VA_TRY
{
if( !IsValidAudiofileSignalSourcePlaybackAction( iPlaybackAction ) )
VA_EXCEPT2( INVALID_PARAMETER, "Invalid playback action" );
VA_EXCEPT2( INVALID_PARAMETER, "Invalid playback action" );
IVAAudioSignalSource* pSource = m_pSignalSourceMan->RequestSignalSource( sSignalSourceID );
......
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