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

Removing warnings

parent 5daedae8
......@@ -172,7 +172,7 @@ protected:
private:
const Config m_oConf;
CVABasicMotionModel & operator=( const CVABasicMotionModel & ) { VA_EXCEPT_NOT_IMPLEMENTED; };
inline CVABasicMotionModel & operator=( const CVABasicMotionModel & ) { VA_EXCEPT_NOT_IMPLEMENTED; };
};
#endif // IW_VACORE_MOTIONMODELBASE
......@@ -15,7 +15,8 @@
#include "../Scene/VAMotionState.h"
#if (VA_MOTIONMODEL_DATA_LOG_ESTIMATED == 1)
#ifdef VA_MOTIONMODEL_DATA_LOG_ESTIMATED
std::ostream& CVASampleAndHoldMotionModel::MotionLogDataOutput::outputDesc(std::ostream& os) const
{
os << "Estimation time" << "\t"
......@@ -31,9 +32,10 @@ std::ostream& CVASampleAndHoldMotionModel::MotionLogDataOutput::outputData(std::
os << dTime << "\t" << vPos.x << "\t" << vPos.y << "\t" << vPos.z << std::endl;
return os;
}
#endif
#if (VA_MOTIONMODEL_DATA_LOG_INPUT== 1)
#ifdef VA_MOTIONMODEL_DATA_LOG_INPUT
std::ostream& CVASampleAndHoldMotionModel::MotionLogDataInput::outputDesc(std::ostream& os) const
{
os << "Input time" << "\t"
......
......@@ -28,10 +28,10 @@ public:
, m_dStartTime( 0 )
{
char buf1[ 255 ];
sprintf( buf1, "SampleAndHoldMotionModel_Estimation_0x%08Xh.log", this );
sprintf( buf1, "SampleAndHoldMotionModel_Estimation_0x%08Xh.log", int( this ) );
m_oEstimationDataLog.setOutputFile( buf1 );
char buf2[ 255 ];
sprintf( buf2, "SampleAndHoldMotionModel_Input_0x%08Xh.log", this );
sprintf( buf2, "SampleAndHoldMotionModel_Input_0x%08Xh.log", int( this ) );
m_oInputDataLog.setOutputFile( buf2 );
};
......
......@@ -52,7 +52,7 @@ private:
CVASceneState* m_pNewSceneState;
CVASceneState* m_pCurSceneState;
ITAAtomicBool m_bIndicateReset, m_bResetAck;
CVAAmbientMixerAudioRenderer operator=( const CVAAmbientMixerAudioRenderer & ) { VA_EXCEPT_NOT_IMPLEMENTED; };
inline CVAAmbientMixerAudioRenderer operator=( const CVAAmbientMixerAudioRenderer & ) { VA_EXCEPT_NOT_IMPLEMENTED; };
};
#endif // VACORE_WITH_RENDERER_AMBIENT_MIXER
......
......@@ -216,6 +216,9 @@ public:
private:
CVACoreImpl* m_pCore;
const CVAAmbisonicsFreeFieldAudioRenderer::CVAAFFListener::Config& m_oListenerConf;
//! Not for use, avoid C4512
CVAAFFListenerPoolFactory operator=( const CVAAFFListenerPoolFactory & ) { VA_EXCEPT_NOT_IMPLEMENTED; }
};
class CVAAFFSourcePoolFactory : public IVAPoolObjectFactory
......@@ -234,6 +237,9 @@ public:
private:
const CVAAmbisonicsFreeFieldAudioRenderer::CVAAFFSource::Config& m_oSourceConf;
//! Not for use, avoid C4512
CVAAFFSourcePoolFactory operator=( const CVAAFFSourcePoolFactory & ) { VA_EXCEPT_NOT_IMPLEMENTED; }
};
// Renderer
......
......@@ -368,6 +368,9 @@ private:
friend class CVAAFFSoundPath;
friend class CVAAFFListenerPoolFactory;
friend class CVAAFFSourcePoolFactory;
//! Not for use, avoid C4512
inline CVAAmbisonicsFreeFieldAudioRenderer operator=( const CVAAmbisonicsFreeFieldAudioRenderer & ) { VA_EXCEPT_NOT_IMPLEMENTED; };
};
#endif // VACORE_WITH_RENDERER_AMBISONICS_FREE_FIELD
......
......@@ -285,6 +285,9 @@ public:
private:
CVACoreImpl* m_pCore;
const CVABinauralAirTrafficNoiseAudioRenderer::CVABATNSoundReceiver::Config& m_oListenerConf;
//! Not for use, avoid C4512
inline CVABATNSoundReceiverPoolFactory operator=( const CVABATNSoundReceiverPoolFactory & ) { VA_EXCEPT_NOT_IMPLEMENTED; };
};
class CVABATNSourcePoolFactory : public IVAPoolObjectFactory
......@@ -304,6 +307,9 @@ public:
private:
const CVABinauralAirTrafficNoiseAudioRenderer::CVABATNSource::Config& m_oSourceConf;
//! Not for use, avoid C4512
inline CVABATNSourcePoolFactory operator=( const CVABATNSourcePoolFactory & ) { VA_EXCEPT_NOT_IMPLEMENTED; };
};
// Renderer
......
......@@ -313,6 +313,9 @@ private:
friend class CVABATNSoundPath;
friend class CVABATNSoundReceiverPoolFactory;
friend class CVABATNSourcePoolFactory;
//! Not for use, avoid C4512
inline CVABinauralAirTrafficNoiseAudioRenderer operator=( const CVABinauralAirTrafficNoiseAudioRenderer & ) { VA_EXCEPT_NOT_IMPLEMENTED; };
};
#endif // VACORE_WITH_RENDERER_BINAURAL_AIR_TRAFFIC_NOISE
......
......@@ -281,7 +281,7 @@ private:
friend class CBARSimulator;
//! Not for use, avoid C4512
CVABinauralArtificialReverbAudioRenderer operator=( const CVABinauralArtificialReverbAudioRenderer & ) { VA_EXCEPT_NOT_IMPLEMENTED; };
inline CVABinauralArtificialReverbAudioRenderer operator=( const CVABinauralArtificialReverbAudioRenderer & ) { VA_EXCEPT_NOT_IMPLEMENTED; };
};
#endif // VACORE_WITH_RENDERER_BINAURAL_ARTIFICIAL_REVERB
......
......@@ -227,6 +227,9 @@ public:
private:
CVACoreImpl* m_pCore;
const CVABinauralFreeFieldAudioRenderer::CVABFFListener::Config& m_oListenerConf;
//! Not for use, avoid C4512
inline CVABFFListenerPoolFactory operator=( const CVABFFListenerPoolFactory & ) { VA_EXCEPT_NOT_IMPLEMENTED; };
};
class CVABFFSourcePoolFactory : public IVAPoolObjectFactory
......@@ -246,6 +249,9 @@ public:
private:
const CVABinauralFreeFieldAudioRenderer::CVABFFSource::Config& m_oSourceConf;
//! Not for use, avoid C4512
inline CVABFFSourcePoolFactory operator=( const CVABFFSourcePoolFactory & ) { VA_EXCEPT_NOT_IMPLEMENTED; };
};
// Renderer
......
......@@ -363,7 +363,7 @@ private:
friend class CVABFFSourcePoolFactory;
//! Not for use, avoid C4512
CVABinauralFreeFieldAudioRenderer operator=( const CVABinauralFreeFieldAudioRenderer & ) { VA_EXCEPT_NOT_IMPLEMENTED; };
inline CVABinauralFreeFieldAudioRenderer operator=( const CVABinauralFreeFieldAudioRenderer & ) { VA_EXCEPT_NOT_IMPLEMENTED; };
};
#endif // ( VACORE_WITH_RENDERER_BINAURAL_FREE_FIELD
......
......@@ -278,6 +278,9 @@ private:
CVAStruct CallObjectConfigGet( const std::string& sKey ) const;
friend class ComplexSoundPath;
//! Not for use, avoid C4512
inline CVARoomAcousticsAudioRenderer operator=( const CVARoomAcousticsAudioRenderer & ) { VA_EXCEPT_NOT_IMPLEMENTED; };
};
#endif // (VACORE_WITH_RENDERER_BINAURAL_ROOM_ACOUSTICS==1)
......
# $Id:$
set( RelativeDir "src/Rendering/Monaural/FreeField" )
set( RelativeSourceGroup "Source Files\\Rendering\\Monaural\\FreeField" )
set( DirFiles
VAMonauralFreeFieldAudioRenderer.cpp
VAMonauralFreeFieldAudioRenderer.h
_SourceFiles.cmake
)
set( DirFiles_SourceGroup "${RelativeSourceGroup}" )
set( LocalSourceGroupFiles )
foreach( File ${DirFiles} )
list( APPEND LocalSourceGroupFiles "${RelativeDir}/${File}" )
list( APPEND ProjectSources "${RelativeDir}/${File}" )
endforeach()
source_group( ${DirFiles_SourceGroup} FILES ${LocalSourceGroupFiles} )
# $Id:$
set( RelativeDir "src/Rendering/Monaural" )
set( RelativeSourceGroup "Source Files\\Rendering\\Monaural" )
set( SubDirs FreeField )
set( DirFiles
_SourceFiles.cmake
)
set( DirFiles_SourceGroup "${RelativeSourceGroup}" )
set( LocalSourceGroupFiles )
foreach( File ${DirFiles} )
list( APPEND LocalSourceGroupFiles "${RelativeDir}/${File}" )
list( APPEND ProjectSources "${RelativeDir}/${File}" )
endforeach()
source_group( ${DirFiles_SourceGroup} FILES ${LocalSourceGroupFiles} )
set( SubDirFiles "" )
foreach( Dir ${SubDirs} )
list( APPEND SubDirFiles "${RelativeDir}/${Dir}/_SourceFiles.cmake" )
endforeach()
foreach( SubDirFile ${SubDirFiles} )
include( ${SubDirFile} )
endforeach()
......@@ -57,7 +57,7 @@ private:
const CVAAudioRendererInitParams oParams; //!< Create a const copy of the init params
//! Not for use, avoid C4512
CVAPTDummyAudioRenderer operator=( const CVAPTDummyAudioRenderer & ) { VA_EXCEPT_NOT_IMPLEMENTED; };
inline CVAPTDummyAudioRenderer operator=( const CVAPTDummyAudioRenderer & ) { VA_EXCEPT_NOT_IMPLEMENTED; };
};
#endif // VACORE_WITH_RENDERER_PROTOTYPE_DUMMY
......
......@@ -11,7 +11,7 @@
* --------------------------------------------------------------------------------------------
*/
#include "VAMonauralFreeFieldAudioRenderer.h"
#include "VAPrototypeFreeFieldAudioRenderer.h"
#ifdef VACORE_WITH_RENDERER_PROTOTYPE_FREE_FIELD
......@@ -229,6 +229,9 @@ public:
private:
CVACoreImpl* m_pCore;
const CVAPrototypeFreeFieldAudioRenderer::CVAPFFReceiver::Config& m_oListenerConf;
//! Not for use, avoid C4512
inline CVAPFFListenerPoolFactory operator=( const CVAPFFListenerPoolFactory & ) { VA_EXCEPT_NOT_IMPLEMENTED; };
};
class CVAPFFSourcePoolFactory : public IVAPoolObjectFactory
......@@ -248,6 +251,9 @@ public:
private:
const CVAPrototypeFreeFieldAudioRenderer::CVAPFFSource::Config& m_oSourceConf;
//! Not for use, avoid C4512
inline CVAPFFSourcePoolFactory operator=( const CVAPFFSourcePoolFactory & ) { VA_EXCEPT_NOT_IMPLEMENTED; };
};
// Renderer
......@@ -1139,7 +1145,7 @@ void CVAPrototypeFreeFieldAudioRenderer::UpdateGlobalAuralizationMode( const int
}
// Class CMFSoundPath
// Class CPFFSoundPath
CVAPFFSoundPath::CVAPFFSoundPath( const double dSamplerate, const int iBlocklength, const int iMaxSoundSourceDirectivityFilterLength, const int iNumSoundReceiverChannels, const int iMaxSoundReceiverDirectivityFilterLength )
{
......@@ -1263,7 +1269,7 @@ void CVAPFFSoundPath::UpdateSoundReceiverDirectivity( const bool bDIRAuraModeEna
{
ITAUPConvolution* pFIRConvolver = vpFIRFilterBanks[ i ];
pDirectivityDataNew->GetDAFFContent()->getEffectiveFilterCoeffs( oSoundReceiverDirectivityStateNew.iRecord, i, m_sbSoundReceiverDirectivityTemp.GetData() );
pDirectivityDataNew->GetDAFFContent()->getEffectiveFilterCoeffs( oSoundReceiverDirectivityStateNew.iRecord, int( i ), m_sbSoundReceiverDirectivityTemp.GetData() );
const int iFilterTaps = (std::min)( pFIRConvolver->GetMaxFilterlength(), m_sbSoundReceiverDirectivityTemp.GetLength() );
ITAUPFilter* pFilter = pFIRConvolver->RequestFilter();
......
......@@ -340,7 +340,7 @@ private:
friend class CVAPFFSourcePoolFactory;
//! Not for use, avoid C4512
CVAPrototypeFreeFieldAudioRenderer operator=( const CVAPrototypeFreeFieldAudioRenderer & ) { VA_EXCEPT_NOT_IMPLEMENTED; };
inline CVAPrototypeFreeFieldAudioRenderer operator=( const CVAPrototypeFreeFieldAudioRenderer & ) { VA_EXCEPT_NOT_IMPLEMENTED; };
};
#endif // VACORE_WITH_RENDERER_PROTOTYPE_FREE_FIELD
......
......@@ -185,7 +185,7 @@ private:
friend class CVAPTGPSourcePoolFactory;
//! Not for use, avoid C4512
CVAPTGenericPathAudioRenderer operator=( const CVAPTGenericPathAudioRenderer & ) { VA_EXCEPT_NOT_IMPLEMENTED; };
inline CVAPTGenericPathAudioRenderer operator=( const CVAPTGenericPathAudioRenderer & ) { VA_EXCEPT_NOT_IMPLEMENTED; };
};
#endif // VACORE_WITH_RENDERER_PROTOTYPE_GENERIC_PATH
......
......@@ -239,6 +239,9 @@ public:
private:
CVACoreImpl* m_pCore;
const CVAPTHearingAidRenderer::Listener::Config& m_oListenerConf;
//! Not for use, avoid C4512
inline CVAPTHAListenerPoolFactory operator=( const CVAPTHAListenerPoolFactory & ) { VA_EXCEPT_NOT_IMPLEMENTED; };
};
class CVAPTHASourcePoolFactory : public IVAPoolObjectFactory
......@@ -258,6 +261,9 @@ public:
private:
const CVAPTHearingAidRenderer::Source::Config& m_oSourceConf;
//! Not for use, avoid C4512
CVAPTHASourcePoolFactory operator=( const CVAPTHASourcePoolFactory & ) { VA_EXCEPT_NOT_IMPLEMENTED; }
};
// Renderer
......
......@@ -86,7 +86,7 @@ public:
/**
* This method loads a scene, usually a file path to geometry data.
*/
inline void LoadScene( const std::string& sFilename ) {};
inline void LoadScene( const std::string& ) {};
//! Handle a scene state change
/**
......@@ -372,6 +372,9 @@ private:
friend class CVAPTHASoundPath;
friend class CVAPTHAListenerPoolFactory;
friend class CVAPTHASourcePoolFactory;
//! Not for use, avoid C4512
inline CVAPTHearingAidRenderer operator=( const CVAPTHearingAidRenderer & ) { VA_EXCEPT_NOT_IMPLEMENTED; };
};
#endif // VACORE_WITH_RENDERER_PROTOTYPE_HEARING_AID
......
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