Changes in / [fc117d0:88fc249]

Files:

• python/demos/demo_source.py (modified) (1 diff)
• src/io/source.h (modified) (1 diff)
• src/io/source_apple_audio.h (modified) (1 diff)
• src/io/source_sndfile.c (modified) (1 diff)
• src/io/source_sndfile.h (modified) (1 diff)

python/demos/demo_source.py

@@ -8 +8 @@
     print 'usage: %s <inputfile>' % sys.argv[0]
     sys.exit(1)
-  f = source(sys.argv[1], 1, 256)
-  samplerate = f.get_samplerate()
+  f = source(sys.argv[1], 8000, 256)
   total_frames, read = 0, 256
   while read:
     vec, read = f()
     total_frames += read
-  print "read", total_frames / float(samplerate), "seconds from", f.uri
+  print "read", total_frames / float(f.samplerate), "seconds from", f.uri

src/io/source.h

@@ -35 +35 @@
 aubio_source_t * new_aubio_source(char_t * uri, uint_t samplerate, uint_t hop_size);
 void aubio_source_do(aubio_source_t * s, fvec_t * read_data, uint_t * read);
-uint_t aubio_source_get_samplerate(aubio_source_t * s);
 void del_aubio_source(aubio_source_t * s);
 

src/io/source_apple_audio.h

@@ -25 +25 @@
 aubio_source_apple_audio_t * new_aubio_source_apple_audio(char_t * path, uint_t samplerate, uint_t block_size);
 void aubio_source_apple_audio_do(aubio_source_apple_audio_t * s, fvec_t * read_to, uint_t * read);
-uint_t aubio_source_apple_audio_get_samplerate(aubio_source_apple_audio_t * s);
 void del_aubio_source_apple_audio(aubio_source_apple_audio_t * s);
 

src/io/source_sndfile.c

@@ -173 +173 @@
 }
 
-uint_t aubio_source_sndfile_get_samplerate(aubio_source_sndfile_t * s) {
-  return s->samplerate;
-}
-
 void del_aubio_source_sndfile(aubio_source_sndfile_t * s){
   if (!s) return;

src/io/source_sndfile.h

@@ -25 +25 @@
 aubio_source_sndfile_t * new_aubio_source_sndfile(char_t * path, uint_t samplerate, uint_t block_size);
 void aubio_source_sndfile_do(aubio_source_sndfile_t * s, fvec_t * read_to, uint_t * read);
-uint_t aubio_source_sndfile_get_samplerate(aubio_source_sndfile_t * s);
 void del_aubio_source_sndfile(aubio_source_sndfile_t * s);