diff options
| author | Max Kellermann <max@duempel.org> | 2008-10-10 14:40:54 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2008-10-10 14:40:54 +0200 |
| commit | de2cb3f37568e7680549057f8d7b6d748c388480 (patch) | |
| tree | 46f9f43a1f83b49945c8a4fc77f933fad9230e01 /src/audio.c | |
| parent | 6101dc6c768b09dbcdc1840a84b619a5a6a20129 (diff) | |
audio_format: renamed sampleRate to sample_rate
The last bit of CamelCase in audio_format.h. Additionally, rename a
bunch of local variables.
Diffstat (limited to 'src/audio.c')
| -rw-r--r-- | src/audio.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/audio.c b/src/audio.c index bda0107ff..a4d4e3ea4 100644 --- a/src/audio.c +++ b/src/audio.c @@ -137,16 +137,16 @@ int parseAudioConfig(struct audio_format *audioFormat, char *conf) memset(audioFormat, 0, sizeof(*audioFormat)); - audioFormat->sampleRate = strtol(conf, &test, 10); + audioFormat->sample_rate = strtol(conf, &test, 10); if (*test != ':') { ERROR("error parsing audio output format: %s\n", conf); return -1; } - if (audioFormat->sampleRate <= 0) { - ERROR("sample rate %i is not >= 0\n", - (int)audioFormat->sampleRate); + if (audioFormat->sample_rate <= 0) { + ERROR("sample rate %u is not >= 0\n", + audioFormat->sample_rate); return -1; } @@ -315,7 +315,7 @@ static int flushAudioBuffer(void) static size_t audio_buffer_size(const struct audio_format *af) { - return (af->bits >> 3) * af->channels * (af->sampleRate >> 5); + return (af->bits >> 3) * af->channels * (af->sample_rate >> 5); } static void audio_buffer_resize(size_t size) |