From dbd79a6b47d1cf09f3ccc8df5ef1a8e1dfedd853 Mon Sep 17 00:00:00 2001
From: Warren Dukes <warren.dukes@gmail.com>
Date: Sat, 19 Jun 2004 22:27:29 +0000
Subject: fix a few bugs in mp3_decode and minimize alsa underruns by playing
 silence when switch songs

git-svn-id: https://svn.musicpd.org/mpd/trunk@1572 09075e82-0dd4-0310-85a5-a0d7c8717e4f
---
 src/inputPlugins/mp3_plugin.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/inputPlugins/mp3_plugin.c')

diff --git a/src/inputPlugins/mp3_plugin.c b/src/inputPlugins/mp3_plugin.c
index 9c5eb824a..ef82c7122 100644
--- a/src/inputPlugins/mp3_plugin.c
+++ b/src/inputPlugins/mp3_plugin.c
@@ -575,12 +575,12 @@ int mp3Read(mp3DecodeData * data, OutputBuffer * cb, DecoderControl * dc) {
                                                 MP3_DATA_OUTPUT_BUFFER_SIZE,
                                                 data->elapsedTime,
                                                 data->bitRate/1000);
+                                data->outputPtr = data->outputBuffer;
+
                                 if(ret == OUTPUT_BUFFER_DC_STOP) {
                                         return DECODE_BREAK;
                                 }
 
-                                data->outputPtr = data->outputBuffer;
-
                                 if(ret == OUTPUT_BUFFER_DC_SEEK) break;
 			}
 		}
@@ -640,7 +640,7 @@ void initAudioFormatFromMp3DecodeData(mp3DecodeData * data, AudioFormat * af) {
 
 int mp3_decode(OutputBuffer * cb, DecoderControl * dc, InputStream * inStream) {
 	mp3DecodeData data;
-	MpdTag * tag;
+	MpdTag * tag = NULL;
 
 	if(openMp3FromInputStream(inStream, &data, dc, &tag) < 0) {
 		closeInputStream(inStream);
@@ -664,7 +664,6 @@ int mp3_decode(OutputBuffer * cb, DecoderControl * dc, InputStream * inStream) {
 		if(tag) freeMpdTag(tag);
 		tag = newMpdTag();
 		tag->title = strdup(inStream->metaTitle);
-		/* free ths now, so we know we are done with it */
 		free(inStream->metaTitle);
 		inStream->metaTitle = NULL;
 		if(inStream->metaName) {
@@ -694,7 +693,7 @@ int mp3_decode(OutputBuffer * cb, DecoderControl * dc, InputStream * inStream) {
 
 	while(mp3Read(&data,cb,dc)!=DECODE_BREAK);
 	/* send last little bit if not dc->stop */
-	if(data.outputPtr!=data.outputBuffer && data.flush)  {
+	if(!dc->stop && data.outputPtr!=data.outputBuffer && data.flush)  {
         	sendDataToOutputBuffer(cb, NULL, dc, 
                                 data.inStream->seekable,
                                 data.outputBuffer,
-- 
cgit v1.2.3