aboutsummaryrefslogtreecommitdiffstats
path: root/src/audioOutputs/audioOutput_jack.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-10-10 14:40:54 +0200
committerMax Kellermann <max@duempel.org>2008-10-10 14:40:54 +0200
commitde2cb3f37568e7680549057f8d7b6d748c388480 (patch)
tree46f9f43a1f83b49945c8a4fc77f933fad9230e01 /src/audioOutputs/audioOutput_jack.c
parent6101dc6c768b09dbcdc1840a84b619a5a6a20129 (diff)
downloadmpd-de2cb3f37568e7680549057f8d7b6d748c388480.tar.gz
mpd-de2cb3f37568e7680549057f8d7b6d748c388480.tar.xz
mpd-de2cb3f37568e7680549057f8d7b6d748c388480.zip
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 '')
-rw-r--r--src/audioOutputs/audioOutput_jack.c8
1 files changed, 4 insertions, 4 deletions
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)