diff options
| -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 75c52dab4..d14ae2bac 100644 --- a/src/inputPlugins/oggvorbis_plugin.c +++ b/src/inputPlugins/oggvorbis_plugin.c @@ -191,7 +191,7 @@ static MpdTag *oggCommentsParse(char **comments) static void putOggCommentsIntoOutputBuffer(char *streamName, char **comments, - float time) + float cur_time) { MpdTag *tag; @@ -207,7 +207,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 fd6b115f6..8a41924db 100644 --- a/src/outputBuffer.c +++ b/src/outputBuffer.c @@ -214,14 +214,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); |