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

Updating core libs changes

parent 3f328592
......@@ -60,7 +60,7 @@
#include <ITAException.h>
#include <ITAFileSystemUtils.h>
#include <ITAFunctors.h>
#include <ITAPeakDetector.h>
#include <ITAStreamDetector.h>
#include <ITASoundSample.h>
#include <ITASoundSampler.h>
#include <ITASoundSamplePool.h>
......@@ -481,7 +481,7 @@ void CVACoreImpl::Initialize() {
if( pInputTail )
{
m_pInputAmp = new ITAStreamAmplifier( pInputTail, ( float ) m_dInputGain );
m_pInputPeakDetector = new ITAPeakDetector( m_pInputAmp );
m_pInputPeakDetector = new ITAStreamDetector( m_pInputAmp );
pInputTail = m_pInputPeakDetector;
if( m_oCoreConfig.bRecordDeviceInputEnabled )
......@@ -554,7 +554,7 @@ void CVACoreImpl::Initialize() {
*/
// Create output peak detector that uses patch bay output stream
m_pOutputPeakDetector = new ITAPeakDetector( m_pOutputPatchbay->GetOutputDatasource( iPhysicalHardwareOutput ) );
m_pOutputPeakDetector = new ITAStreamDetector( m_pOutputPatchbay->GetOutputDatasource( iPhysicalHardwareOutput ) );
// Setup output dump (if set)
ITADatasource* pOutputTail = m_pOutputPeakDetector;
......@@ -4138,7 +4138,7 @@ void CVACoreImpl::InitializeAudioRenderers()
if( oParams.bOutputLevelMeterEnabled )
{
oRendererDesc.pOutputDetector = new ITAPeakDetector( pRendererOutputTail );
oRendererDesc.pOutputDetector = new ITAStreamDetector( pRendererOutputTail );
pRendererOutputTail = oRendererDesc.pOutputDetector;
}
......@@ -4275,7 +4275,7 @@ void CVACoreImpl::InitializeReproductionModules()
ITADatasource* pInputTail = m_pR2RPatchbay->GetOutputDatasource( oDesc.iR2RPatchBayOutput );
if( oParams.bInputDetectorEnabled )
{
oDesc.pInputDetector = new ITAPeakDetector( pInputTail );
oDesc.pInputDetector = new ITAStreamDetector( pInputTail );
pInputTail = oDesc.pInputDetector;
}
if( oParams.bRecordInputEnabled )
......@@ -4291,7 +4291,7 @@ void CVACoreImpl::InitializeReproductionModules()
ITADatasource* pOutputTail = oDesc.pInstance->GetOutputDatasource();
if( oParams.bOutputDetectorEnabled )
{
oDesc.pOutputDetector = new ITAPeakDetector( pOutputTail );
oDesc.pOutputDetector = new ITAStreamDetector( pOutputTail );
pOutputTail = oDesc.pOutputDetector;
}
if( oParams.bRecordOutputEnabled )
......
......@@ -17,7 +17,7 @@
#include <ITAAtomicPrimitives.h>
#include <ITACriticalSection.h>
#include <ITAStreamProbe.h>
#include <ITAPeakDetector.h>
#include <ITAStreamDetector.h>
#include <VACore.h>
#include "VACoreConfig.h"
......@@ -337,8 +337,8 @@ private:
ITAStreamAmplifier* m_pInputAmp;
ITAStreamPatchbay* m_pR2RPatchbay; //!< Patchbay linking audio renderers to audio reproduction modules
ITAStreamPatchbay* m_pOutputPatchbay; //!< Patchbay linking audio reproduction modules to hardware outputs
ITAPeakDetector* m_pInputPeakDetector;
ITAPeakDetector* m_pOutputPeakDetector;
ITAStreamDetector* m_pInputPeakDetector;
ITAStreamDetector* m_pOutputPeakDetector;
CVAAudiostreamTracker* m_pOutputTracker;
// --= Signal sources and sounds =----------------------------------
......@@ -361,7 +361,7 @@ private:
int iR2RPatchBayInput; //!< Input on the renderer-reproduction patch bay
std::vector< std::string > vsOutputs; //!< Target reproduction modules
ITAStreamProbe* pOutputRecorder; //!< If a non-nullptr recorder is set, it will be deleted on destruction
ITAPeakDetector* pOutputDetector; //!< If a non-nullptr detector is set, it will be deleted on destruction
ITAStreamDetector* pOutputDetector; //!< If a non-nullptr detector is set, it will be deleted on destruction
inline CVAAudioRendererDesc( IVAAudioRenderer* pInstance )
: pInstance( pInstance )
......@@ -386,8 +386,8 @@ private:
int iR2RPatchBayOutput; //! Output channel on the renderer-reproduction patch bay
int iOutputPatchBayInput; //! Input channel on the output patchbay
std::vector< const CVAHardwareOutput* > vpOutputs;
ITAPeakDetector* pInputDetector; //!< If a non-nullptr detector is set, it will be deleted on destruction
ITAPeakDetector* pOutputDetector; //!< If a non-nullptr detector is set, it will be deleted on destruction
ITAStreamDetector* pInputDetector; //!< If a non-nullptr detector is set, it will be deleted on destruction
ITAStreamDetector* pOutputDetector; //!< If a non-nullptr detector is set, it will be deleted on destruction
ITAStreamProbe* pInputRecorder; //!< If a non-nullptr recorder is set, it will be deleted on destruction
ITAStreamProbe* pOutputRecorder; //!< If a non-nullptr recorder is set, it will be deleted on destruction
......
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