diff options
| author | Eric Wong <normalperson@yhbt.net> | 2008-09-01 16:24:09 -0700 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2008-09-01 16:24:09 -0700 |
| commit | aa0755f53545fcf343f791f04760f6b934e022e4 (patch) | |
| tree | 854ac3fcee4908be82ca4566088d4eed5aad27aa | |
| parent | 191ab3301cff60a87375f74f0122a2098dbe4dcd (diff) | |
| download | mpd-aa0755f53545fcf343f791f04760f6b934e022e4.tar.gz mpd-aa0755f53545fcf343f791f04760f6b934e022e4.tar.xz mpd-aa0755f53545fcf343f791f04760f6b934e022e4.zip | |
Fix shadow warnings
| -rw-r--r-- | src/inputPlugins/oggvorbis_plugin.c | 4 | ||||
| -rw-r--r-- | src/outputBuffer.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/inputPlugins/oggvorbis_plugin.c b/src/inputPlugins/oggvorbis_plugin.c index cb6eed28e..70a0ce2d3 100644 --- a/src/inputPlugins/oggvorbis_plugin.c +++ b/src/inputPlugins/oggvorbis_plugin.c @@ -197,7 +197,7 @@ static MpdTag *oggCommentsParse(char **comments) static void putOggCommentsIntoOutputBuffer(char *streamName, char **comments, - float time) + float cur_time) { MpdTag *tag; @@ -213,7 +213,7 @@ static void putOggCommentsIntoOutputBuffer(char *streamName, addItemToMpdTag(tag, TAG_ITEM_NAME, streamName); } - metadata_pipe_send(tag, time); + metadata_pipe_send(tag, cur_time); } static float current_time(OggVorbis_File *vf) diff --git a/src/outputBuffer.c b/src/outputBuffer.c index a856c9a8c..0adf570f7 100644 --- a/src/outputBuffer.c +++ b/src/outputBuffer.c @@ -213,14 +213,14 @@ static void ob_seq_player_set(mpd_uint8 seq_num) cond_leave(&ob_seq_cond); } -static enum action_status ob_do_reset(int close) +static enum action_status ob_do_reset(int close_audio) { assert(pthread_equal(pthread_self(), ob.thread)); ob.elapsed_time = 0; ob.total_time = 0; reader_reset_buffer(); dropBufferedAudio(); - if (close) + if (close_audio) closeAudioDevice(); ob.xfade_state = XFADE_DISABLED; ob_seq_player_set(ob.seq_decoder); |