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

Progress on linux compat

parent 7e44e697
......@@ -40,7 +40,7 @@ CVAAmbisonicsFreefieldAudioRenderer::CVAAmbisonicsFreefieldAudioRenderer( const
m_pdsOutput->SetStreamEventHandler( this );
std::string sFileName = "../../../VAData/Audiofiles/Bformat_2ndOrder_Bauer.wav";
m_pdsAmbisonicsFile = new ITAFileDatasource( sFileName, unsigned int( iBlockLength ), true );
m_pdsAmbisonicsFile = new ITAFileDatasource( sFileName, (unsigned int)( iBlockLength ), true );
}
CVAAmbisonicsFreefieldAudioRenderer::~CVAAmbisonicsFreefieldAudioRenderer()
......
......@@ -979,11 +979,11 @@ CVABinauralArtificialReverbAudioRenderer::Listener* CVABinauralArtificialReverbA
pListener->pConvolverL = new DSMBCConvolver( GetBlocklength(), m_iMaxReverbFilterLengthSamples );
pListener->pConvolverL->setFilterExchangeMode(DSMBCConvolver::CROSSFADE_COSINE_SQUARE);
pListener->pConvolverL->setFilterCrossfadeLength( min( GetBlocklength(), 32 ) );
pListener->pConvolverL->setFilterCrossfadeLength( std::min( int( GetBlocklength() ), 32 ) );
pListener->pConvolverR = new DSMBCConvolver( GetBlocklength(), m_iMaxReverbFilterLengthSamples );
pListener->pConvolverR->setFilterExchangeMode(DSMBCConvolver::CROSSFADE_COSINE_SQUARE);
pListener->pConvolverR->setFilterCrossfadeLength( min( GetBlocklength(), 32 ) );
pListener->pConvolverR->setFilterCrossfadeLength( std::min( int( GetBlocklength() ), 32 ) );
assert( pListener->pData );
pListener->bDeleted = false;
......
// $Id: $
#include "VAMonauralFreefieldAudioRenderer.h"
#include "VAMonauralFreeFieldAudioRenderer.h"
#if( VACORE_WITH_RENDERER_MONAURAL_FREE_FIELD==1 )
......
......@@ -22,8 +22,9 @@
#include <VistaInterProcComm/Concurrency/VistaThreadEvent.h>
// STL includes
#include <assert.h>
#include <cassert>
#include <vector>
#include <cmath>
// 3rdParty includes
#include <tbb/concurrent_queue.h>
......@@ -815,7 +816,7 @@ void CVAPTGenericPathAudioRenderer::HandleProcessStream( ITADatasourceRealizatio
vfRMS[ n ] = 0.0f;
for( int i = 0; i<int( m_pOutput->GetBlocklength() ); i++ )
vfRMS[ n ] += pow( std::abs( m_pOutput->GetWritePointer( n )[ i ] ), 2 );
vfRMS[ n ] = std::sqrtf( vfRMS[ n ] ) / m_pOutput->GetBlocklength();
vfRMS[ n ] = std::sqrt( vfRMS[ n ] ) / m_pOutput->GetBlocklength();
if( vfRMS[ n ] != 0.0f )
bDataPresent = true;
}
......
......@@ -8,8 +8,8 @@
#include <Scene/VAListenerState.h>
#include <Scene/VAMotionState.h>
#include <Scene/VASceneState.h>
#include "VAHRIRDataset.h>
#include "VAHRIRDatasetDAFF2D.h>
#include "VAHRIRDataset.h"
#include "VAHRIRDatasetDAFF2D.h"
#include <Utils/VAUtils.h>
#include <VAHardwareSetup.h>
......
......@@ -23,7 +23,6 @@
#include <VistaBase/VistaTransformMatrix.h>
#include <VistaBase/VistaVector3D.h>
#include <xutility>
CVANCTCReproduction::CVANCTCReproduction( const CVAAudioReproductionModuleInitParams& oParams )
: CVAObject( oParams.sClass + ":" + oParams.sID )
......@@ -381,4 +380,4 @@ int CVANCTCReproduction::GetNumInputChannels() const
return 2;
}
#endif // ( VACORE_WITH_REPRODUCTION_BINAURAL_NCTC == 1 )
\ No newline at end of file
#endif // ( VACORE_WITH_REPRODUCTION_BINAURAL_NCTC == 1 )
......@@ -175,10 +175,10 @@ CVAStruct CVAListenerState::GetParameters( const CVAStruct& oArgs ) const
oRet["auramode"] = data.iAuraMode;
oRet["hrirdatasetid"] = data.iHRIRDatasetID;
oRet["anthroparams"] = CVAStruct();
oRet["anthroparams"]["headwidth"] = data.oAnthroData.dHeadWidth;
oRet["anthroparams"]["headheight"] = data.oAnthroData.dHeadHeight;
oRet["anthroparams"]["headdepth"] = data.oAnthroData.dHeadDepth;
oRet[std::string("anthroparams")] = CVAStruct();
oRet[std::string("anthroparams")][std::string("headwidth")] = data.oAnthroData.dHeadWidth;
oRet[std::string("anthroparams")][std::string("headheight")] = data.oAnthroData.dHeadHeight;
oRet[std::string("anthroparams")][std::string("headdepth")] = data.oAnthroData.dHeadDepth;
return oRet;
}
......
Supports Markdown
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