From f7e97c9a893619c86c16cf1c5417d52de3d77a70 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 12 Apr 2008 04:15:30 +0000 Subject: constant pointers There were some const pointers missing in the previous const-cleanup patch. git-svn-id: https://svn.musicpd.org/mpd/trunk@7290 09075e82-0dd4-0310-85a5-a0d7c8717e4f --- src/inputPlugins/aac_plugin.c | 4 ++-- src/inputPlugins/mp4_plugin.c | 4 ++-- src/pcm_utils.c | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/inputPlugins/aac_plugin.c b/src/inputPlugins/aac_plugin.c index 7fa1ba332..5d8eb74f3 100644 --- a/src/inputPlugins/aac_plugin.c +++ b/src/inputPlugins/aac_plugin.c @@ -444,8 +444,8 @@ static MpdTag *aacTagDup(char *file) return ret; } -static char *aac_suffixes[] = { "aac", NULL }; -static char *aac_mimeTypes[] = { "audio/aac", "audio/aacp", NULL }; +static const char *aac_suffixes[] = { "aac", NULL }; +static const char *aac_mimeTypes[] = { "audio/aac", "audio/aacp", NULL }; InputPlugin aacPlugin = { "aac", diff --git a/src/inputPlugins/mp4_plugin.c b/src/inputPlugins/mp4_plugin.c index adaa644b9..7f7ff9433 100644 --- a/src/inputPlugins/mp4_plugin.c +++ b/src/inputPlugins/mp4_plugin.c @@ -414,8 +414,8 @@ static MpdTag *mp4TagDup(char *file) return ret; } -static char *mp4_suffixes[] = { "m4a", "mp4", NULL }; -static char *mp4_mimeTypes[] = { "audio/mp4", "audio/m4a", NULL }; +static const char *mp4_suffixes[] = { "m4a", "mp4", NULL }; +static const char *mp4_mimeTypes[] = { "audio/mp4", "audio/m4a", NULL }; InputPlugin mp4Plugin = { "mp4", diff --git a/src/pcm_utils.c b/src/pcm_utils.c index 6a97fff37..171b2288c 100644 --- a/src/pcm_utils.c +++ b/src/pcm_utils.c @@ -182,7 +182,7 @@ out: #ifdef HAVE_LIBSAMPLERATE static size_t pcm_convertSampleRate(mpd_sint8 channels, mpd_uint32 inSampleRate, - char *inBuffer, size_t inSize, + const char *inBuffer, size_t inSize, mpd_uint32 outSampleRate, char *outBuffer, size_t outSize, ConvState *convState) { @@ -297,7 +297,7 @@ static size_t pcm_convertSampleRate(mpd_sint8 channels, mpd_uint32 inSampleRate, } #endif /* !HAVE_LIBSAMPLERATE */ -static char *pcm_convertChannels(mpd_sint8 channels, char *inBuffer, +static char *pcm_convertChannels(mpd_sint8 channels, const char *inBuffer, size_t inSize, size_t *outSize) { static char *buf; @@ -351,8 +351,8 @@ static char *pcm_convertChannels(mpd_sint8 channels, char *inBuffer, return outBuffer; } -static char *pcm_convertTo16bit(mpd_sint8 bits, const char *inBuffer, - size_t inSize, size_t *outSize) +static const char *pcm_convertTo16bit(mpd_sint8 bits, const char *inBuffer, + size_t inSize, size_t *outSize) { static char *buf; static size_t len; @@ -393,7 +393,7 @@ size_t pcm_convertAudioFormat(AudioFormat * inFormat, const char *inBuffer, size_t inSize, AudioFormat * outFormat, char *outBuffer, ConvState *convState) { - char *buf; + const char *buf; size_t len; size_t outSize = pcm_sizeOfConvBuffer(inFormat, inSize, outFormat); -- cgit v1.2.3