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_jack.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/audioOutputs/audioOutput_jack.c') diff --git a/src/audioOutputs/audioOutput_jack.c b/src/audioOutputs/audioOutput_jack.c index f26dfcf7a..8a2cb6cdc 100644 --- a/src/audioOutputs/audioOutput_jack.c +++ b/src/audioOutputs/audioOutput_jack.c @@ -126,7 +126,7 @@ static int srate(mpd_unused jack_nframes_t rate, void *data) JackData *jd = (JackData *)data; struct audio_format *audioFormat = jd->audio_format; - audioFormat->sampleRate = (int)jack_get_sample_rate(jd->client); + audioFormat->sample_rate = (int)jack_get_sample_rate(jd->client); return 0; } @@ -188,13 +188,13 @@ static void shutdown_callback(void *arg) static void set_audioformat(JackData *jd, struct audio_format *audioFormat) { - audioFormat->sampleRate = (int) jack_get_sample_rate(jd->client); - DEBUG("samplerate = %d\n", audioFormat->sampleRate); + audioFormat->sample_rate = jack_get_sample_rate(jd->client); + DEBUG("samplerate = %u\n", audioFormat->sample_rate); audioFormat->channels = 2; audioFormat->bits = 16; jd->bps = audioFormat->channels * sizeof(jack_default_audio_sample_t) - * audioFormat->sampleRate; + * audioFormat->sample_rate; } static void error_callback(const char *msg) -- cgit v1.2.3