diff dsp/signalconditioning/Framer.cpp @ 483:fdaa63607c15

Untabify, indent, tidy

--- a/dsp/signalconditioning/Framer.cpp	Fri May 31 11:02:28 2019 +0100
+++ b/dsp/signalconditioning/Framer.cpp	Fri May 31 11:54:32 2019 +0100
@@ -28,11 +28,13 @@
 
 Framer::~Framer()
 {
-    if( m_dataFrame != NULL )
-	delete [] m_dataFrame;
+    if( m_dataFrame != NULL ) {
+        delete [] m_dataFrame;
+    }
 
-    if( m_strideFrame != NULL )
-	delete [] m_strideFrame;
+    if( m_strideFrame != NULL ) {
+        delete [] m_strideFrame;
+    }
 }
 
 void Framer::configure( unsigned int frameLength, unsigned int hop )
@@ -42,17 +44,15 @@
 
     resetCounters();
 
-    if( m_dataFrame != NULL )
-    {
-	delete [] m_dataFrame;	
-	m_dataFrame = NULL;
+    if( m_dataFrame != NULL ) {
+        delete [] m_dataFrame;  
+        m_dataFrame = NULL;
     }
     m_dataFrame = new double[ m_frameLength ];
 
-    if( m_strideFrame != NULL )
-    {
-	delete [] m_strideFrame;	
-	m_strideFrame = NULL;
+    if( m_strideFrame != NULL ) {
+        delete [] m_strideFrame;        
+        m_strideFrame = NULL;
     }
     m_strideFrame = new double[ m_stepSize ];
 }
@@ -60,30 +60,27 @@
 void Framer::getFrame(double *dst)
 {
 
-    if( (m_ulSrcIndex + ( m_frameLength) ) < m_ulSampleLen )
-    {
-	for( unsigned int u = 0; u < m_frameLength; u++)
-	{
-	    dst[ u ] = m_srcBuffer[ m_ulSrcIndex++ ]; 
-	}	
-	m_ulSrcIndex -= ( m_frameLength - m_stepSize );
-    }
-    else
-    {
-	unsigned int rem = (m_ulSampleLen - m_ulSrcIndex );
-	unsigned int zero = m_frameLength - rem;
+    if( (m_ulSrcIndex + ( m_frameLength) ) < m_ulSampleLen ) {
 
-	for( unsigned int u = 0; u < rem; u++ )
-	{
-	    dst[ u ] = m_srcBuffer[ m_ulSrcIndex++ ];
-	}
-		
-	for( unsigned int u = 0; u < zero; u++ )
-	{
-	    dst[ rem + u ] = 0;
-	}
+        for( unsigned int u = 0; u < m_frameLength; u++) {
+            dst[ u ] = m_srcBuffer[ m_ulSrcIndex++ ]; 
+        }       
+        m_ulSrcIndex -= ( m_frameLength - m_stepSize );
 
-	m_ulSrcIndex -= (( rem - m_stepSize ) );
+    } else {
+
+        unsigned int rem = (m_ulSampleLen - m_ulSrcIndex );
+        unsigned int zero = m_frameLength - rem;
+
+        for( unsigned int u = 0; u < rem; u++ ) {
+            dst[ u ] = m_srcBuffer[ m_ulSrcIndex++ ];
+        }
+                
+        for( unsigned int u = 0; u < zero; u++ ) {
+            dst[ rem + u ] = 0;
+        }
+
+        m_ulSrcIndex -= (( rem - m_stepSize ) );
     }
 
     m_framesRead++;