From: Paul Brossier Date: Mon, 11 Feb 2013 16:39:13 +0000 (-0500) Subject: src/io/: removed methods duplicated in merge X-Git-Tag: 0.4.0-beta1~333 X-Git-Url: https://git.aubio.org/?a=commitdiff_plain;h=35c97ab3452d131910e771920d4bd8b648421cba;p=aubio.git src/io/: removed methods duplicated in merge --- diff --git a/src/io/source.h b/src/io/source.h index d95e67f2..e6073127 100644 --- a/src/io/source.h +++ b/src/io/source.h @@ -37,8 +37,6 @@ 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 --git a/src/io/source_apple_audio.h b/src/io/source_apple_audio.h index 4cbd3e55..fe6e9cce 100644 --- a/src/io/source_apple_audio.h +++ b/src/io/source_apple_audio.h @@ -27,6 +27,4 @@ void aubio_source_apple_audio_do(aubio_source_apple_audio_t * s, fvec_t * read_t 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 --git a/src/io/source_sndfile.c b/src/io/source_sndfile.c index 92915fa7..8472e2dd 100644 --- a/src/io/source_sndfile.c +++ b/src/io/source_sndfile.c @@ -193,8 +193,4 @@ void del_aubio_source_sndfile(aubio_source_sndfile_t * s){ AUBIO_FREE(s); } -uint_t aubio_source_sndfile_get_samplerate(aubio_source_sndfile_t * s) { - return s->samplerate; -} - #endif /* HAVE_SNDFILE */ diff --git a/src/io/source_sndfile.h b/src/io/source_sndfile.h index cef5ffe0..cfa38b7e 100644 --- a/src/io/source_sndfile.h +++ b/src/io/source_sndfile.h @@ -27,6 +27,4 @@ void aubio_source_sndfile_do(aubio_source_sndfile_t * s, fvec_t * read_to, uint_ 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 */