floor, not FLOOR in examples, only inst_headers for user doc

floor, not FLOOR in examples, only inst_headers for user doc

Patches applied:

 * piem@altern.org--aubio-fraise/aubio--mainline--0.3.2--patch-9
   use floor not FLOOR in aubionotes and utils

diff --git a/doc/user.cfg b/doc/user.cfg
index c1080c4e9db3362ede234e2802331e75199bd812..3dad804b1ada28daef360ee606acb11466dd71b7 100644 (file)
--- a/doc/user.cfg
+++ b/doc/user.cfg
@@ -468,7 +468,7 @@ INPUT                  = ../src
 # *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx 
 # *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py
 
-FILE_PATTERNS          = 
+FILE_PATTERNS          = *.h
 
 # The RECURSIVE tag can be used to turn specify whether or not subdirectories 
 # should be searched for input files as well. Possible values are YES and NO. 
@@ -480,7 +480,7 @@ RECURSIVE              = NO
 # excluded from the INPUT source files. This way you can easily exclude a 
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
 
-EXCLUDE                = 
+EXCLUDE                = ../src/aubio_priv.h
 
 # The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
 # directories that are symbolic links (a Unix filesystem feature) are excluded 

diff --git a/examples/aubionotes.c b/examples/aubionotes.c
index c4e113efc6f5beb4c2d9d5eae46e6f595bc42a4a..98b26e559e83144e6496bbf760ead670ecc232a6 100644 (file)
--- a/examples/aubionotes.c
+++ b/examples/aubionotes.c
@@ -66,7 +66,7 @@ int aubio_process(float **input, float **output, int nframes) {
                               /* kill old note */
                               send_noteon(curnote,0);
                               /* get and send new one */
-                              send_noteon(pitch,127+(int)FLOOR(curlevel));
+                              send_noteon(pitch,127+(int)floor(curlevel));
                               curnote = pitch;
                       }
 
@@ -86,7 +86,7 @@ int aubio_process(float **input, float **output, int nframes) {
                               curnote = newnote;
                               /* get and send new one */
                               if (curnote>45){
-                                      send_noteon(curnote,127+(int)FLOOR(curlevel));
+                                      send_noteon(curnote,127+(int)floor(curlevel));
                               }
                       }
               } // if median

diff --git a/examples/utils.c b/examples/utils.c
index ba7fac39f27cf87c495d82aa433d402a87472875..4f8e88158c4e2876b89929fd0bb14a357f627524 100644 (file)
--- a/examples/utils.c
+++ b/examples/utils.c
@@ -405,7 +405,7 @@ void examples_common_process(aubio_process_func_t process_func, aubio_print_func
 
 void send_noteon(int pitch, int velo)
 {
-    smpl_t mpitch = (FLOOR)(aubio_freqtomidi(pitch)+.5);
+    smpl_t mpitch = floor(aubio_freqtomidi(pitch)+.5);
     /* we should check if we use midi here, not jack */
 #if ALSA_SUPPORT
     if (usejack) {