diff options
| author | Eric Wong <normalperson@yhbt.net> | 2008-04-12 04:16:32 +0000 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2008-04-12 04:16:32 +0000 |
| commit | f275a1a1abf353873ce85c5c66b2be7c51d317a5 (patch) | |
| tree | d4be50e4a404dbcf7d6ba405ad3b7e91671c4ad0 /src/inputPlugins/wavpack_plugin.c | |
| parent | 4e4441fd32e694753824a543c050e5d3c0b49a5a (diff) | |
| download | mpd-f275a1a1abf353873ce85c5c66b2be7c51d317a5.tar.gz mpd-f275a1a1abf353873ce85c5c66b2be7c51d317a5.tar.xz mpd-f275a1a1abf353873ce85c5c66b2be7c51d317a5.zip | |
Fix a few more warnings from -Wshadow
git-svn-id: https://svn.musicpd.org/mpd/trunk@7300 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to 'src/inputPlugins/wavpack_plugin.c')
| -rw-r--r-- | src/inputPlugins/wavpack_plugin.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/inputPlugins/wavpack_plugin.c b/src/inputPlugins/wavpack_plugin.c index 527e60a56..41753c62f 100644 --- a/src/inputPlugins/wavpack_plugin.c +++ b/src/inputPlugins/wavpack_plugin.c @@ -133,7 +133,7 @@ static void wavpack_decode(OutputBuffer *cb, DecoderControl *dc, { void (*format_samples)(int Bps, void *buffer, uint32_t samcnt); char chunk[CHUNK_SIZE]; - float time; + float file_time; int samplesreq, samplesgot; int allsamples; int position, outsamplesize; @@ -204,14 +204,16 @@ static void wavpack_decode(OutputBuffer *cb, DecoderControl *dc, int bitrate = (int)(WavpackGetInstantBitrate(wpc) / 1000 + 0.5); position += samplesgot; - time = (float)position / dc->audioFormat.sampleRate; + file_time = (float)position / + dc->audioFormat.sampleRate; format_samples(Bps, chunk, samplesgot * dc->audioFormat.channels); sendDataToOutputBuffer(cb, NULL, dc, 0, chunk, samplesgot * outsamplesize, - time, bitrate, replayGainInfo); + file_time, bitrate, + replayGainInfo); } } while (samplesgot == samplesreq); |