From ae5d58a7ec6083e54c14da6dd2ac8d755a0e9224 Mon Sep 17 00:00:00 2001 From: Paul Brossier Date: Thu, 21 Apr 2016 18:47:50 +0200 Subject: [PATCH] src/io/*.{c,h}: added const qualifiers to unmodified pointers --- src/io/sink.c | 6 +++--- src/io/sink.h | 6 +++--- src/io/sink_apple_audio.c | 6 +++--- src/io/sink_apple_audio.h | 6 +++--- src/io/sink_sndfile.c | 6 +++--- src/io/sink_sndfile.h | 6 +++--- src/io/sink_wavwrite.c | 6 +++--- src/io/sink_wavwrite.h | 6 +++--- src/io/source.c | 2 +- src/io/source.h | 2 +- src/io/source_apple_audio.c | 10 +++++----- src/io/source_apple_audio.h | 6 +++--- src/io/source_avcodec.c | 6 +++--- src/io/source_avcodec.h | 6 +++--- src/io/source_sndfile.c | 2 +- src/io/source_sndfile.h | 2 +- src/io/source_wavread.c | 2 +- src/io/source_wavread.h | 2 +- 18 files changed, 44 insertions(+), 44 deletions(-) diff --git a/src/io/sink.c b/src/io/sink.c index 76980bb8..33fe2ac2 100644 --- a/src/io/sink.c +++ b/src/io/sink.c @@ -54,7 +54,7 @@ struct _aubio_sink_t { del_aubio_sink_t s_del; }; -aubio_sink_t * new_aubio_sink(char_t * uri, uint_t samplerate) { +aubio_sink_t * new_aubio_sink(const char_t * uri, uint_t samplerate) { aubio_sink_t * s = AUBIO_NEW(aubio_sink_t); #ifdef HAVE_SINK_APPLE_AUDIO s->sink = (void *)new_aubio_sink_apple_audio(uri, samplerate); @@ -120,11 +120,11 @@ uint_t aubio_sink_preset_channels(aubio_sink_t * s, uint_t channels) { return s->s_preset_channels((void *)s->sink, channels); } -uint_t aubio_sink_get_samplerate(aubio_sink_t * s) { +uint_t aubio_sink_get_samplerate(const aubio_sink_t * s) { return s->s_get_samplerate((void *)s->sink); } -uint_t aubio_sink_get_channels(aubio_sink_t * s) { +uint_t aubio_sink_get_channels(const aubio_sink_t * s) { return s->s_get_channels((void *)s->sink); } diff --git a/src/io/sink.h b/src/io/sink.h index 954bd807..c196ef69 100644 --- a/src/io/sink.h +++ b/src/io/sink.h @@ -76,7 +76,7 @@ typedef struct _aubio_sink_t aubio_sink_t; been called. */ -aubio_sink_t * new_aubio_sink(char_t * uri, uint_t samplerate); +aubio_sink_t * new_aubio_sink(const char_t * uri, uint_t samplerate); /** @@ -120,7 +120,7 @@ uint_t aubio_sink_preset_channels(aubio_sink_t *s, uint_t channels); \return samplerate, in Hz */ -uint_t aubio_sink_get_samplerate(aubio_sink_t *s); +uint_t aubio_sink_get_samplerate(const aubio_sink_t *s); /** @@ -130,7 +130,7 @@ uint_t aubio_sink_get_samplerate(aubio_sink_t *s); \return number of channels */ -uint_t aubio_sink_get_channels(aubio_sink_t *s); +uint_t aubio_sink_get_channels(const aubio_sink_t *s); /** diff --git a/src/io/sink_apple_audio.c b/src/io/sink_apple_audio.c index 83e0d002..313dbf2b 100644 --- a/src/io/sink_apple_audio.c +++ b/src/io/sink_apple_audio.c @@ -57,7 +57,7 @@ struct _aubio_sink_apple_audio_t { bool async; }; -aubio_sink_apple_audio_t * new_aubio_sink_apple_audio(char_t * uri, uint_t samplerate) { +aubio_sink_apple_audio_t * new_aubio_sink_apple_audio(const char_t * uri, uint_t samplerate) { aubio_sink_apple_audio_t * s = AUBIO_NEW(aubio_sink_apple_audio_t); s->path = uri; s->max_frames = MAX_SIZE; @@ -112,12 +112,12 @@ uint_t aubio_sink_apple_audio_preset_channels(aubio_sink_apple_audio_t *s, uint_ return AUBIO_OK; } -uint_t aubio_sink_apple_audio_get_samplerate(aubio_sink_apple_audio_t *s) +uint_t aubio_sink_apple_audio_get_samplerate(const aubio_sink_apple_audio_t *s) { return s->samplerate; } -uint_t aubio_sink_apple_audio_get_channels(aubio_sink_apple_audio_t *s) +uint_t aubio_sink_apple_audio_get_channels(const aubio_sink_apple_audio_t *s) { return s->channels; } diff --git a/src/io/sink_apple_audio.h b/src/io/sink_apple_audio.h index b9efe97f..bd64b2c2 100644 --- a/src/io/sink_apple_audio.h +++ b/src/io/sink_apple_audio.h @@ -58,7 +58,7 @@ typedef struct _aubio_sink_apple_audio_t aubio_sink_apple_audio_t; been called. */ -aubio_sink_apple_audio_t * new_aubio_sink_apple_audio(char_t * uri, uint_t samplerate); +aubio_sink_apple_audio_t * new_aubio_sink_apple_audio(const char_t * uri, uint_t samplerate); /** @@ -102,7 +102,7 @@ uint_t aubio_sink_apple_audio_preset_channels(aubio_sink_apple_audio_t *s, uint_ \return samplerate, in Hz */ -uint_t aubio_sink_apple_audio_get_samplerate(aubio_sink_apple_audio_t *s); +uint_t aubio_sink_apple_audio_get_samplerate(const aubio_sink_apple_audio_t *s); /** @@ -112,7 +112,7 @@ uint_t aubio_sink_apple_audio_get_samplerate(aubio_sink_apple_audio_t *s); \return number of channels */ -uint_t aubio_sink_apple_audio_get_channels(aubio_sink_apple_audio_t *s); +uint_t aubio_sink_apple_audio_get_channels(const aubio_sink_apple_audio_t *s); /** diff --git a/src/io/sink_sndfile.c b/src/io/sink_sndfile.c index 9fed7606..4cef5790 100644 --- a/src/io/sink_sndfile.c +++ b/src/io/sink_sndfile.c @@ -53,7 +53,7 @@ struct _aubio_sink_sndfile_t { uint_t aubio_sink_sndfile_open(aubio_sink_sndfile_t *s); -aubio_sink_sndfile_t * new_aubio_sink_sndfile(char_t * path, uint_t samplerate) { +aubio_sink_sndfile_t * new_aubio_sink_sndfile(const char_t * path, uint_t samplerate) { aubio_sink_sndfile_t * s = AUBIO_NEW(aubio_sink_sndfile_t); s->max_size = MAX_SIZE; s->path = path; @@ -106,12 +106,12 @@ uint_t aubio_sink_sndfile_preset_channels(aubio_sink_sndfile_t *s, uint_t channe return AUBIO_OK; } -uint_t aubio_sink_sndfile_get_samplerate(aubio_sink_sndfile_t *s) +uint_t aubio_sink_sndfile_get_samplerate(const aubio_sink_sndfile_t *s) { return s->samplerate; } -uint_t aubio_sink_sndfile_get_channels(aubio_sink_sndfile_t *s) +uint_t aubio_sink_sndfile_get_channels(const aubio_sink_sndfile_t *s) { return s->channels; } diff --git a/src/io/sink_sndfile.h b/src/io/sink_sndfile.h index e5e07b2e..977ff1d8 100644 --- a/src/io/sink_sndfile.h +++ b/src/io/sink_sndfile.h @@ -57,7 +57,7 @@ typedef struct _aubio_sink_sndfile_t aubio_sink_sndfile_t; been called. */ -aubio_sink_sndfile_t * new_aubio_sink_sndfile(char_t * uri, uint_t samplerate); +aubio_sink_sndfile_t * new_aubio_sink_sndfile(const char_t * uri, uint_t samplerate); /** @@ -101,7 +101,7 @@ uint_t aubio_sink_sndfile_preset_channels(aubio_sink_sndfile_t *s, uint_t channe \return samplerate, in Hz */ -uint_t aubio_sink_sndfile_get_samplerate(aubio_sink_sndfile_t *s); +uint_t aubio_sink_sndfile_get_samplerate(const aubio_sink_sndfile_t *s); /** @@ -111,7 +111,7 @@ uint_t aubio_sink_sndfile_get_samplerate(aubio_sink_sndfile_t *s); \return number of channels */ -uint_t aubio_sink_sndfile_get_channels(aubio_sink_sndfile_t *s); +uint_t aubio_sink_sndfile_get_channels(const aubio_sink_sndfile_t *s); /** diff --git a/src/io/sink_wavwrite.c b/src/io/sink_wavwrite.c index 7d832d0f..890a838f 100644 --- a/src/io/sink_wavwrite.c +++ b/src/io/sink_wavwrite.c @@ -77,7 +77,7 @@ unsigned char *write_little_endian (unsigned int s, unsigned char *str, unsigned return str; } -aubio_sink_wavwrite_t * new_aubio_sink_wavwrite(char_t * path, uint_t samplerate) { +aubio_sink_wavwrite_t * new_aubio_sink_wavwrite(const char_t * path, uint_t samplerate) { aubio_sink_wavwrite_t * s = AUBIO_NEW(aubio_sink_wavwrite_t); if (path == NULL) { @@ -142,12 +142,12 @@ uint_t aubio_sink_wavwrite_preset_channels(aubio_sink_wavwrite_t *s, uint_t chan return AUBIO_OK; } -uint_t aubio_sink_wavwrite_get_samplerate(aubio_sink_wavwrite_t *s) +uint_t aubio_sink_wavwrite_get_samplerate(const aubio_sink_wavwrite_t *s) { return s->samplerate; } -uint_t aubio_sink_wavwrite_get_channels(aubio_sink_wavwrite_t *s) +uint_t aubio_sink_wavwrite_get_channels(const aubio_sink_wavwrite_t *s) { return s->channels; } diff --git a/src/io/sink_wavwrite.h b/src/io/sink_wavwrite.h index 86b5819b..a84d03fd 100644 --- a/src/io/sink_wavwrite.h +++ b/src/io/sink_wavwrite.h @@ -57,7 +57,7 @@ typedef struct _aubio_sink_wavwrite_t aubio_sink_wavwrite_t; been called. */ -aubio_sink_wavwrite_t * new_aubio_sink_wavwrite(char_t * uri, uint_t samplerate); +aubio_sink_wavwrite_t * new_aubio_sink_wavwrite(const char_t * uri, uint_t samplerate); /** @@ -101,7 +101,7 @@ uint_t aubio_sink_wavwrite_preset_channels(aubio_sink_wavwrite_t *s, uint_t chan \return samplerate, in Hz */ -uint_t aubio_sink_wavwrite_get_samplerate(aubio_sink_wavwrite_t *s); +uint_t aubio_sink_wavwrite_get_samplerate(const aubio_sink_wavwrite_t *s); /** @@ -111,7 +111,7 @@ uint_t aubio_sink_wavwrite_get_samplerate(aubio_sink_wavwrite_t *s); \return number of channels */ -uint_t aubio_sink_wavwrite_get_channels(aubio_sink_wavwrite_t *s); +uint_t aubio_sink_wavwrite_get_channels(const aubio_sink_wavwrite_t *s); /** diff --git a/src/io/source.c b/src/io/source.c index 88e01800..162310c7 100644 --- a/src/io/source.c +++ b/src/io/source.c @@ -55,7 +55,7 @@ struct _aubio_source_t { del_aubio_source_t s_del; }; -aubio_source_t * new_aubio_source(char_t * uri, uint_t samplerate, uint_t hop_size) { +aubio_source_t * new_aubio_source(const char_t * uri, uint_t samplerate, uint_t hop_size) { aubio_source_t * s = AUBIO_NEW(aubio_source_t); #if HAVE_LIBAV s->source = (void *)new_aubio_source_avcodec(uri, samplerate, hop_size); diff --git a/src/io/source.h b/src/io/source.h index e31cc6af..18722b62 100644 --- a/src/io/source.h +++ b/src/io/source.h @@ -85,7 +85,7 @@ 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 hop_size); +aubio_source_t * new_aubio_source(const char_t * uri, uint_t samplerate, uint_t hop_size); /** diff --git a/src/io/source_apple_audio.c b/src/io/source_apple_audio.c index 0cf7d44b..077df18c 100644 --- a/src/io/source_apple_audio.c +++ b/src/io/source_apple_audio.c @@ -54,9 +54,9 @@ extern void freeAudioBufferList(AudioBufferList *bufferList); extern CFURLRef createURLFromPath(const char * path); char_t *getPrintableOSStatusError(char_t *str, OSStatus error); -uint_t aubio_source_apple_audio_open (aubio_source_apple_audio_t *s, char_t * path); +uint_t aubio_source_apple_audio_open (aubio_source_apple_audio_t *s, const char_t * path); -aubio_source_apple_audio_t * new_aubio_source_apple_audio(char_t * path, uint_t samplerate, uint_t block_size) +aubio_source_apple_audio_t * new_aubio_source_apple_audio(const char_t * path, uint_t samplerate, uint_t block_size) { aubio_source_apple_audio_t * s = AUBIO_NEW(aubio_source_apple_audio_t); @@ -91,7 +91,7 @@ beach: return NULL; } -uint_t aubio_source_apple_audio_open (aubio_source_apple_audio_t *s, char_t * path) +uint_t aubio_source_apple_audio_open (aubio_source_apple_audio_t *s, const char_t * path) { OSStatus err = noErr; UInt32 propSize; @@ -352,11 +352,11 @@ beach: return err; } -uint_t aubio_source_apple_audio_get_samplerate(aubio_source_apple_audio_t * s) { +uint_t aubio_source_apple_audio_get_samplerate(const aubio_source_apple_audio_t * s) { return s->samplerate; } -uint_t aubio_source_apple_audio_get_channels(aubio_source_apple_audio_t * s) { +uint_t aubio_source_apple_audio_get_channels(const aubio_source_apple_audio_t * s) { return s->channels; } diff --git a/src/io/source_apple_audio.h b/src/io/source_apple_audio.h index 61dbeba9..24cc46ca 100644 --- a/src/io/source_apple_audio.h +++ b/src/io/source_apple_audio.h @@ -57,7 +57,7 @@ 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 hop_size); +aubio_source_apple_audio_t * new_aubio_source_apple_audio(const char_t * uri, uint_t samplerate, uint_t hop_size); /** @@ -95,7 +95,7 @@ void aubio_source_apple_audio_do_multi(aubio_source_apple_audio_t * s, fmat_t * \return samplerate, in Hz */ -uint_t aubio_source_apple_audio_get_samplerate(aubio_source_apple_audio_t * s); +uint_t aubio_source_apple_audio_get_samplerate(const aubio_source_apple_audio_t * s); /** @@ -105,7 +105,7 @@ uint_t aubio_source_apple_audio_get_samplerate(aubio_source_apple_audio_t * s); \return number of channels */ -uint_t aubio_source_apple_audio_get_channels(aubio_source_apple_audio_t * s); +uint_t aubio_source_apple_audio_get_channels(const aubio_source_apple_audio_t * s); /** diff --git a/src/io/source_avcodec.c b/src/io/source_avcodec.c index 5cfd27de..db1b3b98 100644 --- a/src/io/source_avcodec.c +++ b/src/io/source_avcodec.c @@ -66,7 +66,7 @@ struct _aubio_source_avcodec_t { void aubio_source_avcodec_reset_resampler(aubio_source_avcodec_t * s, uint_t multi); void aubio_source_avcodec_readframe(aubio_source_avcodec_t *s, uint_t * read_samples); -aubio_source_avcodec_t * new_aubio_source_avcodec(char_t * path, uint_t samplerate, uint_t hop_size) { +aubio_source_avcodec_t * new_aubio_source_avcodec(const char_t * path, uint_t samplerate, uint_t hop_size) { aubio_source_avcodec_t * s = AUBIO_NEW(aubio_source_avcodec_t); int err; if (path == NULL) { @@ -369,11 +369,11 @@ void aubio_source_avcodec_do_multi(aubio_source_avcodec_t * s, fmat_t * read_dat *read = total_wrote; } -uint_t aubio_source_avcodec_get_samplerate(aubio_source_avcodec_t * s) { +uint_t aubio_source_avcodec_get_samplerate(const aubio_source_avcodec_t * s) { return s->samplerate; } -uint_t aubio_source_avcodec_get_channels(aubio_source_avcodec_t * s) { +uint_t aubio_source_avcodec_get_channels(const aubio_source_avcodec_t * s) { return s->input_channels; } diff --git a/src/io/source_avcodec.h b/src/io/source_avcodec.h index a5f6845f..79255915 100644 --- a/src/io/source_avcodec.h +++ b/src/io/source_avcodec.h @@ -56,7 +56,7 @@ typedef struct _aubio_source_avcodec_t aubio_source_avcodec_t; ::aubio_source_avcodec_get_samplerate. */ -aubio_source_avcodec_t * new_aubio_source_avcodec(char_t * uri, uint_t samplerate, uint_t hop_size); +aubio_source_avcodec_t * new_aubio_source_avcodec(const char_t * uri, uint_t samplerate, uint_t hop_size); /** @@ -94,7 +94,7 @@ void aubio_source_avcodec_do_multi(aubio_source_avcodec_t * s, fmat_t * read_to, \return samplerate, in Hz */ -uint_t aubio_source_avcodec_get_samplerate(aubio_source_avcodec_t * s); +uint_t aubio_source_avcodec_get_samplerate(const aubio_source_avcodec_t * s); /** @@ -104,7 +104,7 @@ uint_t aubio_source_avcodec_get_samplerate(aubio_source_avcodec_t * s); \return number of channels */ -uint_t aubio_source_avcodec_get_channels (aubio_source_avcodec_t * s); +uint_t aubio_source_avcodec_get_channels (const aubio_source_avcodec_t * s); /** diff --git a/src/io/source_sndfile.c b/src/io/source_sndfile.c index 7b1a253b..2a1772c0 100644 --- a/src/io/source_sndfile.c +++ b/src/io/source_sndfile.c @@ -67,7 +67,7 @@ struct _aubio_source_sndfile_t { smpl_t *scratch_data; }; -aubio_source_sndfile_t * new_aubio_source_sndfile(char_t * path, uint_t samplerate, uint_t hop_size) { +aubio_source_sndfile_t * new_aubio_source_sndfile(const char_t * path, uint_t samplerate, uint_t hop_size) { aubio_source_sndfile_t * s = AUBIO_NEW(aubio_source_sndfile_t); SF_INFO sfinfo; diff --git a/src/io/source_sndfile.h b/src/io/source_sndfile.h index 54a37afe..1ca8fbc5 100644 --- a/src/io/source_sndfile.h +++ b/src/io/source_sndfile.h @@ -56,7 +56,7 @@ 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 hop_size); +aubio_source_sndfile_t * new_aubio_source_sndfile(const char_t * uri, uint_t samplerate, uint_t hop_size); /** diff --git a/src/io/source_wavread.c b/src/io/source_wavread.c index e93bb025..d3230807 100644 --- a/src/io/source_wavread.c +++ b/src/io/source_wavread.c @@ -67,7 +67,7 @@ unsigned int read_little_endian (unsigned char *buf, unsigned int length) { return ret; } -aubio_source_wavread_t * new_aubio_source_wavread(char_t * path, uint_t samplerate, uint_t hop_size) { +aubio_source_wavread_t * new_aubio_source_wavread(const char_t * path, uint_t samplerate, uint_t hop_size) { aubio_source_wavread_t * s = AUBIO_NEW(aubio_source_wavread_t); size_t bytes_read = 0, bytes_expected = 44; unsigned char buf[5]; diff --git a/src/io/source_wavread.h b/src/io/source_wavread.h index efdb88d4..3eee3da0 100644 --- a/src/io/source_wavread.h +++ b/src/io/source_wavread.h @@ -61,7 +61,7 @@ typedef struct _aubio_source_wavread_t aubio_source_wavread_t; ::aubio_source_wavread_get_samplerate. */ -aubio_source_wavread_t * new_aubio_source_wavread(char_t * uri, uint_t samplerate, uint_t hop_size); +aubio_source_wavread_t * new_aubio_source_wavread(const char_t * uri, uint_t samplerate, uint_t hop_size); /** -- 2.11.0