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

Documentation fixes

parent 426c11e9
......@@ -29,7 +29,7 @@ class ITASampleBuffer;
class IITASampleInterpolationRoutine;
//! Daten-Logger der VDL aktivieren
#define VA_VDL_DATA_LOG 0
#define ITA_DSP_VDL_DATA_LOG 0
//! Klasse für variable Verzögerungsglieder (variable delay-lines, VDLs)
/**
......@@ -64,9 +64,6 @@ class IITASampleInterpolationRoutine;
* - lineare Interpolation: 1 Sample Latenz, d.h. VDL Verzögerung 0 = t < 1 Sample => 1 - t = 1 Sample Latenz
* - sinc-Interpolation: z.B. 12 Sample Latenz, d.h. VDL Verzögerung t < 12 Sample => 12 - t Samples Latenz
*
* \see CVAFreefieldAudiostreamProcessor
* \see CVAFreefieldFilterGenerator
*
* TODO: Doku, Synchronität
* - Wächst automatisch mit Setzen der Verzögerung
*/
......@@ -136,7 +133,7 @@ public:
* Maximale mögliche Verzögerung auf dem momentan
* reservierten Pufferspeicher in Sekunden zurückgeben
*
* Siehe auch: CVAVariableDelayLine::ReserveMaximumDelaySamples(), CVAVariableDelayLine::SetDelaySamples()
* Siehe auch: CITAVariableDelayLine::ReserveMaximumDelaySamples(), CITAVariableDelayLine::SetDelaySamples()
*/
float GetReservedMaximumDelayTime() const;
......@@ -253,7 +250,7 @@ private:
IITASampleInterpolationRoutine* m_pInterpolationRoutine; //!< Zeiger auf Interpolationsroutine
#if (VA_VDL_DATA_LOG == 1)
#if (ITA_DSP_VDL_DATA_LOG == 1)
//! Implementierungsklasse für Logger-Datum
class VDLLogData : ITALogDataBase
......
......@@ -54,7 +54,7 @@ CITAVariableDelayLine::CITAVariableDelayLine( double dSamplerate,
if( m_iSwitchingAlgorithm == WINDOWED_SINC_INTERPOLATION )
m_pInterpolationRoutine = new CITASampleWindowedSincInterpolation();
#if (VA_VDL_DATA_LOG == 1)
#if (ITA_DSP_VDL_DATA_LOG == 1)
m_oDataLog.setOutputFile("VDL.log");
#endif
......@@ -240,7 +240,7 @@ void CITAVariableDelayLine::SetDelaySamples( float fDelaySamples )
// Process()-Routine berlassen
m_fNewDelay = fDelaySamples;
//VA_DEBUG_PRINTF(" * [VDL] Delay set to %.3f samples\n", fDelaySamples);
//DEBUG_PRINTF(" * [VDL] Delay set to %.3f samples\n", fDelaySamples);
// Falls das Streaming noch nicht gestartet ist sofort die
// neue Verzgerung bernehmen, sonst wird im ersten Block
......@@ -274,7 +274,7 @@ void CITAVariableDelayLine::Process( const ITASampleBuffer* psbInput, ITASampleB
float fCurrentDelay = m_fCurrentDelay;
float fNewDelay = m_fNewDelay;
#if (VA_VDL_DATA_LOG == 1)
#if (ITA_DSP_VDL_DATA_LOG == 1)
VDLLogData oLogDataItem;
oLogDataItem.fCurrentDelay = fCurrentDelay;
oLogDataItem.fNewDelay = m_fNewDelay;
......@@ -292,7 +292,7 @@ void CITAVariableDelayLine::Process( const ITASampleBuffer* psbInput, ITASampleB
// Schreibzeiger um Blocklnge vergrern (BlockPointerIncrement)
m_iWriteCursor = ( m_iWriteCursor + m_iBlockLength ) % m_iVDLBufferSize;
#if (VA_VDL_DATA_LOG == 1)
#if (ITA_DSP_VDL_DATA_LOG == 1)
oLogDataItem.fProcessingTime = (float) (m_swProcess.stop()*1.0e6);
m_oDataLog.log(oLogDataItem);
#endif
......@@ -342,7 +342,7 @@ void CITAVariableDelayLine::Process( const ITASampleBuffer* psbInput, ITASampleB
// Resamplingfaktor auf dem Eingangsstream bezogen auf eine Blocklnge berechnen
float fResamplingFactor = 1 - iDeltaDelay / ( float ) m_iBlockLength;
#if (VA_VDL_DATA_LOG == 1)
#if (ITA_DSP_VDL_DATA_LOG == 1)
oLogDataItem.fResamplingFactor = fResamplingFactor;
#endif
......@@ -416,7 +416,7 @@ void CITAVariableDelayLine::Process( const ITASampleBuffer* psbInput, ITASampleB
else
iSize = iCurrentIntDelay - iNewIntDelay + m_iBlockLength;
#if (VA_VDL_DATA_LOG == 1)
#if (ITA_DSP_VDL_DATA_LOG == 1)
oLogDataItem.iTargetBlockSize = iSize;
#endif
......@@ -461,7 +461,7 @@ void CITAVariableDelayLine::Process( const ITASampleBuffer* psbInput, ITASampleB
m_iNumberOfDropouts++;
}
#if (VA_VDL_DATA_LOG == 1)
#if (ITA_DSP_VDL_DATA_LOG == 1)
oLogDataItem.fProcessingTime = (float) (t*1e6);
m_oDataLog.log(oLogDataItem);
#endif
......@@ -469,7 +469,7 @@ void CITAVariableDelayLine::Process( const ITASampleBuffer* psbInput, ITASampleB
return;
}
#if (VA_VDL_DATA_LOG == 1)
#if (ITA_DSP_VDL_DATA_LOG == 1)
std::ostream& CITAVariableDelayLine::VDLLogData::outputDesc(std::ostream& os)
{
os << "Current delay" << "\t"
......
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