merge from develop

diff --cc python/demos/demo_source.py
Simple merge

diff --cc src/io/source.h
index e607312702277f773dcf0cb2b881ed723eacf57f,fa9853795cbc3e6232a2b2539ce3566e00f9729a..d95e67f2543f1118c6945c3b9ed7b73c52ba86ff
--- 1/src/io/source.h
--- 2/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 fe6e9cce0d147a075880ddc770d96075846a25a4,983e2116862ac2a19a798edde5ad7e3c00cdd6e4..4cbd3e55fb6475e98ca4b5e58b0c7205e741b08b
--- 1/src/io/source_apple_audio.h
--- 2/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.c
Simple merge

diff --cc src/io/source_sndfile.h
index cfa38b7eb03c5ceea8ed0b50f3ea0c8138985b38,9153d21e99349577fa544f0f6c274130e15949d2..cef5ffe08fbba6aee56a82f2889d4c096b84237b
--- 1/src/io/source_sndfile.h
--- 2/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 */