various bugfixes for 0.10.4

git-svn-id: https://svn.musicpd.org/mpd/branches/branch-0.10.3@1143 09075e82-0dd4-0310-85a5-a0d7c8717e4f

6 files changed, 12 insertions, 10 deletions

diff --git a/configure.ac b/configure.ac
index 4916cd921..cc13ceb92 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl AC_INIT(src/main.c)
 dnl AM_INIT_AUTOMAKE(mpd, 0.10.0)
 
 AC_PREREQ(2.52)
-AC_INIT(mpd, 0.10.3, shank@mercury.chem.pitt.edu)
+AC_INIT(mpd, 0.10.4, shank@mercury.chem.pitt.edu)
 AM_INIT_AUTOMAKE($PACKAGE_NAME, $PACKAGE_VERSION)
 
 dnl MAD wants this stuff
@@ -69,7 +69,7 @@ AC_CHECK_LIB(nsl,gethostbyname,MPD_LIBS="$MPD_LIBS -lnsl",)
 
 AC_CHECK_LIB(m,exp,MPD_LIBS="$MPD_LIBS -lm",)
 
-AC_CHECK_HEADER(langinfo.h,[enable_langinfo=yes;AC_DEFINE(HAVE_LANGINFO,1,[Define if nl_langinfo.h is present])],enable_langinfo=no)
+AM_LANGINFO_CODESET
 AC_CHECK_HEADER(locale.h,[enable_locale=yes;AC_DEFINE(HAVE_LOCALE,1,[Define if locale.h is present])],enable_locale=no)
 
 if test x$enable_ipv6 = xyes; then
@@ -143,7 +143,7 @@ if test x$enable_iconv = xyes; then
 	CPPFLAGS=$CFLAGS
 	AC_CHECK_HEADER(iconv.h,MPD_CFLAGS="$MPD_CFLAGS $ICONV_CFLAGS",enable_iconv=no)
 	if test x$enable_iconv = xyes; then
-		AC_CHECK_LIB(iconv,iconv_open,MPD_LIBS="$MPD_LIBS $ICONV_LIBS",)
+		AC_CHECK_LIB(iconv,main,MPD_LIBS="$MPD_LIBS $ICONV_LIBS",)
 		AC_DEFINE(HAVE_ICONV,1,[Define to use iconv])
 	fi
 	CFLAGS=$oldcflags
@@ -494,7 +494,7 @@ else
 	echo "locale support ................disabled"
 fi
 
-if test x$enable_langinfo = xyes; then
+if test x$am_cv_langinfo_codeset = xyes; then
 	echo "langinfo support ..............enabled"
 else
 	echo "langinfo support ..............disabled"
diff --git a/src/flac_decode.c b/src/flac_decode.c
index afb5bcf74..5604799ad 100644
--- a/src/flac_decode.c
+++ b/src/flac_decode.c
@@ -116,7 +116,8 @@ void flacPlayFile(char *file, Buffer * cb, AudioFormat * af,
 			dc->seek = 0;
 		}
 	}
-	FLAC__file_decoder_process_until_end_of_file(flacDec);
+	/* I don't think we need this bit here! =shank */
+	/*FLAC__file_decoder_process_until_end_of_file(flacDec);*/
 	if(!dc->stop) {
 		flacPrintErroredState(FLAC__file_decoder_get_state(flacDec),
 				file);
diff --git a/src/interface.c b/src/interface.c
index 79445c380..f83765f0a 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -554,7 +554,7 @@ int interfacePrintWithFD(int fd,char * buffer) {
 
 	interface = interfaces+i;
 
-	while(buflen>0) {
+	while(buflen>0 && !interface->expired) {
 		copylen = buflen>
 			interface->outBufSize-interface->outBuflen?
 			interface->outBufSize-interface->outBuflen:
diff --git a/src/mp3_decode.c b/src/mp3_decode.c
index 618f6f5ef..90ec3b239 100644
--- a/src/mp3_decode.c
+++ b/src/mp3_decode.c
@@ -144,6 +144,7 @@ void initMp3DecodeData(mp3DecodeData * data) {
 	data->currentFrame = 0;
 	data->flush = 1;
 	mad_stream_init(&data->stream);
+	data->stream.options |= MAD_OPTION_IGNORECRC;
 	mad_frame_init(&data->frame);
 	mad_synth_init(&data->synth);
 	mad_timer_reset(&data->timer);
@@ -227,8 +228,8 @@ int decodeNextFrame(mp3DecodeData * data) {
 			return DECODE_BREAK;
 		}
 	}
-#ifdef HAVE_ID3TAG
 	if(mad_frame_decode(&data->frame,&data->stream)) {
+#ifdef HAVE_ID3TAG
 		if((data->stream).error==MAD_ERROR_LOSTSYNC) {
 			signed long tagsize = id3_tag_query(
 					(data->stream).this_frame,
diff --git a/src/path.c b/src/path.c
index e209b671d..93d1a8c68 100644
--- a/src/path.c
+++ b/src/path.c
@@ -25,7 +25,7 @@
 #include <string.h>
 
 #ifdef HAVE_LOCALE
-#ifdef HAVE_LANGINFO
+#ifdef HAVE_LANGINFO_CODESET
 #include <locale.h>
 #include <langinfo.h>
 #endif
@@ -94,7 +94,7 @@ void initPaths() {
 		charset = strdup(getConf()[CONF_FS_CHARSET]);
 	}
 #ifdef HAVE_LOCALE
-#ifdef HAVE_LANGINFO
+#ifdef HAVE_LANGINFO_CODESET
 	else if((originalLocale = setlocale(LC_CTYPE,NULL))) {
 		char * temp;
 		char * currentLocale;
diff --git a/src/player.c b/src/player.c
index e0628de6c..31a3bcf1a 100644
--- a/src/player.c
+++ b/src/player.c
@@ -390,7 +390,7 @@ int playerSeek(FILE * fp, char * utf8file, float time) {
 	if(strcmp(pc->file,file)!=0) {
 		decodeType = playerGetDecodeType(utf8file);
 		if(decodeType < 0) {
-			printf("%s unknown file type: %s\n",
+			myfprintf(fp,"%s unknown file type: %s\n",
 				COMMAND_RESPOND_ERROR, utf8file);
 			return -1;
 		}