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/inputPlugins/mpc_plugin.c | |
| parent | 6101dc6c768b09dbcdc1840a84b619a5a6a20129 (diff) | |
| download | mpd-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 'src/inputPlugins/mpc_plugin.c')
| -rw-r--r-- | src/inputPlugins/mpc_plugin.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/inputPlugins/mpc_plugin.c b/src/inputPlugins/mpc_plugin.c index ca37333d3..f74dc8ddc 100644 --- a/src/inputPlugins/mpc_plugin.c +++ b/src/inputPlugins/mpc_plugin.c @@ -154,7 +154,7 @@ static int mpc_decode(struct decoder * mpd_decoder, InputStream * inStream) audio_format.bits = 16; audio_format.channels = info.channels; - audio_format.sampleRate = info.sample_freq; + audio_format.sample_rate = info.sample_freq; replayGainInfo = newReplayGainInfo(); replayGainInfo->albumGain = info.gain_album * 0.01; @@ -168,7 +168,7 @@ static int mpc_decode(struct decoder * mpd_decoder, InputStream * inStream) while (!eof) { if (decoder_get_command(mpd_decoder) == DECODE_COMMAND_SEEK) { samplePos = decoder_seek_where(mpd_decoder) * - audio_format.sampleRate; + audio_format.sample_rate; if (mpc_decoder_seek_sample(&decoder, samplePos)) { decoder_clear(mpd_decoder); s16 = (int16_t *) chunk; @@ -201,10 +201,10 @@ static int mpc_decode(struct decoder * mpd_decoder, InputStream * inStream) if (chunkpos >= MPC_CHUNK_SIZE) { total_time = ((float)samplePos) / - audio_format.sampleRate; + audio_format.sample_rate; bitRate = vbrUpdateBits * - audio_format.sampleRate / 1152 / 1000; + audio_format.sample_rate / 1152 / 1000; decoder_data(mpd_decoder, inStream, inStream->seekable, @@ -224,10 +224,10 @@ static int mpc_decode(struct decoder * mpd_decoder, InputStream * inStream) if (decoder_get_command(mpd_decoder) != DECODE_COMMAND_STOP && chunkpos > 0) { - total_time = ((float)samplePos) / audio_format.sampleRate; + total_time = ((float)samplePos) / audio_format.sample_rate; bitRate = - vbrUpdateBits * audio_format.sampleRate / 1152 / 1000; + vbrUpdateBits * audio_format.sample_rate / 1152 / 1000; decoder_data(mpd_decoder, NULL, inStream->seekable, chunk, chunkpos, total_time, bitRate, |