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

Applying ITABase API changes

parent 1452a6d5
......@@ -62,7 +62,7 @@ public:
*/
virtual inline void SetIdentity( const bool bSmoothChangeover = true )
{
CITAThirdOctaveMagnitudeSpectrum oIdentity;
CITAThirdOctaveGainMagnitudeSpectrum oIdentity;
oIdentity.SetIdentity();
SetMagnitudes( oIdentity, bSmoothChangeover );
};
......@@ -72,7 +72,7 @@ public:
* \param oGains Neue Verstärkungsfaktoren
* \param bSmoothChangeover Überbenden (default, true) oder direktes Umschalten (false)
*/
virtual void SetMagnitudes( const CITAThirdOctaveMagnitudeSpectrum& oGains, const bool bSmoothChangeover = true ) = 0;
virtual void SetMagnitudes( const CITAThirdOctaveGainMagnitudeSpectrum& oGains, const bool bSmoothChangeover = true ) = 0;
//! Latenz (Verzögerung) der Filterbank zurückgeben
/**
......
......@@ -70,7 +70,7 @@ public:
pFilter->Release(); // Auto-release
}
inline virtual void SetMagnitudes( const CITAThirdOctaveMagnitudeSpectrum& oMags, const bool bSmoothChangeover = true )
inline virtual void SetMagnitudes( const CITAThirdOctaveGainMagnitudeSpectrum& oMags, const bool bSmoothChangeover = true )
{
m_pGenerator->GenerateFilter( oMags, m_pfFilter );
ITAUPFilter* pFilter = m_pConvolver->RequestFilter();
......
......@@ -21,7 +21,7 @@
#include <ITADSPDefinitions.h>
#include <ITAThirdOctaveFilterbank.h>
#include <ITAAmplitudeSpectrum.h>
#include <ITAThirdOctaveMagnitudeSpectrum.h>
#include <ITABiquad.h>
#include <ITASampleBuffer.h>
......@@ -52,7 +52,7 @@ public:
* @param[in] oMagnitudes Filter magnitudes (dB)
* @param[in] bSmoothChangeover If true, switching is smoothed
*/
void SetMagnitudes( const CITAThirdOctaveMagnitudeSpectrum& oMagnitudes, const bool bSmoothChangeover = true );
void SetMagnitudes( const CITAThirdOctaveGainMagnitudeSpectrum& oMagnitudes, const bool bSmoothChangeover = true );
//! Clear all internal accumulators
void Clear();
......@@ -69,7 +69,7 @@ private:
class MagnitudeUpdate
{
public:
CITAThirdOctaveMagnitudeSpectrum oMags; //! New magnitudes
CITAThirdOctaveGainMagnitudeSpectrum oMags; //! New magnitudes
int iBlendSamples; //!< Anzahl Samples zum Überblenden
};
......@@ -79,7 +79,7 @@ private:
int m_nBiquadsPerBand; //!< Anzahl von Biqads pro Band
std::vector< CITABiquad > m_vBiquads; //!< Biquads, access: [Band][BiquadNummer]
tbb::strict_ppl::concurrent_queue< CITAThirdOctaveFilterbankIIR::MagnitudeUpdate > m_vMagnitudesQueue; //!< Liste von neuen Verstärkungsfaktoren
CITAThirdOctaveMagnitudeSpectrum m_oMagnitudesInternal; //!< Interne Verstärkungsfaktoren
CITAThirdOctaveGainMagnitudeSpectrum m_oMagnitudesInternal; //!< Interne Verstärkungsfaktoren
ITASampleBuffer m_sfTempFilterBuf; //!< Intermediate buffer for filter
ITASampleBuffer m_pfTempOutputBuf; //!< Intermediate buffer for output assembly
};
......
......@@ -34,7 +34,7 @@ int CITAThirdOctaveFilterbankIIR::GetLatency() const
return 0; // @todo jst: really?
}
void CITAThirdOctaveFilterbankIIR::SetMagnitudes( const CITAThirdOctaveMagnitudeSpectrum& oMagnitudes, const bool bSmoothChangeover )
void CITAThirdOctaveFilterbankIIR::SetMagnitudes( const CITAThirdOctaveGainMagnitudeSpectrum& oMagnitudes, const bool bSmoothChangeover )
{
CITAThirdOctaveFilterbankIIR::MagnitudeUpdate oUpdate;
oUpdate.oMags = oMagnitudes;
......
......@@ -29,7 +29,7 @@ int main( int, char** )
void TestThirdOctaveFilterGeneratorFIRIdentity()
{
CITAThirdOctaveMagnitudeSpectrum oMags;
CITAThirdOctaveGainMagnitudeSpectrum oMags;
oMags.SetIdentity();
ITASampleBuffer oFilter( g_iFilterLength );
......@@ -44,7 +44,7 @@ void TestThirdOctaveFilterGeneratorFIRIdentity()
void TestThirdOctaveFilterGeneratorFIRZero()
{
CITAThirdOctaveMagnitudeSpectrum oMags;
CITAThirdOctaveGainMagnitudeSpectrum oMags;
oMags.SetZero();
ITASampleBuffer oFilter( g_iFilterLength );
......@@ -63,7 +63,7 @@ void TestThirdOctaveFilterGeneratorFIRSingleBands()
CITAThirdOctaveFIRFilterGenerator oFilterGenerator( g_dSampleRate, g_iFilterLength );
CITAThirdOctaveMagnitudeSpectrum oMags;
CITAThirdOctaveGainMagnitudeSpectrum oMags;
for( int i = 0; i < CITAThirdOctaveMagnitudeSpectrum::GetNumBands(); i++ )
{
oMags.SetZero();
......
......@@ -29,7 +29,7 @@ void TestThirdOctaveFilterbankIIR()
ITASampleBuffer x( iSampleLength );
x[ 0 ] = 1.0f;
CITAThirdOctaveMagnitudeSpectrum oMags;
CITAThirdOctaveGainMagnitudeSpectrum oMags;
oMags.SetIdentity();
pIIRFilterbank->SetMagnitudes( oMags, false );
......
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