Просмотр исходного кода

add/update copyright, remove warnings

richarddobson 2 лет назад
Родитель
Сommit
3cc79a8fa9

+ 11 - 11
dev/science/synspline.c

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright (c) 1983-2013 Trevor Wishart and Composers Desktop Project Ltd
+ * Copyright (c) 1983-2023 Trevor Wishart and Composers Desktop Project Ltd
  * http://www.trevorwishart.co.uk
  * http://www.trevorwishart.co.uk
  * http://www.composersdesktop.com
  * http://www.composersdesktop.com
  *
  *
@@ -118,7 +118,7 @@ int main(int argc,char *argv[])
     dataptr dz = NULL;
     dataptr dz = NULL;
     char **cmdline;
     char **cmdline;
     int  cmdlinecnt;
     int  cmdlinecnt;
-    aplptr ap;
+//    aplptr ap;
     int is_launched = FALSE;
     int is_launched = FALSE;
     if(argc==2 && (strcmp(argv[1],"--version") == 0)) {
     if(argc==2 && (strcmp(argv[1],"--version") == 0)) {
         fprintf(stdout,"%s\n",cdp_version);
         fprintf(stdout,"%s\n",cdp_version);
@@ -180,7 +180,7 @@ int main(int argc,char *argv[])
             return(exit_status);         
             return(exit_status);         
         }
         }
     }
     }
-    ap = dz->application;
+//    ap = dz->application;
     dz->infile->channels = 1;
     dz->infile->channels = 1;
     // parse_infile_and_hone_type() = 
     // parse_infile_and_hone_type() = 
     // setup_param_ranges_and_defaults() =
     // setup_param_ranges_and_defaults() =
@@ -622,7 +622,7 @@ int parse_sloom_data(int argc,char *argv[],char ***cmdline,int *cmdlinecnt,datap
     int filesize, insams, inbrksize;
     int filesize, insams, inbrksize;
     double dummy;
     double dummy;
     int true_cnt = 0;
     int true_cnt = 0;
-    aplptr ap;
+//    aplptr ap;
 
 
     while(cnt<=PRE_CMDLINE_DATACNT) {
     while(cnt<=PRE_CMDLINE_DATACNT) {
         if(cnt > argc) {
         if(cnt > argc) {
@@ -647,7 +647,7 @@ int parse_sloom_data(int argc,char *argv[],char ***cmdline,int *cmdlinecnt,datap
             //setup_particular_application() =
             //setup_particular_application() =
             if((exit_status = setup_synspline_application(dz))<0)
             if((exit_status = setup_synspline_application(dz))<0)
                 return(exit_status);
                 return(exit_status);
-            ap = dz->application;
+//            ap = dz->application;
             break;
             break;
 
 
         case(3):    
         case(3):    
@@ -1114,7 +1114,7 @@ int synspline(dataptr dz)
     double thistime = 0.0, ampinterp1, ampinterp2, val1, val2, val, frac, diff, dpos1, dpos2, dincr1, dincr2, rrange, srate = dz->iparam[SPLIN_SRATE];
     double thistime = 0.0, ampinterp1, ampinterp2, val1, val2, val, frac, diff, dpos1, dpos2, dincr1, dincr2, rrange, srate = dz->iparam[SPLIN_SRATE];
     float *splinebuf1 = dz->sampbuf[0], *splinebuf2 = dz->sampbuf[1], *obuf = dz->sampbuf[2], *ovflwbuf = dz->sampbuf[3];
     float *splinebuf1 = dz->sampbuf[0], *splinebuf2 = dz->sampbuf[1], *obuf = dz->sampbuf[2], *ovflwbuf = dz->sampbuf[3];
     float *driftbuf = dz->sampbuf[4];
     float *driftbuf = dz->sampbuf[4];
-    double lastdrifttime = 0.0, nextdrifttime = 0.0, driftincr1 = 1.0, driftincr2 = 1.0, driftincrincr = 0.0, driftend, dbufpos, abstime;
+    double lastdrifttime = 0.0, nextdrifttime = 0.0, driftincr1 = 1.0, driftincr2 = 1.0, driftincrincr = 0.0, driftend, dbufpos/*, abstime*/;
     int lastdriftsamps = 0, nextdriftsamps = 0, abssamps = 0, driftbufpos = 0;
     int lastdriftsamps = 0, nextdriftsamps = 0, abssamps = 0, driftbufpos = 0;
     memset((char *)splinebuf1,0,dz->buflen * sizeof(float));
     memset((char *)splinebuf1,0,dz->buflen * sizeof(float));
     memset((char *)splinebuf2,0,dz->buflen * sizeof(float));
     memset((char *)splinebuf2,0,dz->buflen * sizeof(float));
@@ -1227,7 +1227,7 @@ int synspline(dataptr dz)
 
 
                 while(dbufpos < driftend) {                         //  Advance by interpolated increments in driftbuf until end of buf reached.
                 while(dbufpos < driftend) {                         //  Advance by interpolated increments in driftbuf until end of buf reached.
                     abssamps = dz->total_samps_written + obufpos;               
                     abssamps = dz->total_samps_written + obufpos;               
-                    abstime = (double)abssamps/srate;               //  Absolute time (for reading any brktables) measured from absolute outbuf position
+//                    abstime = (double)abssamps/srate;               //  Absolute time (for reading any brktables) measured from absolute outbuf position
                     if(abssamps == nextdriftsamps) {
                     if(abssamps == nextdriftsamps) {
                         driftincr1     = driftincr2;                //  If we've reached the next designated time for generating a new transposition(incr) value,
                         driftincr1     = driftincr2;                //  If we've reached the next designated time for generating a new transposition(incr) value,
                         lastdrifttime  = nextdrifttime;             //  Set the "last" values as what were the "next" values
                         lastdrifttime  = nextdrifttime;             //  Set the "last" values as what were the "next" values
@@ -1404,8 +1404,8 @@ int create_synspline_sndbufs(dataptr dz)
     }
     }
     dz->sbufptr[0] = dz->sampbuf[0] = dz->bigbuf;                       //  splinebuf1
     dz->sbufptr[0] = dz->sampbuf[0] = dz->bigbuf;                       //  splinebuf1
     dz->sbufptr[1] = dz->sampbuf[1] = dz->sampbuf[0] + dz->buflen;      //  splinebuf2
     dz->sbufptr[1] = dz->sampbuf[1] = dz->sampbuf[0] + dz->buflen;      //  splinebuf2
-    dz->sampbuf[2] = dz->sampbuf[2] = dz->sampbuf[1] + dz->buflen;      //  obuf
-    dz->sampbuf[3] = dz->sampbuf[3] = dz->sampbuf[2] + dz->buflen2;     //  ovflwbuf
+    /*dz->sampbuf[2] = */ dz->sampbuf[2] = dz->sampbuf[1] + dz->buflen;      //  obuf
+    /*dz->sampbuf[3] = */ dz->sampbuf[3] = dz->sampbuf[2] + dz->buflen2;     //  ovflwbuf
     if(dz->is_drift) {
     if(dz->is_drift) {
         dz->sampbuf[4] = dz->sampbuf[4] = dz->sampbuf[3] + dz->buflen2; //  pre-drift interpolation buffer
         dz->sampbuf[4] = dz->sampbuf[4] = dz->sampbuf[3] + dz->buflen2; //  pre-drift interpolation buffer
         dz->sampbuf[5] = dz->sampbuf[5] + dz->buflen2;                  //  end of pre-drift buffer
         dz->sampbuf[5] = dz->sampbuf[5] + dz->buflen2;                  //  end of pre-drift buffer
@@ -1589,7 +1589,7 @@ int do_a_spline(int *wavelen,double srate,dataptr dz)
 {
 {
     int gotit = 0, n, m, hi = 0, orig_splincnt, rval, splincnt = 0;
     int gotit = 0, n, m, hi = 0, orig_splincnt, rval, splincnt = 0;
     int half_wavelen;
     int half_wavelen;
-    double maxrand, temp, maxsamp, rrange;
+    double maxrand, temp,/*maxsamp,*/ rrange;
     int   *splintsamps = dz->lparray[0];
     int   *splintsamps = dz->lparray[0];
     double *splintrand  = dz->parray[4], *splintamp = dz->parray[4];
     double *splintrand  = dz->parray[4], *splintamp = dz->parray[4];
     float  *splinebuf2  = dz->sampbuf[1];  
     float  *splinebuf2  = dz->sampbuf[1];  
@@ -1673,7 +1673,7 @@ int do_a_spline(int *wavelen,double srate,dataptr dz)
     cospline(half_wavelen,splincnt,dz);                 //  Calculate times for splining
     cospline(half_wavelen,splincnt,dz);                 //  Calculate times for splining
     for(n=0; n < half_wavelen;n++)                      //  Do COSIN-interps
     for(n=0; n < half_wavelen;n++)                      //  Do COSIN-interps
         splinebuf2[n] = (float)cosplint(&hi,(double)n/srate,splincnt,dz);
         splinebuf2[n] = (float)cosplint(&hi,(double)n/srate,splincnt,dz);
-    maxsamp = 0.0;
+//    maxsamp = 0.0;
     for(n=0,m = half_wavelen; n < half_wavelen;n++,m++)
     for(n=0,m = half_wavelen; n < half_wavelen;n++,m++)
         splinebuf2[m] = (float)(-splinebuf2[n]);
         splinebuf2[m] = (float)(-splinebuf2[n]);
     return FINISHED;
     return FINISHED;

+ 5 - 5
dev/science/tesselate.c

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright (c) 1983-2013 Trevor Wishart and Composers Desktop Project Ltd
+ * Copyright (c) 1983-2023 Trevor Wishart and Composers Desktop Project Ltd
  * http://www.trevorwishart.co.uk
  * http://www.trevorwishart.co.uk
  * http://www.composersdesktop.com
  * http://www.composersdesktop.com
  *
  *
@@ -92,7 +92,7 @@ int main(int argc,char *argv[])
     dataptr dz = NULL;
     dataptr dz = NULL;
     char **cmdline;
     char **cmdline;
     int  cmdlinecnt;
     int  cmdlinecnt;
-    aplptr ap;
+//    aplptr ap;
     int is_launched = FALSE;
     int is_launched = FALSE;
     if(argc==2 && (strcmp(argv[1],"--version") == 0)) {
     if(argc==2 && (strcmp(argv[1],"--version") == 0)) {
         fprintf(stdout,"%s\n",cdp_version);
         fprintf(stdout,"%s\n",cdp_version);
@@ -150,7 +150,7 @@ int main(int argc,char *argv[])
             return(exit_status);         
             return(exit_status);         
         }
         }
     }
     }
-    ap = dz->application;
+//    ap = dz->application;
 
 
     // parse_infile_and_hone_type() = 
     // parse_infile_and_hone_type() = 
     if((exit_status = parse_infile_and_check_type(cmdline,dz))<0) {
     if((exit_status = parse_infile_and_check_type(cmdline,dz))<0) {
@@ -598,7 +598,7 @@ int parse_sloom_data(int argc,char *argv[],char ***cmdline,int *cmdlinecnt,datap
     int filesize, insams, inbrksize;
     int filesize, insams, inbrksize;
     double dummy;
     double dummy;
     int true_cnt = 0;
     int true_cnt = 0;
-    aplptr ap;
+//    aplptr ap;
 
 
     while(cnt<=PRE_CMDLINE_DATACNT) {
     while(cnt<=PRE_CMDLINE_DATACNT) {
         if(cnt > argc) {
         if(cnt > argc) {
@@ -623,7 +623,7 @@ int parse_sloom_data(int argc,char *argv[],char ***cmdline,int *cmdlinecnt,datap
             //setup_particular_application() =
             //setup_particular_application() =
             if((exit_status = setup_tesselate_application(dz))<0)
             if((exit_status = setup_tesselate_application(dz))<0)
                 return(exit_status);
                 return(exit_status);
-            ap = dz->application;
+//            ap = dz->application;
             break;
             break;
 
 
         case(3):    
         case(3):    

+ 5 - 5
dev/science/timeseries.c

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright (c) 1983-2013 Trevor Wishart and Composers Desktop Project Ltd
+ * Copyright (c) 1983-2023 Trevor Wishart and Composers Desktop Project Ltd
  * http://www.trevorwishart.co.uk
  * http://www.trevorwishart.co.uk
  * http://www.composersdesktop.com
  * http://www.composersdesktop.com
  *
  *
@@ -109,7 +109,7 @@ int main(int argc,char *argv[])
     dataptr dz = NULL;
     dataptr dz = NULL;
     char **cmdline;
     char **cmdline;
     int  cmdlinecnt;
     int  cmdlinecnt;
-    aplptr ap;
+//    aplptr ap;
     int is_launched = FALSE;
     int is_launched = FALSE;
     if(argc==2 && (strcmp(argv[1],"--version") == 0)) {
     if(argc==2 && (strcmp(argv[1],"--version") == 0)) {
         fprintf(stdout,"%s\n",cdp_version);
         fprintf(stdout,"%s\n",cdp_version);
@@ -167,7 +167,7 @@ int main(int argc,char *argv[])
             return(exit_status);         
             return(exit_status);         
         }
         }
     }
     }
-    ap = dz->application;
+//    ap = dz->application;
 
 
     // parse_infile_and_hone_type() = 
     // parse_infile_and_hone_type() = 
     if((exit_status = parse_infile_and_check_type(cmdline,dz))<0) {
     if((exit_status = parse_infile_and_check_type(cmdline,dz))<0) {
@@ -702,7 +702,7 @@ int parse_sloom_data(int argc,char *argv[],char ***cmdline,int *cmdlinecnt,datap
     int filesize, insams, inbrksize;
     int filesize, insams, inbrksize;
     double dummy;
     double dummy;
     int true_cnt = 0;
     int true_cnt = 0;
-    aplptr ap;
+//    aplptr ap;
 
 
     while(cnt<=PRE_CMDLINE_DATACNT) {
     while(cnt<=PRE_CMDLINE_DATACNT) {
         if(cnt > argc) {
         if(cnt > argc) {
@@ -733,7 +733,7 @@ int parse_sloom_data(int argc,char *argv[],char ***cmdline,int *cmdlinecnt,datap
             //setup_particular_application() =
             //setup_particular_application() =
             if((exit_status = setup_timeseries_application(dz))<0)
             if((exit_status = setup_timeseries_application(dz))<0)
                 return(exit_status);
                 return(exit_status);
-            ap = dz->application;
+//            ap = dz->application;
             break;
             break;
 
 
         case(3):    
         case(3):    

+ 5 - 5
dev/science/tremenv.c

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright (c) 1983-2013 Trevor Wishart and Composers Desktop Project Ltd
+ * Copyright (c) 1983-2023 Trevor Wishart and Composers Desktop Project Ltd
  * http://www.trevorwishart.co.uk
  * http://www.trevorwishart.co.uk
  * http://www.composersdesktop.com
  * http://www.composersdesktop.com
  *
  *
@@ -93,7 +93,7 @@ int main(int argc,char *argv[])
     char **cmdline;
     char **cmdline;
     int  cmdlinecnt;
     int  cmdlinecnt;
     int n;
     int n;
-    aplptr ap;
+//    aplptr ap;
     int is_launched = FALSE;
     int is_launched = FALSE;
     if(argc==2 && (strcmp(argv[1],"--version") == 0)) {
     if(argc==2 && (strcmp(argv[1],"--version") == 0)) {
         fprintf(stdout,"%s\n",cdp_version);
         fprintf(stdout,"%s\n",cdp_version);
@@ -157,7 +157,7 @@ int main(int argc,char *argv[])
             return(exit_status);         
             return(exit_status);         
         }
         }
     }
     }
-    ap = dz->application;
+//    ap = dz->application;
 
 
     // parse_infile_and_hone_type() = 
     // parse_infile_and_hone_type() = 
     if((exit_status = parse_infile_and_check_type(cmdline,dz))<0) {
     if((exit_status = parse_infile_and_check_type(cmdline,dz))<0) {
@@ -599,7 +599,7 @@ int parse_sloom_data(int argc,char *argv[],char ***cmdline,int *cmdlinecnt,datap
     int filesize, insams, inbrksize;
     int filesize, insams, inbrksize;
     double dummy;
     double dummy;
     int true_cnt = 0;
     int true_cnt = 0;
-    aplptr ap;
+//    aplptr ap;
 
 
     while(cnt<=PRE_CMDLINE_DATACNT) {
     while(cnt<=PRE_CMDLINE_DATACNT) {
         if(cnt > argc) {
         if(cnt > argc) {
@@ -624,7 +624,7 @@ int parse_sloom_data(int argc,char *argv[],char ***cmdline,int *cmdlinecnt,datap
             //setup_particular_application() =
             //setup_particular_application() =
             if((exit_status = setup_tremenv_application(dz))<0)
             if((exit_status = setup_tremenv_application(dz))<0)
                 return(exit_status);
                 return(exit_status);
-            ap = dz->application;
+//            ap = dz->application;
             break;
             break;
 
 
         case(3):    
         case(3):    

+ 1 - 1
dev/science/ts_convert.c

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright (c) 1983-2013 Trevor Wishart and Composers Desktop Project Ltd
+ * Copyright (c) 1983-2023 Trevor Wishart and Composers Desktop Project Ltd
  * http://www.trevorwishart.co.uk
  * http://www.trevorwishart.co.uk
  * http://www.composersdesktop.com
  * http://www.composersdesktop.com
  *
  *

+ 25 - 25
dev/science/tweet.c

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright (c) 1983-2013 Trevor Wishart and Composers Desktop Project Ltd
+ * Copyright (c) 1983-2023 Trevor Wishart and Composers Desktop Project Ltd
  * http://www.trevorwishart.co.uk
  * http://www.trevorwishart.co.uk
  * http://www.composersdesktop.com
  * http://www.composersdesktop.com
  *
  *
@@ -126,7 +126,7 @@ int main(int argc,char *argv[])
     char **cmdline;
     char **cmdline;
     int  cmdlinecnt;
     int  cmdlinecnt;
     int n;
     int n;
-    aplptr ap;
+//    aplptr ap;
     int is_launched = FALSE;
     int is_launched = FALSE;
     if(argc==2 && (strcmp(argv[1],"--version") == 0)) {
     if(argc==2 && (strcmp(argv[1],"--version") == 0)) {
         fprintf(stdout,"%s\n",cdp_version);
         fprintf(stdout,"%s\n",cdp_version);
@@ -190,7 +190,7 @@ int main(int argc,char *argv[])
             return(exit_status);         
             return(exit_status);         
         }
         }
     }
     }
-    ap = dz->application;
+//    ap = dz->application;
 
 
     // parse_infile_and_hone_type() = 
     // parse_infile_and_hone_type() = 
     if((exit_status = parse_infile_and_check_type(cmdline,dz))<0) {
     if((exit_status = parse_infile_and_check_type(cmdline,dz))<0) {
@@ -639,7 +639,7 @@ int parse_sloom_data(int argc,char *argv[],char ***cmdline,int *cmdlinecnt,datap
     int filesize, insams, inbrksize;
     int filesize, insams, inbrksize;
     double dummy;
     double dummy;
     int true_cnt = 0;
     int true_cnt = 0;
-    aplptr ap;
+//    aplptr ap;
 
 
     while(cnt<=PRE_CMDLINE_DATACNT) {
     while(cnt<=PRE_CMDLINE_DATACNT) {
         if(cnt > argc) {
         if(cnt > argc) {
@@ -661,10 +661,10 @@ int parse_sloom_data(int argc,char *argv[],char ***cmdline,int *cmdlinecnt,datap
             }
             }
             if(dz->mode > 0)
             if(dz->mode > 0)
                 dz->mode--;
                 dz->mode--;
-            //setup_particular_application() =
+            //setup_particular_application()=
             if((exit_status = setup_tweet_application(dz))<0)
             if((exit_status = setup_tweet_application(dz))<0)
                 return(exit_status);
                 return(exit_status);
-            ap = dz->application;
+//            ap = dz->application;
             break;
             break;
 
 
         case(3):    
         case(3):    
@@ -690,16 +690,16 @@ int parse_sloom_data(int argc,char *argv[],char ***cmdline,int *cmdlinecnt,datap
                 sprintf(errstr,"Cannot read infilesize sent from TK\n");
                 sprintf(errstr,"Cannot read infilesize sent from TK\n");
                 return(DATA_ERROR);
                 return(DATA_ERROR);
             }
             }
-            dz->insams[0] = filesize;   
+            dz->insams[0] = filesize;
             break;
             break;
-        case(INPUT_INSAMS+4):   
+        case(INPUT_INSAMS+4):
             if(sscanf(argv[cnt],"%d",&insams)!=1) {
             if(sscanf(argv[cnt],"%d",&insams)!=1) {
                 sprintf(errstr,"Cannot read insams sent from TK\n");
                 sprintf(errstr,"Cannot read insams sent from TK\n");
                 return(DATA_ERROR);
                 return(DATA_ERROR);
             }
             }
-            dz->insams[0] = insams; 
+            dz->insams[0] = insams;
             break;
             break;
-        case(INPUT_SRATE+4):    
+        case(INPUT_SRATE+4):
             if(sscanf(argv[cnt],"%d",&dz->infile->srate)!=1) {
             if(sscanf(argv[cnt],"%d",&dz->infile->srate)!=1) {
                 sprintf(errstr,"Cannot read srate sent from TK\n");
                 sprintf(errstr,"Cannot read srate sent from TK\n");
                 return(DATA_ERROR);
                 return(DATA_ERROR);
@@ -711,62 +711,62 @@ int parse_sloom_data(int argc,char *argv[],char ***cmdline,int *cmdlinecnt,datap
                 return(DATA_ERROR);
                 return(DATA_ERROR);
             }
             }
             break;
             break;
-        case(INPUT_STYPE+4):    
+        case(INPUT_STYPE+4):
             if(sscanf(argv[cnt],"%d",&dz->infile->stype)!=1) {
             if(sscanf(argv[cnt],"%d",&dz->infile->stype)!=1) {
                 sprintf(errstr,"Cannot read stype sent from TK\n");
                 sprintf(errstr,"Cannot read stype sent from TK\n");
                 return(DATA_ERROR);
                 return(DATA_ERROR);
             }
             }
             break;
             break;
-        case(INPUT_ORIGSTYPE+4):    
+        case(INPUT_ORIGSTYPE+4):
             if(sscanf(argv[cnt],"%d",&dz->infile->origstype)!=1) {
             if(sscanf(argv[cnt],"%d",&dz->infile->origstype)!=1) {
                 sprintf(errstr,"Cannot read origstype sent from TK\n");
                 sprintf(errstr,"Cannot read origstype sent from TK\n");
                 return(DATA_ERROR);
                 return(DATA_ERROR);
             }
             }
             break;
             break;
-        case(INPUT_ORIGRATE+4): 
+        case(INPUT_ORIGRATE+4):
             if(sscanf(argv[cnt],"%d",&dz->infile->origrate)!=1) {
             if(sscanf(argv[cnt],"%d",&dz->infile->origrate)!=1) {
                 sprintf(errstr,"Cannot read origrate sent from TK\n");
                 sprintf(errstr,"Cannot read origrate sent from TK\n");
                 return(DATA_ERROR);
                 return(DATA_ERROR);
             }
             }
             break;
             break;
-        case(INPUT_MLEN+4): 
+        case(INPUT_MLEN+4):
             if(sscanf(argv[cnt],"%d",&dz->infile->Mlen)!=1) {
             if(sscanf(argv[cnt],"%d",&dz->infile->Mlen)!=1) {
                 sprintf(errstr,"Cannot read Mlen sent from TK\n");
                 sprintf(errstr,"Cannot read Mlen sent from TK\n");
                 return(DATA_ERROR);
                 return(DATA_ERROR);
             }
             }
             break;
             break;
-        case(INPUT_DFAC+4): 
+        case(INPUT_DFAC+4):
             if(sscanf(argv[cnt],"%d",&dz->infile->Dfac)!=1) {
             if(sscanf(argv[cnt],"%d",&dz->infile->Dfac)!=1) {
                 sprintf(errstr,"Cannot read Dfac sent from TK\n");
                 sprintf(errstr,"Cannot read Dfac sent from TK\n");
                 return(DATA_ERROR);
                 return(DATA_ERROR);
             }
             }
             break;
             break;
-        case(INPUT_ORIGCHANS+4):    
+        case(INPUT_ORIGCHANS+4):
             if(sscanf(argv[cnt],"%d",&dz->infile->origchans)!=1) {
             if(sscanf(argv[cnt],"%d",&dz->infile->origchans)!=1) {
                 sprintf(errstr,"Cannot read origchans sent from TK\n");
                 sprintf(errstr,"Cannot read origchans sent from TK\n");
                 return(DATA_ERROR);
                 return(DATA_ERROR);
             }
             }
             break;
             break;
-        case(INPUT_SPECENVCNT+4):   
+        case(INPUT_SPECENVCNT+4):
             if(sscanf(argv[cnt],"%d",&dz->infile->specenvcnt)!=1) {
             if(sscanf(argv[cnt],"%d",&dz->infile->specenvcnt)!=1) {
                 sprintf(errstr,"Cannot read specenvcnt sent from TK\n");
                 sprintf(errstr,"Cannot read specenvcnt sent from TK\n");
                 return(DATA_ERROR);
                 return(DATA_ERROR);
             }
             }
             dz->specenvcnt = dz->infile->specenvcnt;
             dz->specenvcnt = dz->infile->specenvcnt;
             break;
             break;
-        case(INPUT_WANTED+4):   
+        case(INPUT_WANTED+4):
             if(sscanf(argv[cnt],"%d",&dz->wanted)!=1) {
             if(sscanf(argv[cnt],"%d",&dz->wanted)!=1) {
                 sprintf(errstr,"Cannot read wanted sent from TK\n");
                 sprintf(errstr,"Cannot read wanted sent from TK\n");
                 return(DATA_ERROR);
                 return(DATA_ERROR);
             }
             }
             break;
             break;
-        case(INPUT_WLENGTH+4):  
+        case(INPUT_WLENGTH+4):
             if(sscanf(argv[cnt],"%d",&dz->wlength)!=1) {
             if(sscanf(argv[cnt],"%d",&dz->wlength)!=1) {
                 sprintf(errstr,"Cannot read wlength sent from TK\n");
                 sprintf(errstr,"Cannot read wlength sent from TK\n");
                 return(DATA_ERROR);
                 return(DATA_ERROR);
             }
             }
             break;
             break;
-        case(INPUT_OUT_CHANS+4):    
+        case(INPUT_OUT_CHANS+4):
             if(sscanf(argv[cnt],"%d",&dz->out_chans)!=1) {
             if(sscanf(argv[cnt],"%d",&dz->out_chans)!=1) {
                 sprintf(errstr,"Cannot read out_chans sent from TK\n");
                 sprintf(errstr,"Cannot read out_chans sent from TK\n");
                 return(DATA_ERROR);
                 return(DATA_ERROR);
@@ -1958,7 +1958,7 @@ int find_the_local_peaks(int *here,int *there,float *buf,int *n,int trofpntcnt,i
          int *startsamp,int *endsamp,int losamp, int *cut, int cutcnt, double *localpeak, double *scanarray,
          int *startsamp,int *endsamp,int losamp, int *cut, int cutcnt, double *localpeak, double *scanarray,
          int *localpeakcnt,int *first_downcross,dataptr dz)
          int *localpeakcnt,int *first_downcross,dataptr dz)
 {
 {
-    int exit_status, notfound = 0, finished = 0, below, bufinc = 0;
+    int exit_status, notfound = 0, finished = 0, /*below,*/ bufinc = 0;
     int maxat=0;
     int maxat=0;
     float maxval=0.0f, val;
     float maxval=0.0f, val;
     int wsize, hisamp,losampinbuf,hisampinbuf;
     int wsize, hisamp,losampinbuf,hisampinbuf;
@@ -2028,7 +2028,7 @@ int find_the_local_peaks(int *here,int *there,float *buf,int *n,int trofpntcnt,i
         *there = hisampinbuf - 1;
         *there = hisampinbuf - 1;
         val = buf[*there];
         val = buf[*there];
         if(val >= 0.0) {
         if(val >= 0.0) {
-            below = 0;
+//            below = 0;
             while(val >= 0.0) {
             while(val >= 0.0) {
                 (*there)--;
                 (*there)--;
                 if(*there < losampinbuf) {
                 if(*there < losampinbuf) {
@@ -2037,7 +2037,7 @@ int find_the_local_peaks(int *here,int *there,float *buf,int *n,int trofpntcnt,i
                 val = buf[*there];
                 val = buf[*there];
             }
             }
         } else if(val <= 0.0) {
         } else if(val <= 0.0) {
-            below = 1;
+//            below = 1;
             while(val <= 0.0) {
             while(val <= 0.0) {
                 (*there)--;
                 (*there)--;
                 if(*there < losampinbuf) {
                 if(*there < losampinbuf) {
@@ -2450,7 +2450,7 @@ int create_tweet_sndbufs(dataptr dz)
         sprintf(errstr,"buffer pointers not allocated: create_fofex_sndbufs()\n");
         sprintf(errstr,"buffer pointers not allocated: create_fofex_sndbufs()\n");
         return(PROGRAM_ERROR);
         return(PROGRAM_ERROR);
     }
     }
-    bigbufsize = (int)Malloc(-1);
+    bigbufsize = (int)(size_t) Malloc(-1);
     dz->buflen = bigbufsize/sizeof(float);
     dz->buflen = bigbufsize/sizeof(float);
     if((dz->bigbuf = (float *)malloc(bigbufsize * 2)) == NULL) {
     if((dz->bigbuf = (float *)malloc(bigbufsize * 2)) == NULL) {
         sprintf(errstr,"INSUFFICIENT MEMORY to create initial sound buffer.\n");
         sprintf(errstr,"INSUFFICIENT MEMORY to create initial sound buffer.\n");
@@ -2469,7 +2469,7 @@ int recreate_tweet_sndbufs(dataptr dz)
     int bigbufsize;
     int bigbufsize;
     free(dz->bigbuf);
     free(dz->bigbuf);
     dz->bufcnt = 3;
     dz->bufcnt = 3;
-    bigbufsize = (int)Malloc(-1);
+    bigbufsize = (int)(size_t) Malloc(-1);
     bigbufsize = max(dz->buflen * sizeof(float),(unsigned int)bigbufsize);
     bigbufsize = max(dz->buflen * sizeof(float),(unsigned int)bigbufsize);
     dz->buflen = bigbufsize/sizeof(float);
     dz->buflen = bigbufsize/sizeof(float);
     if((dz->bigbuf = (float *)malloc(bigbufsize  * (dz->bufcnt+1))) == NULL) {
     if((dz->bigbuf = (float *)malloc(bigbufsize  * (dz->bufcnt+1))) == NULL) {

+ 9 - 9
dev/science/unknot.c

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright (c) 1983-2013 Trevor Wishart and Composers Desktop Project Ltd
+ * Copyright (c) 1983-2023 Trevor Wishart and Composers Desktop Project Ltd
  * http://www.trevorwishart.co.uk
  * http://www.trevorwishart.co.uk
  * http://www.composersdesktop.com
  * http://www.composersdesktop.com
  *
  *
@@ -102,10 +102,10 @@ int main(int argc,char *argv[])
     char **cmdline, *p;
     char **cmdline, *p;
     int *patterncnt;
     int *patterncnt;
     int  cmdlinecnt;
     int  cmdlinecnt;
-    int knotdatacnt;
-    double *spatpos, *spatstep, *outdata, *comboarray, dummy;
+    int knotdatacnt = 0;
+    double *spatpos, *spatstep, *outdata = 0, *comboarray, dummy;
     int combopatterncnt, n;
     int combopatterncnt, n;
-    aplptr ap;
+//    aplptr ap;
     int is_launched = FALSE;
     int is_launched = FALSE;
     if(argc==2 && (strcmp(argv[1],"--version") == 0)) {
     if(argc==2 && (strcmp(argv[1],"--version") == 0)) {
         fprintf(stdout,"%s\n",cdp_version);
         fprintf(stdout,"%s\n",cdp_version);
@@ -160,7 +160,7 @@ int main(int argc,char *argv[])
         return(FAILED);
         return(FAILED);
     }
     }
 
 
-    ap = dz->application;
+//    ap = dz->application;
 
 
     // setup_param_ranges_and_defaults() =
     // setup_param_ranges_and_defaults() =
     if((exit_status = setup_unknot_param_ranges_and_defaults(dz))<0) {
     if((exit_status = setup_unknot_param_ranges_and_defaults(dz))<0) {
@@ -1118,7 +1118,7 @@ int unknot(int *patterncnt,int *knotdatacnt,double **spat_pos,double **spat_step
 {
 {
     double *timediff, *comboarray, *outdata = NULL, *spatpos, *spatstep, *outpos;
     double *timediff, *comboarray, *outdata = NULL, *spatpos, *spatstep, *outpos;
     int comboarraysize, outdiffcnt, outtestcnt, unknotting_eventcnt, outpatterncnt, outdatacnt = 0;
     int comboarraysize, outdiffcnt, outtestcnt, unknotting_eventcnt, outpatterncnt, outdatacnt = 0;
-    int n, m, r, k, tn, tm, tnow,  tnext, tlast, passno, smooth, combopatterncnt, lastnonzerodiff;
+    int n, m, r, k, tn, tm, tnow,  tnext,/* tlast,*/ passno, smooth, combopatterncnt, lastnonzerodiff;
     int unknotcnt = 0, maxcnt, adjacent, zerocnt = 0, prezerocnt, postzerocnt, adjacentzeros, maxloc, respacecnt = 0;
     int unknotcnt = 0, maxcnt, adjacent, zerocnt = 0, prezerocnt, postzerocnt, adjacentzeros, maxloc, respacecnt = 0;
     double tim_n, mid_n, lev_n, pos_n, tim_m, mid_m, lev_m, pos_m;
     double tim_n, mid_n, lev_n, pos_n, tim_m, mid_m, lev_m, pos_m;
     double bastime, maxdiff, span, halfspan, sum;
     double bastime, maxdiff, span, halfspan, sum;
@@ -1423,7 +1423,7 @@ int unknot(int *patterncnt,int *knotdatacnt,double **spat_pos,double **spat_step
             n++;
             n++;
         }
         }
         bastime = 0.0;
         bastime = 0.0;
-        tlast = 0;
+//        tlast = 0;
         outpatterncnt = writesteps * dz->iparam[KNOT_UNKNOTREP];        //  Number of patterns in unknotting output
         outpatterncnt = writesteps * dz->iparam[KNOT_UNKNOTREP];        //  Number of patterns in unknotting output
         for(n = 0,r = 0; n < outpatterncnt;n++,r+=combopatterncnt) {    //  For every pattern, (each pattern starts at r)
         for(n = 0,r = 0; n < outpatterncnt;n++,r+=combopatterncnt) {    //  For every pattern, (each pattern starts at r)
             sum  = 0.0;                                                 //  Single pattern timesum
             sum  = 0.0;                                                 //  Single pattern timesum
@@ -1448,7 +1448,7 @@ int unknot(int *patterncnt,int *knotdatacnt,double **spat_pos,double **spat_step
 int unknot_output(int *patterncnt,int knotdatacnt,double *spatpos,double *spatstep,double *comboarray,int combopatterncnt,double *outdata,dataptr dz)
 int unknot_output(int *patterncnt,int knotdatacnt,double *spatpos,double *spatstep,double *comboarray,int combopatterncnt,double *outdata,dataptr dz)
 {
 {
     int respace = 0, n, pcnt, r, ccnt, spacetyp = dz->iparam[KNOT_SPACETYP];
     int respace = 0, n, pcnt, r, ccnt, spacetyp = dz->iparam[KNOT_SPACETYP];
-    double *thispattern, *combo, bastime, endtime, thispos, starttime;
+    double *thispattern, *combo, bastime,/*endtime,*/ thispos, starttime;
     int combosize = 0, tim, mid, lev, pos, outpatterncnt, unknotting_eventcnt, sttim, stmid, stlev, stpos;
     int combosize = 0, tim, mid, lev, pos, outpatterncnt, unknotting_eventcnt, sttim, stmid, stlev, stpos;
     char temp[400];
     char temp[400];
 
 
@@ -1578,7 +1578,7 @@ int unknot_output(int *patterncnt,int knotdatacnt,double *spatpos,double *spatst
     mid = 1;
     mid = 1;
     lev = 2;
     lev = 2;
     pos = 3;
     pos = 3;
-    endtime = bastime;
+//    endtime = bastime;
     if(dz->vflag[2]) {
     if(dz->vflag[2]) {
         sprintf(temp,";UNKNOTTING\n");
         sprintf(temp,";UNKNOTTING\n");
         fputs(temp,dz->fp);
         fputs(temp,dz->fp);

+ 9 - 9
dev/science/verges.c

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright (c) 1983-2013 Trevor Wishart and Composers Desktop Project Ltd
+ * Copyright (c) 1983-2023 Trevor Wishart and Composers Desktop Project Ltd
  * http://www.trevorwishart.co.uk
  * http://www.trevorwishart.co.uk
  * http://www.composersdesktop.com
  * http://www.composersdesktop.com
  *
  *
@@ -100,7 +100,7 @@ int main(int argc,char *argv[])
     char **cmdline;
     char **cmdline;
     int  cmdlinecnt;
     int  cmdlinecnt;
     int n;
     int n;
-    aplptr ap;
+//    aplptr ap;
     int is_launched = FALSE;
     int is_launched = FALSE;
     if(argc==2 && (strcmp(argv[1],"--version") == 0)) {
     if(argc==2 && (strcmp(argv[1],"--version") == 0)) {
         fprintf(stdout,"%s\n",cdp_version);
         fprintf(stdout,"%s\n",cdp_version);
@@ -158,7 +158,7 @@ int main(int argc,char *argv[])
             return(exit_status);         
             return(exit_status);         
         }
         }
     }
     }
-    ap = dz->application;
+//    ap = dz->application;
 
 
     // parse_infile_and_hone_type() = 
     // parse_infile_and_hone_type() = 
     if((exit_status = parse_infile_and_check_type(cmdline,dz))<0) {
     if((exit_status = parse_infile_and_check_type(cmdline,dz))<0) {
@@ -591,7 +591,7 @@ int parse_sloom_data(int argc,char *argv[],char ***cmdline,int *cmdlinecnt,datap
     int filesize, insams, inbrksize;
     int filesize, insams, inbrksize;
     double dummy;
     double dummy;
     int true_cnt = 0;
     int true_cnt = 0;
-    aplptr ap;
+//    aplptr ap;
 
 
     while(cnt<=PRE_CMDLINE_DATACNT) {
     while(cnt<=PRE_CMDLINE_DATACNT) {
         if(cnt > argc) {
         if(cnt > argc) {
@@ -616,7 +616,7 @@ int parse_sloom_data(int argc,char *argv[],char ***cmdline,int *cmdlinecnt,datap
             //setup_particular_application() =
             //setup_particular_application() =
             if((exit_status = setup_verges_application(dz))<0)
             if((exit_status = setup_verges_application(dz))<0)
                 return(exit_status);
                 return(exit_status);
-            ap = dz->application;
+//            ap = dz->application;
             break;
             break;
 
 
         case(3):    
         case(3):    
@@ -1205,14 +1205,14 @@ int verges(dataptr dz)
 {
 {
     int exit_status, chans = dz->infile->channels; 
     int exit_status, chans = dz->infile->channels; 
     float *ibuf = dz->sampbuf[0], *iovflwbuf = dz->sampbuf[1], *obuf = dz->sampbuf[2];
     float *ibuf = dz->sampbuf[0], *iovflwbuf = dz->sampbuf[1], *obuf = dz->sampbuf[2];
-    double *vtimes = dz->parray[0], srate = (double)dz->infile->srate, lastvtime;
+    double *vtimes = dz->parray[0], srate = (double)dz->infile->srate /*, lastvtime*/;
     int last_total_samps_read, ibufpos, obufpos, n, vsamp, endsamps, vergsamps, maxextend, *vsmptimes = dz->lparray[0];
     int last_total_samps_read, ibufpos, obufpos, n, vsamp, endsamps, vergsamps, maxextend, *vsmptimes = dz->lparray[0];
 
 
     //  (much more than) the maximum amount the input-data can be stretched when creating a verge
     //  (much more than) the maximum amount the input-data can be stretched when creating a verge
 
 
     maxextend = (int)ceil(dz->application->hi[VRG_TRNSP]);
     maxextend = (int)ceil(dz->application->hi[VRG_TRNSP]);
 
 
-    lastvtime = 0.0;
+//    lastvtime = 0.0;
     last_total_samps_read = 0;
     last_total_samps_read = 0;
     ibufpos = 0;
     ibufpos = 0;
     obufpos = 0;
     obufpos = 0;
@@ -1300,7 +1300,7 @@ int create_temporary_verge_sndbufs(dataptr dz)
     int bigbufsize, secsize, minbuflen, framesize = F_SECSIZE * chans;
     int bigbufsize, secsize, minbuflen, framesize = F_SECSIZE * chans;
 
 
     minbuflen = dz->bigverge;
     minbuflen = dz->bigverge;
-    dz->buflen = (int)Malloc(-1)/sizeof(float);
+    dz->buflen = (int)(size_t) Malloc(-1)/sizeof(float);
     dz->buflen = max(dz->buflen,minbuflen); 
     dz->buflen = max(dz->buflen,minbuflen); 
     secsize = dz->buflen/framesize;
     secsize = dz->buflen/framesize;
     if(secsize * framesize != dz->buflen)
     if(secsize * framesize != dz->buflen)
@@ -1326,7 +1326,7 @@ int create_verges_sndbufs(dataptr dz)
     int bigbufsize, secsize, minbuflen, framesize = F_SECSIZE * chans;
     int bigbufsize, secsize, minbuflen, framesize = F_SECSIZE * chans;
 
 
     minbuflen = dz->bigverge;
     minbuflen = dz->bigverge;
-    dz->buflen = (int)Malloc(-1)/sizeof(float);
+    dz->buflen = (int)(size_t) Malloc(-1)/sizeof(float);
     dz->buflen = max(dz->buflen,minbuflen); 
     dz->buflen = max(dz->buflen,minbuflen); 
     secsize = dz->buflen/framesize;
     secsize = dz->buflen/framesize;
     if(secsize * framesize != dz->buflen)
     if(secsize * framesize != dz->buflen)

+ 6 - 6
dev/science/waveform.c

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright (c) 1983-2013 Trevor Wishart and Composers Desktop Project Ltd
+ * Copyright (c) 1983-2023 Trevor Wishart and Composers Desktop Project Ltd
  * http://www.trevorwishart.co.uk
  * http://www.trevorwishart.co.uk
  * http://www.composersdesktop.com
  * http://www.composersdesktop.com
  *
  *
@@ -88,7 +88,7 @@ int main(int argc,char *argv[])
     char **cmdline;
     char **cmdline;
     int  cmdlinecnt;
     int  cmdlinecnt;
     int n;
     int n;
-    aplptr ap;
+//    aplptr ap;
     int is_launched = FALSE;
     int is_launched = FALSE;
     if(argc==2 && (strcmp(argv[1],"--version") == 0)) {
     if(argc==2 && (strcmp(argv[1],"--version") == 0)) {
         fprintf(stdout,"%s\n",cdp_version);
         fprintf(stdout,"%s\n",cdp_version);
@@ -152,7 +152,7 @@ int main(int argc,char *argv[])
             return(exit_status);         
             return(exit_status);         
         }
         }
     }
     }
-    ap = dz->application;
+//    ap = dz->application;
 
 
     // parse_infile_and_hone_type() = 
     // parse_infile_and_hone_type() = 
     if((exit_status = parse_infile_and_check_type(cmdline,dz))<0) {
     if((exit_status = parse_infile_and_check_type(cmdline,dz))<0) {
@@ -595,7 +595,7 @@ int parse_sloom_data(int argc,char *argv[],char ***cmdline,int *cmdlinecnt,datap
     int filesize, insams, inbrksize;
     int filesize, insams, inbrksize;
     double dummy;
     double dummy;
     int true_cnt = 0;
     int true_cnt = 0;
-    aplptr ap;
+//    aplptr ap;
 
 
     while(cnt<=PRE_CMDLINE_DATACNT) {
     while(cnt<=PRE_CMDLINE_DATACNT) {
         if(cnt > argc) {
         if(cnt > argc) {
@@ -620,7 +620,7 @@ int parse_sloom_data(int argc,char *argv[],char ***cmdline,int *cmdlinecnt,datap
             //setup_particular_application() =
             //setup_particular_application() =
             if((exit_status = setup_waveform_application(dz))<0)
             if((exit_status = setup_waveform_application(dz))<0)
                 return(exit_status);
                 return(exit_status);
-            ap = dz->application;
+//           ap = dz->application;
             break;
             break;
 
 
         case(3):    
         case(3):    
@@ -1374,7 +1374,7 @@ int create_first_waveform_sndbuf(dataptr dz)
         sprintf(errstr,"buffer pointers not allocated: create_sndbufs()\n");
         sprintf(errstr,"buffer pointers not allocated: create_sndbufs()\n");
         return(PROGRAM_ERROR);
         return(PROGRAM_ERROR);
     }
     }
-    bigbufsize = (int)Malloc(-1);
+    bigbufsize = (int)(size_t) Malloc(-1);
     dz->buflen = bigbufsize / sizeof(float);    
     dz->buflen = bigbufsize / sizeof(float);    
     if((dz->sampbuf[0] = (float *)malloc(bigbufsize)) == NULL) {
     if((dz->sampbuf[0] = (float *)malloc(bigbufsize)) == NULL) {
         sprintf(errstr,"INSUFFICIENT MEMORY to create 1st sound buffer.\n");
         sprintf(errstr,"INSUFFICIENT MEMORY to create 1st sound buffer.\n");