From de2cb3f37568e7680549057f8d7b6d748c388480 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 10 Oct 2008 14:40:54 +0200 Subject: audio_format: renamed sampleRate to sample_rate The last bit of CamelCase in audio_format.h. Additionally, rename a bunch of local variables. --- src/pcm_utils.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/pcm_utils.c') diff --git a/src/pcm_utils.c b/src/pcm_utils.c index 9274c2eb6..eb3d4b124 100644 --- a/src/pcm_utils.c +++ b/src/pcm_utils.c @@ -503,13 +503,13 @@ size_t pcm_convertAudioFormat(const struct audio_format *inFormat, exit(EXIT_FAILURE); } - if (inFormat->sampleRate == outFormat->sampleRate) { + if (inFormat->sample_rate == outFormat->sample_rate) { assert(outSize >= len); memcpy(outBuffer, buf, len); } else { len = pcm_convertSampleRate(outFormat->channels, - inFormat->sampleRate, buf, len, - outFormat->sampleRate, outBuffer, + inFormat->sample_rate, buf, len, + outFormat->sample_rate, outBuffer, outSize, convState); if (len == 0) exit(EXIT_FAILURE); @@ -521,8 +521,8 @@ size_t pcm_convertAudioFormat(const struct audio_format *inFormat, size_t pcm_sizeOfConvBuffer(const struct audio_format *inFormat, size_t inSize, const struct audio_format *outFormat) { - const double ratio = (double)outFormat->sampleRate / - (double)inFormat->sampleRate; + const double ratio = (double)outFormat->sample_rate / + (double)inFormat->sample_rate; const int shift = 2 * outFormat->channels; size_t outSize = inSize; -- cgit v1.2.3