[sndobj] Whitespace cleanup.

2 files changed, 48 insertions, 50 deletions

diff --git a/src/sndobj/IFGram.cpp b/src/sndobj/IFGram.cpp
index 6bced21..28b0921 100644
--- a/src/sndobj/IFGram.cpp
+++ b/src/sndobj/IFGram.cpp
@@ -1,4 +1,4 @@
- 
+
 ////////////////////////////////////////////////////////////////////////
 // This file is part of the SndObj library
 //
@@ -14,7 +14,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 //
 // Copyright (c)Victor Lazzarini, 1997-2004
 // See License.txt for a disclaimer of all warranties
@@ -32,13 +32,13 @@ IFGram::IFGram(){
   m_diffwin = new double[m_fftsize];
   m_fftdiff = new double[m_fftsize];
   m_diffsig = new double[m_fftsize];
-  m_factor = m_sr/TWOPI; 
+  m_factor = m_sr/TWOPI;
   m_pdiff = new double[m_halfsize];
 }
 
 
 IFGram::IFGram(Table* window, SndObj* input, double scale,
-	       int fftsize, int hopsize, double sr)
+               int fftsize, int hopsize, double sr)
   :PVA(window, input, scale, fftsize, hopsize, sr)
 {
   m_diffwin = new double[m_fftsize];
@@ -61,22 +61,20 @@ IFGram::~IFGram(){
 
 int
 IFGram::Set(const char* mess, double value){
-
   switch(FindMsg(mess)){
 
   case 22:
     SetFFTSize((int) value);
     return 1;
-	
+
   default:
-    return	PVA::Set(mess, value);
+    return  PVA::Set(mess, value);
 
   }
 }
 
 int
 IFGram::Connect(const char* mess, void* input){
-
   int i;
 
   switch(FindMsg(mess)){
@@ -86,16 +84,15 @@ IFGram::Connect(const char* mess, void* input){
     for(i=0; i<m_fftsize; i++)
       m_diffwin[i] = m_table->Lookup(i) - m_table->Lookup(i+1);
     return 1;
-	
+
   default:
-    return	PVA::Connect(mess,input);
+    return  PVA::Connect(mess,input);
 
   }
 }
 
 void
 IFGram::SetFFTSize(int fftsize){
-
   FFT::SetFFTSize(fftsize);
 
   delete[] m_diffwin;
@@ -109,13 +106,11 @@ IFGram::SetFFTSize(int fftsize){
 
   for(int i=0; i<m_fftsize; i++)
     m_diffwin[i] = m_table->Lookup(i) - m_table->Lookup(i+1);
-
 }
 
 void
 IFGram::IFAnalysis(double* signal){
-
-  double powerspec, da,db, a, b, ph,d; 
+  double powerspec, da,db, a, b, ph,d;
   int i2, i;
 
   for(i=0; i<m_fftsize; i++){
@@ -151,16 +146,16 @@ IFGram::IFAnalysis(double* signal){
     da = m_fftdiff[i2]*2/m_norm;
     db = m_fftdiff[m_fftsize-(i2)]*2/m_norm;
     powerspec = a*a+b*b;
-	
+
     if((m_output[i] = (double)sqrt(powerspec)) != 0.f){
       m_output[i+1] = ((a*db - b*da)/powerspec)*m_factor + i2*m_fund;
-      ph = (double) atan2(b, a);	
+      ph = (double) atan2(b, a);
       d = ph - m_phases[i2];
       while(d > PI) d -= TWOPI;
       while(d < -PI) d += TWOPI;
       m_phases[i2] += d;
     }
-    else {
+    else{
       m_output[i+1] = i2*m_fund;
       m_phases[i2] = 0.f ;
     }
@@ -170,43 +165,46 @@ IFGram::IFAnalysis(double* signal){
 
 short
 IFGram::DoProcess(){
-
   if(!m_error){
     if(m_input){
       if(m_enable){
-	int i; double sig = 0.f;
-	for(m_vecpos = 0; m_vecpos < m_hopsize; m_vecpos++) {
-	  // signal input
-	  sig = m_input->Output(m_vecpos);		
-	  // distribute to the signal input frames
-	  // according to a time pointer (kept by counter[n])
-	  for(i=0;i < m_frames; i++){
-	    m_sigframe[i][m_counter[i]]= (double) sig; 
-	    m_counter[i]++;		   
-	  } 
-	}
-	// every vecsize samples
-	// set the current fftframe to be transformed
-	m_cur--; if(m_cur<0) m_cur = m_frames-1;  
- 
-	// instant frequency analysis
-	IFAnalysis(m_sigframe[m_cur]);
-	// zero the current fftframe time pointer
-
-	m_counter[m_cur] = 0;
-	return 1;
-
-      } else { // if disabled, reset the fftframes
-	for(m_vecpos =0; m_vecpos < m_hopsize; m_vecpos++)
-	  m_output[m_vecpos] = 0.f;
-	return 1;
+        double sig = 0.f;
+
+        for(m_vecpos = 0; m_vecpos < m_hopsize; m_vecpos++){
+          // signal input
+          sig = m_input->Output(m_vecpos);
+
+          // distribute to the signal input frames
+          // according to a time pointer (kept by counter[n])
+          for(int i = 0; i < m_frames; i++){
+            m_sigframe[i][m_counter[i]] = (double) sig;
+            m_counter[i]++;
+          }
+        }
+
+        // every vecsize samples
+        // set the current fftframe to be transformed
+        m_cur--;
+        if(m_cur < 0) m_cur = m_frames - 1;
+
+        // instant frequency analysis
+        IFAnalysis(m_sigframe[m_cur]);
+
+        // zero the current fftframe time pointer
+        m_counter[m_cur] = 0;
+        return 1;
       }
-
-    } else {
+      else{ // if disabled, reset the fftframes
+        for(m_vecpos = 0; m_vecpos < m_hopsize; m_vecpos++)
+          m_output[m_vecpos] = 0.f;
+        return 1;
+      }
+    }
+    else{
       m_error = 3;
       return 0;
     }
   }
-  else 
+  else
     return 0;
 }
diff --git a/src/sndobj/SinAnal.h b/src/sndobj/SinAnal.h
index 51b0152..7902d3d 100644
--- a/src/sndobj/SinAnal.h
+++ b/src/sndobj/SinAnal.h
@@ -73,13 +73,13 @@ class SinAnal : public SndObj {
 
   SinAnal();
   SinAnal(SndObj* input, double threshold, int maxtracks, int minpoints=1,
-	  int maxgap=3, double sr=DEF_SR);
+	      int maxgap=3, double sr=DEF_SR);
   SinAnal(SndObj* input, int numbins, double threshold, int maxtracks, int minpoints=1,
-  	  int maxgap=3, double sr=DEF_SR);
+  	      int maxgap=3, double sr=DEF_SR);
   ~SinAnal();
 
   virtual int GetTrackID(int track){ return m_trndx[track]; }
-  virtual int GetTracks(){ return m_tracks;}
+  virtual int GetTracks(){ return m_tracks; }
 
   int Set(const char* mess, double value);
   int Connect(const char* mess, void* input);