Changeset 5e9c68a for examples

Timestamp:

Aug 9, 2005, 7:56:21 PM (19 years ago)

Author:

Paul Brossier <piem@altern.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

a29ad46

Parents:

28d8c4a

Message:

rename file_ to aubio_sndfile, protect aubio_pitdetection_{mode,type} enumerators

Location:

examples

Files:

• utils.c (modified) (9 diffs)
• utils.h (modified) (1 diff)

examples/utils.c

@@ -40 +40 @@
 
 
-aubio_file_t * file = NULL;
-aubio_file_t * fileout = NULL;
+aubio_sndfile_t * file = NULL;
+aubio_sndfile_t * fileout = NULL;
 
 aubio_pvoc_t * pv;
@@ -59 +59 @@
 smpl_t pitch               = 0.;
 aubio_pitchdetection_t * pitchdet;
-aubio_pitchdetection_type mode = aubio_yin; // aubio_mcomb
+aubio_pitchdetection_type mode = aubio_pitch_yin; // aubio_pitch_mcomb
 uint_t median         = 6;
 
@@ -205 +205 @@
 
 
-  aubio_file_t * onsetfile;
+  aubio_sndfile_t * onsetfile;
   /* parse command line arguments */
   parse_args(argc, argv);
@@ -211 +211 @@
   woodblock = new_fvec(buffer_size,1);
   if (output_filename || usejack) {
-          (onsetfile = new_file_ro(onset_filename)) ||
-                  (onsetfile = new_file_ro("sounds/woodblock.aiff")) ||
-                  (onsetfile = new_file_ro("../sounds/woodblock.aiff"));
+          (onsetfile = new_aubio_sndfile_ro(onset_filename)) ||
+                  (onsetfile = new_aubio_sndfile_ro("sounds/woodblock.aiff")) ||
+                  (onsetfile = new_aubio_sndfile_ro("../sounds/woodblock.aiff"));
           /* read the output sound once */
-          file_read(onsetfile, overlap_size, woodblock);
+          aubio_sndfile_read(onsetfile, overlap_size, woodblock);
   }
 
@@ -221 +221 @@
   {
     debug("Opening files ...\n");
-    file = new_file_ro (input_filename);
-    if (verbose) file_info(file);
-    channels = aubio_file_channels(file);
-    samplerate = aubio_file_samplerate(file);
+    file = new_aubio_sndfile_ro (input_filename);
+    if (verbose) aubio_sndfile_info(file);
+    channels = aubio_sndfile_channels(file);
+    samplerate = aubio_sndfile_samplerate(file);
     if (output_filename != NULL)
-      fileout = new_file_wo(file, output_filename);
+      fileout = new_aubio_sndfile_wo(file, output_filename);
   }
 
@@ -235 +235 @@
   if (usepitch) {
     pitchdet = new_aubio_pitchdetection(buffer_size*4, 
-                    overlap_size, channels, samplerate, mode, aubio_freq);
+                    overlap_size, channels, samplerate, mode, aubio_pitchm_freq);
   
   if (median) {
@@ -306 +306 @@
     frames = 0;
 
-    while (overlap_size == file_read(file, overlap_size, ibuf))
+    while (overlap_size == aubio_sndfile_read(file, overlap_size, ibuf))
     {
       isonset=0;
@@ -312 +312 @@
       print(); 
       if (output_filename != NULL) {
-        file_write(fileout,overlap_size,obuf);
+        aubio_sndfile_write(fileout,overlap_size,obuf);
       }
       frames++;
@@ -318 +318 @@
 
     debug("Processed %d frames of %d samples.\n", frames, buffer_size);
-    del_file(file);
+    del_aubio_sndfile(file);
 
     if (output_filename != NULL)
-      del_file(fileout);
+      del_aubio_sndfile(fileout);
 
   }

examples/utils.h

@@ -76 +76 @@
 
 
-extern aubio_file_t * file;
-extern aubio_file_t * fileout;
+extern aubio_sndfile_t * file;
+extern aubio_sndfile_t * fileout;
 
 extern aubio_pvoc_t * pv;