From: Paul Brossier <piem@piem.org>
Date: Mon, 11 Feb 2013 10:06:28 +0000 (-0500)
Subject: merge from develop
X-Git-Tag: 0.4.0-beta1~335
X-Git-Url: https://git.aubio.org/?a=commitdiff_plain;h=fc117d05d899d2ad3adc8807f449d6b886b3ff80;p=aubio.git

merge from develop
---

fc117d05d899d2ad3adc8807f449d6b886b3ff80
diff --cc python/demos/demo_source.py
index 00000000,65925fc0..3b9c9636
mode 000000,100755..100755
--- a/python/demos/demo_source.py
+++ b/python/demos/demo_source.py
@@@ -1,0 -1,15 +1,16 @@@
+ #! /usr/bin/env python
+ 
+ import sys
+ from aubio import source
+ 
+ if __name__ == '__main__':
+   if len(sys.argv) < 2:
+     print 'usage: %s <inputfile>' % sys.argv[0]
+     sys.exit(1)
 -  f = source(sys.argv[1], 8000, 256)
++  f = source(sys.argv[1], 1, 256)
++  samplerate = f.get_samplerate()
+   total_frames, read = 0, 256
+   while read:
+     vec, read = f()
+     total_frames += read
 -  print "read", total_frames / float(f.samplerate), "seconds from", f.uri
++  print "read", total_frames / float(samplerate), "seconds from", f.uri
diff --cc src/io/source.h
index e6073127,fa985379..d95e67f2
--- a/src/io/source.h
+++ b/src/io/source.h
@@@ -34,9 -34,10 +34,11 @@@ extern "C" 
  typedef struct _aubio_source_t aubio_source_t;
  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);
  
+ uint_t aubio_source_get_samplerate(aubio_source_t * s);
+ 
  #ifdef __cplusplus
  }
  #endif
diff --cc src/io/source_apple_audio.h
index fe6e9cce,983e2116..4cbd3e55
--- a/src/io/source_apple_audio.h
+++ b/src/io/source_apple_audio.h
@@@ -24,7 -24,8 +24,9 @@@
  typedef struct _aubio_source_apple_audio_t aubio_source_apple_audio_t;
  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);
  
+ uint_t aubio_source_apple_audio_get_samplerate(aubio_source_apple_audio_t * s);
+ 
  #endif /* _AUBIO_SOURCE_APPLE_AUDIO_H */
diff --cc src/io/source_sndfile.h
index cfa38b7e,9153d21e..cef5ffe0
--- a/src/io/source_sndfile.h
+++ b/src/io/source_sndfile.h
@@@ -24,7 -24,8 +24,9 @@@
  typedef struct _aubio_source_sndfile_t aubio_source_sndfile_t;
  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);
  
+ uint_t aubio_source_sndfile_get_samplerate(aubio_source_sndfile_t * s);
+ 
  #endif /* _AUBIO_SOURCE_SNDFILE_H */