[examples] remove unneeded cast

[aubio.git] / examples / aubiopitch.c

diff --git a/examples/aubiopitch.c b/examples/aubiopitch.c
index c362c01..3a3d37e 100644 (file)
--- a/examples/aubiopitch.c
+++ b/examples/aubiopitch.c
@@ -1,83 +1,91 @@
 /*
-   Copyright (C) 2003 Paul Brossier
+  Copyright (C) 2003-2013 Paul Brossier <piem@aubio.org>
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+  This file is part of aubio.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  aubio is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  aubio is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with aubio.  If not, see <http://www.gnu.org/licenses/>.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
 #include "utils.h"
-
-unsigned int pos = 0; /*frames%dspblocksize*/
+#define PROG_HAS_PITCH 1
+#define PROG_HAS_OUTPUT 1
+#define PROG_HAS_SILENCE 1
+#define PROG_HAS_JACK 1
+#include "parse_args.h"
 
 aubio_pitch_t *o;
+aubio_wavetable_t *wavetable;
 fvec_t *pitch;
 
-static int aubio_process(smpl_t **input, smpl_t **output, int nframes) {
-  unsigned int i;       /*channels*/
-  unsigned int j;       /*frames*/
-  for (j=0;j<(unsigned)nframes;j++) {
-    if(usejack) {
-      for (i=0;i<channels;i++) {
-        /* write input to datanew */
-        fvec_write_sample(ibuf, input[i][j], i, pos);
-        /* put synthnew in output */
-        output[i][j] = fvec_read_sample(obuf, i, pos);
-      }
-    }
-    /*time for fft*/
-    if (pos == overlap_size-1) {         
-      /* block loop */
-      aubio_pitch_do (o, ibuf, pitch);
-      if (fvec_read_sample(pitch, 0, 0)) {
-        for (pos = 0; pos < overlap_size; pos++){
-          obuf->data[0][pos] = woodblock->data[0][pos];
-        }
-      } else {
-        for (pos = 0; pos < overlap_size; pos++) {
-          obuf->data[0][pos] = 0.;
-        }
-      }
-      /* end of block loop */
-      pos = -1; /* so it will be zero next j loop */
-    }
-    pos++;
-  }
-  return 1;
+void process_block(fvec_t * ibuf, fvec_t * obuf)
+{
+  smpl_t freq;
+  aubio_pitch_do (o, ibuf, pitch);
+  if ( !usejack && ! sink_uri ) return;
+  fvec_zeros(obuf);
+  freq = fvec_get_sample(pitch, 0);
+  aubio_wavetable_set_amp ( wavetable, aubio_level_lin (ibuf) );
+  aubio_wavetable_set_freq ( wavetable, freq );
+  if (mix_input)
+    aubio_wavetable_do (wavetable, ibuf, obuf);
+  else
+    aubio_wavetable_do (wavetable, obuf, obuf);
 }
 
-static void process_print (void) {
-      if (!verbose && usejack) return;
-      smpl_t pitch_found = fvec_read_sample(pitch, 0, 0);
-      outmsg("%f %f\n",(frames) 
-              *overlap_size/(float)samplerate, pitch_found);
+void process_print (void)
+{
+  smpl_t pitch_found = fvec_get_sample(pitch, 0);
+  print_time(blocks * hop_size);
+  outmsg(" %f\n", pitch_found);
 }
 
 int main(int argc, char **argv) {
+  int ret = 0;
+
+  buffer_size = 2048;
+
   examples_common_init(argc,argv);
 
-  o = new_aubio_pitch (onset_mode, buffer_size, overlap_size, channels,
-          samplerate);
-  pitch = new_fvec (1, channels);
+  verbmsg ("using source: %s at %dHz\n", source_uri, samplerate);
+  verbmsg ("pitch method: %s, ", pitch_method);
+  verbmsg ("pitch unit: %s, ", pitch_unit);
+  verbmsg ("buffer_size: %d, ", buffer_size);
+  verbmsg ("hop_size: %d, ", hop_size);
+  verbmsg ("tolerance: %f\n", pitch_tolerance);
 
-  examples_common_process(aubio_process,process_print);
+  o = new_aubio_pitch (pitch_method, buffer_size, hop_size, samplerate);
+  if (o == NULL) { ret = 1; goto beach; }
+  if (pitch_tolerance != 0.)
+    aubio_pitch_set_tolerance (o, pitch_tolerance);
+  if (silence_threshold != -90.)
+    aubio_pitch_set_silence (o, silence_threshold);
+  if (pitch_unit != NULL)
+    aubio_pitch_set_unit (o, pitch_unit);
+
+  pitch = new_fvec (1);
+
+  wavetable = new_aubio_wavetable (samplerate, hop_size);
+  aubio_wavetable_play ( wavetable );
+
+  examples_common_process(process_block, process_print);
 
   del_aubio_pitch (o);
+  del_aubio_wavetable (wavetable);
   del_fvec (pitch);
 
+beach:
   examples_common_del();
-  debug("End of program.\n");
-  fflush(stderr);
-  return 0;
+  return ret;
 }
-