Browse Source

fix MSVC warnings

richarddobson 3 weeks ago
parent
commit
b4ca8220f5
6 changed files with 20 additions and 5 deletions
  1. 2 2
      dev/blur/blur.c
  2. 3 3
      dev/distort/distortp.c
  3. 4 0
      dev/distort/distresize.c
  4. 3 0
      dev/distort/distrpt.c
  5. 4 0
      dev/distort/disttel.c
  6. 4 0
      dev/distort/pulse.c

+ 2 - 2
dev/blur/blur.c

@@ -380,7 +380,7 @@ int specshuffle(dataptr dz)
         permcnt++;
     }
     if(dz->flbufptr[1] > dz->flbufptr[2])
-        return write_samps(dz->flbufptr[2],(dz->flbufptr[1] - dz->flbufptr[2]),dz);
+        return (int) write_samps(dz->flbufptr[2],(dz->flbufptr[1] - dz->flbufptr[2]),dz);
     return(FINISHED);
 
 }
@@ -1163,7 +1163,7 @@ int flush_outbuf(dataptr dz)
     int samps_to_write;
     if(dz->flbufptr[1] != dz->flbufptr[2]) {
         samps_to_write = dz->flbufptr[1] - dz->flbufptr[2];
-        if((exit_status = write_samps(dz->flbufptr[2],samps_to_write,dz))<0)
+        if((exit_status = (int) write_samps(dz->flbufptr[2],samps_to_write,dz))<0)
             return(exit_status);
     }
     return(FINISHED);

+ 3 - 3
dev/distort/distortp.c

@@ -39,9 +39,9 @@
 #include <sfsys.h>
 #include <osbind.h>
 
-#ifdef unix
+//#ifdef unix
 #define round(x) lround((x))
-#endif
+//#endif
 
 static int get_distort(int oldlen,int *pos_in_cycle_group,double *last_transpos,double *next_transpos,
                        double *transpos_step,int *thiscyclelen,int *init,dataptr dz);
@@ -127,7 +127,7 @@ int distort_pitch(dataptr dz)
         current_inbuf_pos = 0;
     } while(dz->ssampsread>0);
     if(dz->sbufptr[1]!=dz->sampbuf[1])
-        return write_samps(dz->sampbuf[1],dz->sbufptr[1] - dz->sampbuf[1],dz);
+        return (int) write_samps(dz->sampbuf[1],dz->sbufptr[1] - dz->sampbuf[1],dz);
     return(FINISHED);
 }
 

+ 4 - 0
dev/distort/distresize.c

@@ -41,6 +41,10 @@
 #define FIRST_FILE      (0)
 #define SECOND_FILE     (1)
 
+//#ifdef unix
+#define round(x) lround((x))
+//#endif
+
 static int get_initial_phases_for_resize(float *samplebuf0,int sampcnt0,float *samplebuf1,int sampcnt1,int *initial_phase);
 static int read_samps_cc(int k,int current_buf,int *bsamps_left,int *samps_read,int *in_samps,dataptr dz);
 static int get_cycles_and_resize(int *,int *,int *,int *,int *,int *,int *,int *,dataptr);

+ 3 - 0
dev/distort/distrpt.c

@@ -40,6 +40,9 @@
 #include <sfsys.h>
 #include <osbind.h>
 
+//#ifdef unix
+#define round(x) lround((x))
+//#endif
 
 static int      do_repeat(int current_buf,int incycles_start,int incycles_end,int *obufpos,dataptr dz);
 static int      do_repeat_bufcros(int current_buf,int incycles_start,int incycles_end,int *obufpos,dataptr dz);

+ 4 - 0
dev/distort/disttel.c

@@ -38,6 +38,10 @@
 #include <sfsys.h>
 #include <osbind.h>
 
+//#ifdef unix
+#define round(x) lround((x))
+//#endif
+
 static int      do_cycle_tele(int n,int current_buf,int *obufpos,dataptr dz);
 static int      do_cycle_tele_crosbuf(int n,int cycleno_in_group_at_bufcros,int current_buf,int *obufpos,dataptr dz);
 static int get_longcycle(int,dataptr);

+ 4 - 0
dev/distort/pulse.c

@@ -50,6 +50,10 @@
 #include <math.h>
 #include <ctype.h>
 
+ //#ifdef unix
+#define round(x) lround((x))
+//#endif
+
 /*
 
   PRESCALE PULSE-ENVELOPE FILE BETWEEN 0 and 1 in time and copy into parray[PULSENV]