From 6a03729dc3c88d056ba0b883d25ecf49adfc4a50 Mon Sep 17 00:00:00 2001 From: Paul Brossier Date: Mon, 18 Mar 2013 11:19:23 -0500 Subject: [PATCH] src/io: use hop_size, not block_size --- python/lib/gen_pyobject.py | 3 --- src/io/source.h | 8 ++++---- src/io/source_apple_audio.h | 9 +++++---- src/io/source_sndfile.h | 8 ++++---- 4 files changed, 13 insertions(+), 15 deletions(-) diff --git a/python/lib/gen_pyobject.py b/python/lib/gen_pyobject.py index 16480ce1..aee961fb 100644 --- a/python/lib/gen_pyobject.py +++ b/python/lib/gen_pyobject.py @@ -99,7 +99,6 @@ defaultsizes = { 'beattracking': ['self->hop_size'], 'tempo': ['1'], 'peakpicker': ['1'], - 'source': ['self->block_size', '1'], } # default value for variables @@ -115,8 +114,6 @@ aubiodefvalue = { 'buf_size': 'Py_default_vector_length', # and here too 'hop_size': 'Py_default_vector_length / 2', - # add block_size, synonim of hop_size - 'block_size': 'Py_default_vector_length / 2', # these should be alright 'samplerate': 'Py_aubio_default_samplerate', # now for the non obvious ones diff --git a/src/io/source.h b/src/io/source.h index abfd7827..76fa434c 100644 --- a/src/io/source.h +++ b/src/io/source.h @@ -42,7 +42,7 @@ typedef struct _aubio_source_t aubio_source_t; \param uri the file path or uri to read from \param samplerate sampling rate to view the fie at - \param block_size the size of the blocks to read from + \param hop_size the size of the blocks to read from Creates a new source object. If `0` is passed as `samplerate`, the sample rate of the original file is used. @@ -51,18 +51,18 @@ typedef struct _aubio_source_t aubio_source_t; ::aubio_source_get_samplerate. */ -aubio_source_t * new_aubio_source(char_t * uri, uint_t samplerate, uint_t block_size); +aubio_source_t * new_aubio_source(char_t * uri, uint_t samplerate, uint_t hop_size); /** - read monophonic vector of length block_size from source object + read monophonic vector of length hop_size from source object \param s source object, created with ::new_aubio_source \param read_to ::fvec_t of data to read to \param read upon returns, equals to number of frames actually read Upon returns, `read` contains the number of frames actually read from the - source. `block_size` if enough frames could be read, less otherwise. + source. `hop_size` if enough frames could be read, less otherwise. */ void aubio_source_do(aubio_source_t * s, fvec_t * read_to, uint_t * read); diff --git a/src/io/source_apple_audio.h b/src/io/source_apple_audio.h index dfcd7cf3..5c4b91ed 100644 --- a/src/io/source_apple_audio.h +++ b/src/io/source_apple_audio.h @@ -48,7 +48,7 @@ typedef struct _aubio_source_apple_audio_t aubio_source_apple_audio_t; \param uri the file path or uri to read from \param samplerate sampling rate to view the fie at - \param block_size the size of the blocks to read from + \param hop_size the size of the blocks to read from Creates a new source object. If `0` is passed as `samplerate`, the sample rate of the original file is used. @@ -57,21 +57,22 @@ typedef struct _aubio_source_apple_audio_t aubio_source_apple_audio_t; ::aubio_source_apple_audio_get_samplerate. */ -aubio_source_apple_audio_t * new_aubio_source_apple_audio(char_t * uri, uint_t samplerate, uint_t block_size); +aubio_source_apple_audio_t * new_aubio_source_apple_audio(char_t * uri, uint_t samplerate, uint_t hop_size); /** - read monophonic vector of length block_size from source object + read monophonic vector of length hop_size from source object \param s source object, created with ::new_aubio_source_apple_audio \param read_to ::fvec_t of data to read to \param read upon returns, equals to number of frames actually read Upon returns, `read` contains the number of frames actually read from the - source. `block_size` if enough frames could be read, less otherwise. + source. `hop_size` if enough frames could be read, less otherwise. */ void aubio_source_apple_audio_do(aubio_source_apple_audio_t * s, fvec_t * read_to, uint_t * read); +void aubio_source_apple_audio_do_multi(aubio_source_apple_audio_t * s, fmat_t * read_to, uint_t * read); /** diff --git a/src/io/source_sndfile.h b/src/io/source_sndfile.h index 8bac20cd..80c89131 100644 --- a/src/io/source_sndfile.h +++ b/src/io/source_sndfile.h @@ -47,7 +47,7 @@ typedef struct _aubio_source_sndfile_t aubio_source_sndfile_t; \param uri the file path or uri to read from \param samplerate sampling rate to view the fie at - \param block_size the size of the blocks to read from + \param hop_size the size of the blocks to read from Creates a new source object. If `0` is passed as `samplerate`, the sample rate of the original file is used. @@ -56,18 +56,18 @@ typedef struct _aubio_source_sndfile_t aubio_source_sndfile_t; ::aubio_source_sndfile_get_samplerate. */ -aubio_source_sndfile_t * new_aubio_source_sndfile(char_t * uri, uint_t samplerate, uint_t block_size); +aubio_source_sndfile_t * new_aubio_source_sndfile(char_t * uri, uint_t samplerate, uint_t hop_size); /** - read monophonic vector of length block_size from source object + read monophonic vector of length hop_size from source object \param s source object, created with ::new_aubio_source_sndfile \param read_to ::fvec_t of data to read to \param read upon returns, equals to number of frames actually read Upon returns, `read` contains the number of frames actually read from the - source. `block_size` if enough frames could be read, less otherwise. + source. `hop_size` if enough frames could be read, less otherwise. */ void aubio_source_sndfile_do(aubio_source_sndfile_t * s, fvec_t * read_to, uint_t * read); -- 2.26.2