comparison src/descriptors.c @ 211:ef80f7c52c6d

add VC2012 project to compile static and dynamic lib, also fix some C
issues

     xtract_function_descriptor_t *fd, *d;
     xtract_type_t *argv_type;
 
     f = F = XTRACT_FEATURES;
 
-    fd = malloc(XTRACT_FEATURES * sizeof(xtract_function_descriptor_t));
+    fd = (xtract_function_descriptor_t*)malloc(XTRACT_FEATURES * sizeof(xtract_function_descriptor_t));
 
     /* FIX - this file probably needs a rewrite for readability */
 
     while(f--)
     {

             *argv_def = XTRACT_FUNDAMENTAL_DEFAULT;
             *argv_unit = XTRACT_HERTZ;
             *(argv_min + 1) = 0.0;
             *(argv_max + 1) = 1.0 ;
             *(argv_def + 1) = .1 ;
-            *(argv_unit + 1) = XTRACT_NONE;
+            *(argv_unit + 1) = (xtract_unit_t)XTRACT_NONE;
             break;
         case XTRACT_NOISINESS:
         case XTRACT_SKEWNESS:
         case XTRACT_KURTOSIS:
         case XTRACT_SPECTRAL_SKEWNESS:
         case XTRACT_SPECTRAL_KURTOSIS:
         case XTRACT_CREST:
             *argv_min = XTRACT_NONE;
             *argv_max = XTRACT_NONE;
             *argv_def = XTRACT_NONE;
-            *argv_unit = XTRACT_NONE;
+            *argv_unit = (xtract_unit_t)XTRACT_NONE;
             *(argv_min + 1) = XTRACT_NONE;
             *(argv_max + 1) = XTRACT_NONE;
             *(argv_def + 1) = XTRACT_NONE;
-            *(argv_unit + 1) = XTRACT_NONE;
+            *(argv_unit + 1) = (xtract_unit_t)XTRACT_NONE;
             break;
             /* argc = 4 */
         case XTRACT_SPECTRUM:
             *argv_min  = XTRACT_SR_LOWER_LIMIT / XTRACT_FFT_BANDS_MIN;
             *argv_max = XTRACT_SR_UPPER_LIMIT / XTRACT_FFT_BANDS_MAX;
             *argv_def = XTRACT_SR_DEFAULT / XTRACT_FFT_BANDS_DEF;
             *argv_unit = XTRACT_HERTZ;
             *(argv_min + 1) = 0;
             *(argv_max + 1) = 3 ;
             *(argv_def + 1) = 0;
-            *(argv_unit + 1) = XTRACT_NONE;
+            *(argv_unit + 1) = (xtract_unit_t)XTRACT_NONE;
             *(argv_min + 2) = 0;
             *(argv_max + 2) = 1;
             *(argv_def + 2) = 0;
-            *(argv_unit + 2) = XTRACT_NONE;
+            *(argv_unit + 2) = (xtract_unit_t)XTRACT_NONE;
             *(argv_min + 3) = 0;
             *(argv_max + 3) = 1;
             *(argv_def + 3) = 0;
-            *(argv_unit + 3) = XTRACT_NONE;
+            *(argv_unit + 3) = (xtract_unit_t)XTRACT_NONE;
             break;
         case XTRACT_SUBBANDS:
             *argv_min  = XTRACT_ANY;
             *argv_max = XTRACT_ANY;
             *argv_def = XTRACT_MEAN;
-            *argv_unit = XTRACT_NONE;
+            *argv_unit = (xtract_unit_t)XTRACT_NONE;
             *(argv_min + 1) = 1;
             *(argv_max + 1) = 16384;
             *(argv_def + 1) = 4;
-            *(argv_unit + 1) = XTRACT_NONE;
+            *(argv_unit + 1) = (xtract_unit_t)XTRACT_NONE;
             *(argv_min + 2) = 0;
             *(argv_max + 2) = 32;
             *(argv_def + 2) = 0;
-            *(argv_unit + 2) = XTRACT_NONE;
+            *(argv_unit + 2) = (xtract_unit_t)XTRACT_NONE;
             *(argv_min + 3) = 0;
             *(argv_max + 3) = XTRACT_ANY;
             *(argv_def + 3) = 0;
             *(argv_unit + 3) = XTRACT_BINS;
             break;

             /* WINDOWED is special because argc = window size = N */
         default:
             *argv_min = XTRACT_NONE;
             *argv_max = XTRACT_NONE;
             *argv_def = XTRACT_NONE;
-            *argv_unit = XTRACT_NONE;
+            *argv_unit = (xtract_unit_t)XTRACT_NONE;
             break;
         }
 
         argv_donor = &d->argv.donor[0];
 

         case XTRACT_NONZERO_COUNT:
         case XTRACT_LPC:
         case XTRACT_LPCC:
         case XTRACT_WINDOWED:
         case XTRACT_SUBBANDS:
-            *data_unit = XTRACT_ANY;
+            *data_unit = (xtract_unit_t)XTRACT_ANY;
             break;
         case XTRACT_SPECTRAL_MEAN:
         case XTRACT_SPECTRAL_VARIANCE:
         case XTRACT_SPECTRAL_STANDARD_DEVIATION:
             /* case XTRACT_SPECTRAL_AVERAGE_DEVIATION: */

             case XTRACT_SUM:
             case XTRACT_FLUX:
             case XTRACT_LNORM:
             case XTRACT_NONZERO_COUNT:
             case XTRACT_WINDOWED:
-                *result_unit = XTRACT_ANY;
+                *result_unit = (xtract_unit_t)XTRACT_ANY;
                 *result_min = XTRACT_ANY;
                 *result_max = XTRACT_ANY;
                 break;
             case XTRACT_SPECTRAL_SKEWNESS:
             case XTRACT_SPECTRAL_KURTOSIS:

             case XTRACT_TRISTIMULUS_1:
             case XTRACT_TRISTIMULUS_2:
             case XTRACT_TRISTIMULUS_3:
             case XTRACT_NOISINESS:
             case XTRACT_SMOOTHNESS:
-                *result_unit = XTRACT_NONE;
+                *result_unit = (xtract_unit_t)XTRACT_NONE;
                 *result_min = XTRACT_ANY; /* FIX: need to check these */
                 *result_max = XTRACT_ANY;
                 break;
             case XTRACT_SPECTRAL_MEAN:
             case XTRACT_SPECTRAL_VARIANCE:

                 *result_unit = XTRACT_HERTZ;
                 *result_min = 0.0;
                 *result_max = XTRACT_ANY;
                 break;
             case XTRACT_ODD_EVEN_RATIO:
-                *result_unit = XTRACT_NONE;
+                *result_unit = (xtract_unit_t)XTRACT_NONE;
                 *result_min = 0.0;
                 *result_max = 1.0;
                 break;
             case XTRACT_FLATNESS_DB:
                 *result_unit = XTRACT_DBFS;

             case XTRACT_SHARPNESS:
             case XTRACT_SPECTRAL_SLOPE:
             case XTRACT_LPC:
             case XTRACT_LPCC:
             default:
-                *result_unit = XTRACT_UNKNOWN;
+                *result_unit = (xtract_unit_t)XTRACT_UNKNOWN;
                 *result_min = XTRACT_UNKNOWN;
                 *result_max = XTRACT_UNKNOWN;
                 break;
             }
         }

             case XTRACT_ASDF:
             case XTRACT_DCT:
             case XTRACT_SUBBANDS:
             case XTRACT_WINDOWED:
                 *result_format = XTRACT_ARBITRARY_SERIES;
-                *result_unit = XTRACT_ANY;
+                *result_unit = (xtract_unit_t)XTRACT_ANY;
                 break;
             case XTRACT_BARK_COEFFICIENTS:
                 *result_format = XTRACT_BARK_COEFFS;
-                *result_unit = XTRACT_UNKNOWN; /* FIX: check */
+                *result_unit = (xtract_unit_t)XTRACT_UNKNOWN; /* FIX: check */
                 break;
             case XTRACT_PEAK_SPECTRUM:
             case XTRACT_SPECTRUM:
             case XTRACT_HARMONIC_SPECTRUM:
                 *result_format = XTRACT_SPECTRAL;

                 break;
             case XTRACT_AUTOCORRELATION_FFT:
                 break;
             case XTRACT_MFCC:
                 *result_format = XTRACT_MEL_COEFFS;
-                *result_unit = XTRACT_UNKNOWN; /* FIX: check */
+                *result_unit = (xtract_unit_t)XTRACT_UNKNOWN; /* FIX: check */
                 break;
             case XTRACT_LPC:
                 *result_format = XTRACT_LPC_COEFFS;
-                *result_unit = XTRACT_UNKNOWN;
+                *result_unit = (xtract_unit_t)XTRACT_UNKNOWN;
                 break;
             case XTRACT_LPCC:
                 *result_format = XTRACT_LPCC_COEFFS;
-                *result_unit = XTRACT_UNKNOWN;
+                *result_unit = (xtract_unit_t)XTRACT_UNKNOWN;
                 break;
             default:
                 break;
             }
         }