From 3d6b117873bb931dafd851461edf6863094453c3 Mon Sep 17 00:00:00 2001 From: Jonas Stienen Date: Fri, 9 Dec 2016 11:07:30 +0100 Subject: [PATCH] Fixing problem in sample frame assignment --- src/ITASampleBuffer.cpp | 15 ++++++++++++--- src/ITASampleFrame.cpp | 15 ++++++++------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/src/ITASampleBuffer.cpp b/src/ITASampleBuffer.cpp index e152de5..6898887 100644 --- a/src/ITASampleBuffer.cpp +++ b/src/ITASampleBuffer.cpp @@ -12,16 +12,25 @@ ITASampleBuffer::ITASampleBuffer() - : m_pParent( NULL ), m_iLength( 0 ), m_pfData( NULL ) {} + : m_pParent( NULL ) + , m_iLength( 0 ) + , m_pfData( NULL ) +{ + +} ITASampleBuffer::ITASampleBuffer( int iLength, bool bZeroinit ) - : m_pParent( NULL ), m_iLength( 0 ), m_pfData( NULL ) + : m_pParent( NULL ) + , m_iLength( 0 ) + , m_pfData( NULL ) { Init( iLength, bZeroinit ); } ITASampleBuffer::ITASampleBuffer( const ITASampleBuffer* pSource ) - : m_pParent( NULL ), m_iLength( 0 ), m_pfData( NULL ) + : m_pParent( NULL ) + , m_iLength( 0 ) + , m_pfData( NULL ) { *this = *pSource; } diff --git a/src/ITASampleFrame.cpp b/src/ITASampleFrame.cpp index 13cdf93..78532d3 100644 --- a/src/ITASampleFrame.cpp +++ b/src/ITASampleFrame.cpp @@ -403,15 +403,16 @@ const ITASampleBuffer& ITASampleFrame::operator[](int iChannel) const { return m_vChannels[iChannel]; } -ITASampleFrame& ITASampleFrame::operator=(const ITASampleFrame& rhs) { - // Selbstzuweisung abfangen - if (&rhs == this) return *this; +ITASampleFrame& ITASampleFrame::operator=( const ITASampleFrame& rhs ) +{ + // No self assignment + if( &rhs == this ) + return *this; - // Neu allozieren - init( rhs.channels(), rhs.length(), false); + init( rhs.channels(), rhs.length(), false ); - // Kanaldaten kopieren - for (int i=0; iGetLength() ); return *this; } -- GitLab