Changeset acf7d30

Timestamp:

Oct 2, 2009, 2:10:25 AM (15 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

1498ced

Parents:

c0b295c

Message:

src/mathutils.c and co: use 0.0, not 0.0f

Location:

src

Files:

• aubio_priv.h (modified) (1 diff)
• mathutils.c (modified) (5 diffs)
• onset/onsetdetection.c (modified) (6 diffs)
• utils/hist.c (modified) (1 diff)
• utils/scale.c (modified) (1 diff)

src/aubio_priv.h

@@ -183 +183 @@
 
 /* handy shortcuts */
-#define DB2LIN(g) (POW(10.0f,(g)*0.05f))
-#define LIN2DB(v) (20.0f*LOG10(v))
+#define DB2LIN(g) (POW(10.0,(g)*0.05f))
+#define LIN2DB(v) (20.0*LOG10(v))
 #define SQR(_a)   (_a*_a)
 

src/mathutils.c

@@ -86 +86 @@
 smpl_t fvec_mean(fvec_t *s) {
   uint_t i,j;
-  smpl_t tmp = 0.0f;
+  smpl_t tmp = 0.0;
   for (i=0; i < s->channels; i++)
     for (j=0; j < s->length; j++)
@@ -95 +95 @@
 smpl_t fvec_sum(fvec_t *s) {
   uint_t i,j;
-  smpl_t tmp = 0.0f;
+  smpl_t tmp = 0.0;
   for (i=0; i < s->channels; i++)
     for (j=0; j < s->length; j++)
@@ -104 +104 @@
 smpl_t fvec_max(fvec_t *s) {
   uint_t i,j;
-  smpl_t tmp = 0.0f;
+  smpl_t tmp = 0.0;
   for (i=0; i < s->channels; i++)
     for (j=0; j < s->length; j++)
@@ -133 +133 @@
 uint_t fvec_max_elem(fvec_t *s) {
   uint_t i,j=0, pos=0.;
-  smpl_t tmp = 0.0f;
+  smpl_t tmp = 0.0;
   for (i=0; i < s->channels; i++)
     for (j=0; j < s->length; j++) {
@@ -144 +144 @@
 void fvec_shift(fvec_t *s) {
   uint_t i,j;
-  //smpl_t tmp = 0.0f;
+  //smpl_t tmp = 0.0;
   for (i=0; i < s->channels; i++)
     for (j=0; j < s->length / 2 ; j++) {

src/onset/onsetdetection.c

@@ -98 +98 @@
   uint_t nbins = fftgrain->length;
   for (i=0;i<fftgrain->channels; i++)  {
-    onset->data[i][0] = 0.0f;
+    onset->data[i][0] = 0.0;
     o->dev1->data[i][0]=0.;
     for ( j=0;j<nbins; j++ )  {
@@ -109 +109 @@
         o->dev1->data[i][j] = ABS(o->dev1->data[i][j]);
       else 
-        o->dev1->data[i][j] = 0.0f;
+        o->dev1->data[i][j] = 0.0;
       /* keep a track of the past frames */
       o->theta2->data[i][j] = o->theta1->data[i][j];
@@ -130 +130 @@
   uint_t nbins = fftgrain->length;
   for (i=0;i<fftgrain->channels; i++)  {
-    onset->data[i][0] = 0.0f;
+    onset->data[i][0] = 0.0;
     for (j=0;j<nbins; j++)  {
       o->dev1->data[i][j] = SQRT(
@@ -138 +138 @@
         o->dev1->data[i][j] = ABS(o->dev1->data[i][j]);
       else 
-        o->dev1->data[i][j] = 0.0f;
+        o->dev1->data[i][j] = 0.0;
       o->oldmag->data[i][j] = fftgrain->norm[i][j];
     }
@@ -230 +230 @@
       o->theta1 = new_fvec(rsize,channels);
       o->theta2 = new_fvec(rsize,channels);
-      o->histog = new_aubio_hist(0.0f, PI, 10, channels);
+      o->histog = new_aubio_hist(0.0, PI, 10, channels);
       o->threshold = 0.1;
       break;
@@ -236 +236 @@
       o->oldmag = new_fvec(rsize,channels);
       o->dev1   = new_fvec(rsize,channels);
-      o->histog = new_aubio_hist(0.0f, PI, 10, channels);
+      o->histog = new_aubio_hist(0.0, PI, 10, channels);
       o->threshold = 0.1;
       break;

src/utils/hist.c

@@ -149 +149 @@
 smpl_t aubio_hist_mean (aubio_hist_t *s) {
   uint_t i,j;
-  smpl_t tmp = 0.0f;
+  smpl_t tmp = 0.0;
   for (i=0; i < s->channels; i++)
     for (j=0; j < s->nelems; j++)

src/utils/scale.c

@@ -57 +57 @@
   s->ohig = ohig;
   if (inputrange == 0) {
-    s->scaler = 0.0f;
+    s->scaler = 0.0;
   } else {
     s->scaler = outputrange/inputrange;