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/inputPlugins/oggvorbis_plugin.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/inputPlugins/oggvorbis_plugin.c') diff --git a/src/inputPlugins/oggvorbis_plugin.c b/src/inputPlugins/oggvorbis_plugin.c index 0e1d523b9..bf2448605 100644 --- a/src/inputPlugins/oggvorbis_plugin.c +++ b/src/inputPlugins/oggvorbis_plugin.c @@ -278,7 +278,7 @@ static int oggvorbis_decode(struct decoder * decoder, InputStream * inStream) /*printf("new song!\n"); */ vorbis_info *vi = ov_info(&vf, -1); audio_format.channels = vi->channels; - audio_format.sampleRate = vi->rate; + audio_format.sample_rate = vi->rate; if (!initialized) { float total_time = ov_time_total(&vf, -1); if (total_time < 0) @@ -311,7 +311,7 @@ static int oggvorbis_decode(struct decoder * decoder, InputStream * inStream) decoder_data(decoder, inStream, inStream->seekable, chunk, chunkpos, - ov_pcm_tell(&vf) / audio_format.sampleRate, + ov_pcm_tell(&vf) / audio_format.sample_rate, bitRate, replayGainInfo); chunkpos = 0; if (decoder_get_command(decoder) == DECODE_COMMAND_STOP) -- cgit v1.2.3