richarddobson 1 сар өмнө
parent
commit
b80efcfcce

+ 2 - 2
dev/standalone/fofex.c

@@ -49,9 +49,9 @@
 #include <string.h>
 #include <srates.h>
 
-#if defined unix || defined __GNUC__
+//#if defined unix || defined __GNUC__
 #define round(x) lround((x))
-#endif
+//#endif
 #ifndef HUGE
 #define HUGE 3.40282347e+38F
 #endif

+ 5 - 5
dev/standalone/freeze.c

@@ -46,9 +46,9 @@
 #include <extdcon.h>
 #include <flags.h>
 
-#if defined unix || defined __GNUC__
+//#if defined unix || defined __GNUC__
 #define round(x) lround((x))
-#endif
+//#endif
 #ifndef HUGE
 #define HUGE 3.40282347e+38F
 #endif
@@ -1873,7 +1873,7 @@ int create_friterbufs(double maxpscat,dataptr dz)
 {
     size_t bigbufsize, seccnt;
     double k;
-    int extra_space, infile_space = dz->insams[0], big_buffer_size;
+    /* int */ size_t extra_space, infile_space = dz->insams[0], big_buffer_size;
     int overflowsize /*, seccnt*/;
 
     size_t framesize = F_SECSIZE * sizeof(float) * dz->infile->channels;
@@ -2031,10 +2031,10 @@ void setup_iter_process_type(int is_unity_gain,dataptr dz)
         dz->iparam[ITER_PROCESS] += FIXED_AMP;
     return;
 }
-
-
+#if 0
 #ifndef round
 int round(double a) {
     return (int)floor(a + 0.5);
 }
 #endif
+#endif

+ 2 - 2
dev/standalone/peakfind.c

@@ -44,9 +44,9 @@
 #include <string.h>
 #include <srates.h>
 
-#if defined unix || defined __GNUC__
+//#if defined unix || defined __GNUC__
 #define round(x) lround((x))
-#endif
+//#endif
 #ifndef HUGE
 #define HUGE 3.40282347e+38F
 #endif

+ 2 - 2
dev/standalone/ptobrk.c

@@ -44,9 +44,9 @@
 #include <string.h>
 #include <srates.h>
 
-#if defined unix || defined __GNUC__
+//#if defined unix || defined __GNUC__
 #define round(x) lround((x))
-#endif
+//#endif
 #ifndef HUGE
 #define HUGE 3.40282347e+38F
 #endif

+ 2 - 2
dev/standalone/texmchan.c

@@ -655,8 +655,8 @@ int setup_texmchan_param_ranges_and_defaults(dataptr dz)
     ap->default_val[TEXTURE_MINAMP]         = 64.0;
     ap->default_val[TEXTURE_MAXDUR]         = min(ap->hi[TEXTURE_MAXDUR],TEXTURE_MAX_DUR);
     ap->default_val[TEXTURE_MINDUR]         = max(ap->lo[TEXTURE_MINDUR],TEXTURE_MIN_DUR);
-    ap->default_val[TEXTURE_MAXPICH]        = DEFAULT_PITCH;
-    ap->default_val[TEXTURE_MINPICH]        = DEFAULT_PITCH;
+    ap->default_val[TEXTURE_MAXPICH]        = DEFAULT_MIDI_PITCH;
+    ap->default_val[TEXTURE_MINPICH]        = DEFAULT_MIDI_PITCH;
     ap->default_val[TEXTURE_OUTCHANS]       = 4;
     /* KEEP I WHILE TESTING CODE --> */
     ap->default_val[TEX_GPSPACE]            = 0.0;

+ 2 - 2
dev/standalone/wrappage.c

@@ -69,9 +69,9 @@
 #include <sfsys.h>
 #include <osbind.h>
 
-#if defined unix || defined __GNUC__
+//#if defined unix || defined __GNUC__
 #define round(x) lround((x))
-#endif
+//#endif
 #ifndef HUGE
 #define HUGE 3.40282347e+38F
 #endif