Changeset 96c97d0


Ignore:
Timestamp:
Oct 5, 2018, 9:38:58 PM (14 months ago)
Author:
Paul Brossier <piem@piem.org>
Branches:
feature/autosink, feature/constantq, feature/pitchshift, feature/pydocstrings, feature/timestretch, master
Children:
6f33bad, fb1c5e2
Parents:
dbed3ea (diff), c8b52ab (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'fix/msvcwarnings' into feature/azureci

Location:
examples
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • examples/parse_args.h

    rdbed3ea r96c97d0  
    6565extern int blocks;
    6666
    67 extern fvec_t *ibuf;
    68 extern fvec_t *obuf;
     67extern fvec_t *input_buffer;
     68extern fvec_t *output_buffer;
    6969
    7070const char *prog_name;
     
    201201  };
    202202#endif /* HAVE_GETOPT_H */
    203   prog_name = argv[0];
     203  // better safe than sorry
    204204  if (argc < 1) {
    205205    usage (stderr, 1);
    206     return -1;
    207   }
     206  }
     207  prog_name = argv[0];
    208208#ifdef HAVE_GETOPT_H
    209209  do {
  • examples/utils.c

    rdbed3ea r96c97d0  
    6363aubio_source_t *this_source = NULL;
    6464aubio_sink_t *this_sink = NULL;
    65 fvec_t *ibuf;
    66 fvec_t *obuf;
     65fvec_t *input_buffer;
     66fvec_t *output_buffer;
    6767
    6868smpl_t miditap_note = 69.;
     
    126126#endif /* HAVE_JACK */
    127127  }
    128   ibuf = new_fvec (hop_size);
    129   obuf = new_fvec (hop_size);
     128  input_buffer = new_fvec (hop_size);
     129  output_buffer = new_fvec (hop_size);
    130130
    131131}
     
    133133void examples_common_del (void)
    134134{
    135   del_fvec (ibuf);
    136   del_fvec (obuf);
     135  del_fvec (input_buffer);
     136  del_fvec (output_buffer);
    137137  aubio_cleanup ();
    138138  fflush(stderr);
     
    166166
    167167    do {
    168       aubio_source_do (this_source, ibuf, &read);
    169       process_func (ibuf, obuf);
     168      aubio_source_do (this_source, input_buffer, &read);
     169      process_func (input_buffer, output_buffer);
    170170      // print to console if verbose or no output given
    171171      if (verbose || sink_uri == NULL) {
     
    173173      }
    174174      if (this_sink) {
    175         aubio_sink_do (this_sink, obuf, hop_size);
     175        aubio_sink_do (this_sink, output_buffer, hop_size);
    176176      }
    177177      blocks++;
Note: See TracChangeset for help on using the changeset viewer.