shithub: aubio

Info  •  Files  •  Log  •  Branches

Merge branch 'fix/msvcwarnings' into feature/azureci

--- a/examples/parse_args.h

+++ b/examples/parse_args.h

@@ -64,8 +64,8 @@

 // internal stuff

 extern int blocks;

-extern fvec_t *ibuf;

-extern fvec_t *obuf;

+extern fvec_t *input_buffer;

+extern fvec_t *output_buffer;

 const char *prog_name;

@@ -200,11 +200,11 @@

     {NULL,                    0, NULL, 0}

   };

 #endif /* HAVE_GETOPT_H */

-  prog_name = argv[0];

+  // better safe than sorry

   if (argc < 1) {

     usage (stderr, 1);

-    return -1;

   }

+  prog_name = argv[0];

 #ifdef HAVE_GETOPT_H

   do {

     next_option = getopt_long (argc, argv, options, long_options, NULL);

--- a/examples/utils.c

+++ b/examples/utils.c

@@ -62,8 +62,8 @@

 // internal memory stuff

 aubio_source_t *this_source = NULL;

 aubio_sink_t *this_sink = NULL;

-fvec_t *ibuf;

-fvec_t *obuf;

+fvec_t *input_buffer;

+fvec_t *output_buffer;

 smpl_t miditap_note = 69.;

 smpl_t miditap_velo = 65.;

@@ -125,15 +125,15 @@

     source_uri = "jack";

 #endif /* HAVE_JACK */

   }

-  ibuf = new_fvec (hop_size);

-  obuf = new_fvec (hop_size);

+  input_buffer = new_fvec (hop_size);

+  output_buffer = new_fvec (hop_size);

 }

 void examples_common_del (void)

 {

-  del_fvec (ibuf);

-  del_fvec (obuf);

+  del_fvec (input_buffer);

+  del_fvec (output_buffer);

   aubio_cleanup ();

   fflush(stderr);

   fflush(stdout);

@@ -165,14 +165,14 @@

     blocks = 0;

     do {

-      aubio_source_do (this_source, ibuf, &read);

-      process_func (ibuf, obuf);

+      aubio_source_do (this_source, input_buffer, &read);

+      process_func (input_buffer, output_buffer);

       // print to console if verbose or no output given

       if (verbose || sink_uri == NULL) {

         print();

       }

       if (this_sink) {

-        aubio_sink_do (this_sink, obuf, hop_size);

+        aubio_sink_do (this_sink, output_buffer, hop_size);

       }

       blocks++;

       total_read += read;