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/audioOutputs/audioOutput_osx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/audioOutputs/audioOutput_osx.c') diff --git a/src/audioOutputs/audioOutput_osx.c b/src/audioOutputs/audioOutput_osx.c index 9071ed6c9..1fc0a5d9e 100644 --- a/src/audioOutputs/audioOutput_osx.c +++ b/src/audioOutputs/audioOutput_osx.c @@ -259,7 +259,7 @@ static int osx_openDevice(struct audio_output *audioOutput, return -1; } - streamDesc.mSampleRate = audioFormat->sampleRate; + streamDesc.mSampleRate = audioFormat->sample_rate; streamDesc.mFormatID = kAudioFormatLinearPCM; streamDesc.mFormatFlags = kLinearPCMFormatFlagIsSignedInteger; #ifdef WORDS_BIGENDIAN @@ -283,7 +283,7 @@ static int osx_openDevice(struct audio_output *audioOutput, } /* create a buffer of 1s */ - od->bufferSize = (audioFormat->sampleRate) * + od->bufferSize = (audioFormat->sample_rate) * (audioFormat->bits >> 3) * (audioFormat->channels); od->buffer = xrealloc(od->buffer, od->bufferSize); -- cgit v1.2.3