diff dsp/tempotracking/DownBeat.cpp @ 295:1c9258dd155e

* build fixes for win32-x-g++
author Chris Cannam <c.cannam@qmul.ac.uk>
date Tue, 02 Jun 2009 09:53:01 +0000
parents befe5aa6b450
children 4fada56adbb8
line wrap: on
line diff
--- a/dsp/tempotracking/DownBeat.cpp	Thu May 21 16:39:35 2009 +0000
+++ b/dsp/tempotracking/DownBeat.cpp	Tue Jun 02 09:53:01 2009 +0000
@@ -217,7 +217,7 @@
 
     // We now have all spectral difference measures in specdiff
 
-    uint timesig = m_bpb;
+    unsigned int timesig = m_bpb;
     if (timesig == 0) timesig = 4;
 
     d_vec_t dbcand(timesig); // downbeat candidates
@@ -253,7 +253,7 @@
 {
     // JENSEN-SHANNON DIVERGENCE BETWEEN SPECTRAL FRAMES
 
-    uint SPECSIZE = 512;   // ONLY LOOK AT FIRST 512 SAMPLES OF SPECTRUM. 
+    unsigned int SPECSIZE = 512;   // ONLY LOOK AT FIRST 512 SAMPLES OF SPECTRUM. 
     if (SPECSIZE > oldspec.size()/4) {
         SPECSIZE = oldspec.size()/4;
     }
@@ -263,7 +263,7 @@
     double sumnew = 0.;
     double sumold = 0.;
   
-    for (uint i = 0;i < SPECSIZE;i++)
+    for (unsigned int i = 0;i < SPECSIZE;i++)
     {
         newspec[i] +=EPS;
         oldspec[i] +=EPS;
@@ -272,7 +272,7 @@
         sumold+=oldspec[i];
     } 
     
-    for (uint i = 0;i < SPECSIZE;i++)
+    for (unsigned int i = 0;i < SPECSIZE;i++)
     {
         newspec[i] /= (sumnew);
         oldspec[i] /= (sumold);