Skip to content

M
mpd
Commit 57a230e3 authored by Led's avatar Led
Browse files
Options

0.10.4-rc1

parent da2f98a5
Hide whitespace changes
Inline Side-by-side
Showing with 88 additions and 148 deletions
ChangeLog
View file @ 57a230e3
ver 0.10.4 (2004/5/26)
1) Fix configure problems on OpenBSD with langinfo and iconv
2) Fix an infinte loop when writing to an interface and it has expired
3) Fix a segfault in decoding flac's
4) Ingore CRC stuff in mp3's since some encoders did not compute the CRC correctly
ver 0.10.3 (2004/4/2) ver 0.10.3 (2004/4/2)
1) Fix a segfault when a blanck line is sent from a client 1) Fix a segfault when a blanck line is sent from a client
2) Fix for loading playlists on platforms where char is unsigned 2) Fix for loading playlists on platforms where char is unsigned
......
aclocal.m4
View file @ 57a230e3
...@@ -4475,6 +4475,30 @@ AC_DEFUN([AM_CONFIG_HEADER], ...@@ -4475,6 +4475,30 @@ AC_DEFUN([AM_CONFIG_HEADER],
[AC_FOREACH([_AM_File], [$1], [_AM_CONFIG_HEADER(_AM_File, [$2], [$3])]) [AC_FOREACH([_AM_File], [$1], [_AM_CONFIG_HEADER(_AM_File, [$2], [$3])])
])# AM_CONFIG_HEADER ])# AM_CONFIG_HEADER
# codeset.m4 serial AM1 (gettext-0.10.40)
dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
dnl that contains a configuration script generated by Autoconf, under
dnl the same distribution terms as the rest of that program.
dnl From Bruno Haible.
AC_DEFUN([AM_LANGINFO_CODESET],
[
AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
[AC_TRY_LINK([#include <langinfo.h>],
[char* cs = nl_langinfo(CODESET);],
am_cv_langinfo_codeset=yes,
am_cv_langinfo_codeset=no)
])
if test $am_cv_langinfo_codeset = yes; then
AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
[Define if you have <langinfo.h> and nl_langinfo(CODESET).])
fi
])
# ao.m4 # ao.m4
# Configure paths for libao # Configure paths for libao
# Jack Moffitt <jack@icecast.org> 10-21-2000 # Jack Moffitt <jack@icecast.org> 10-21-2000
......
config.h.in
View file @ 57a230e3
...@@ -46,8 +46,8 @@ ...@@ -46,8 +46,8 @@
/* Define if IPv6 support present */ /* Define if IPv6 support present */
#undef HAVE_IPV6 #undef HAVE_IPV6
/* Define if nl_langinfo.h is present */ /* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
#undef HAVE_LANGINFO #undef HAVE_LANGINFO_CODESET
/* Define to 1 if you have the `FLAC' library (-lFLAC). */ /* Define to 1 if you have the `FLAC' library (-lFLAC). */
#undef HAVE_LIBFLAC #undef HAVE_LIBFLAC
......
configure
View file @ 57a230e3
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.57 for mpd 0.10.3. # Generated by GNU Autoconf 2.57 for mpd 0.10.4.
# #
# Report bugs to <shank@mercury.chem.pitt.edu>. # Report bugs to <shank@mercury.chem.pitt.edu>.
# #
...@@ -427,8 +427,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} ...@@ -427,8 +427,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package. # Identity of this package.
PACKAGE_NAME='mpd' PACKAGE_NAME='mpd'
PACKAGE_TARNAME='mpd' PACKAGE_TARNAME='mpd'
PACKAGE_VERSION='0.10.3' PACKAGE_VERSION='0.10.4'
PACKAGE_STRING='mpd 0.10.3' PACKAGE_STRING='mpd 0.10.4'
PACKAGE_BUGREPORT='shank@mercury.chem.pitt.edu' PACKAGE_BUGREPORT='shank@mercury.chem.pitt.edu'
# Factoring default headers for most tests. # Factoring default headers for most tests.
...@@ -939,7 +939,7 @@ if test "$ac_init_help" = "long"; then ...@@ -939,7 +939,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF cat <<_ACEOF
\`configure' configures mpd 0.10.3 to adapt to many kinds of systems. \`configure' configures mpd 0.10.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
...@@ -1005,7 +1005,7 @@ fi ...@@ -1005,7 +1005,7 @@ fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
short | recursive ) echo "Configuration of mpd 0.10.3:";; short | recursive ) echo "Configuration of mpd 0.10.4:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
...@@ -1142,7 +1142,7 @@ fi ...@@ -1142,7 +1142,7 @@ fi
test -n "$ac_init_help" && exit 0 test -n "$ac_init_help" && exit 0
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
mpd configure 0.10.3 mpd configure 0.10.4
generated by GNU Autoconf 2.57 generated by GNU Autoconf 2.57
Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
...@@ -1157,7 +1157,7 @@ cat >&5 <<_ACEOF ...@@ -1157,7 +1157,7 @@ cat >&5 <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. running configure, to aid debugging if configure makes a mistake.
It was created by mpd $as_me 0.10.3, which was It was created by mpd $as_me 0.10.4, which was
generated by GNU Autoconf 2.57. Invocation command line was generated by GNU Autoconf 2.57. Invocation command line was
$ $0 $@ $ $0 $@
...@@ -10037,145 +10037,59 @@ if test $ac_cv_lib_m_exp = yes; then ...@@ -10037,145 +10037,59 @@ if test $ac_cv_lib_m_exp = yes; then
fi fi
if test "${ac_cv_header_langinfo_h+set}" = set; then
echo "$as_me:$LINENO: checking for langinfo.h" >&5 echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5
echo $ECHO_N "checking for langinfo.h... $ECHO_C" >&6 echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
if test "${ac_cv_header_langinfo_h+set}" = set; then if test "${am_cv_langinfo_codeset+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
fi
echo "$as_me:$LINENO: result: $ac_cv_header_langinfo_h" >&5
echo "${ECHO_T}$ac_cv_header_langinfo_h" >&6
else else
# Is the header compilable? cat >conftest.$ac_ext <<_ACEOF
echo "$as_me:$LINENO: checking langinfo.h usability" >&5
echo $ECHO_N "checking langinfo.h usability... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure" #line $LINENO "configure"
/* confdefs.h. */ /* confdefs.h. */
_ACEOF _ACEOF
cat confdefs.h >>conftest.$ac_ext cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */ /* end confdefs.h. */
$ac_includes_default
#include <langinfo.h> #include <langinfo.h>
int
main ()
{
char* cs = nl_langinfo(CODESET);
;
return 0;
}
_ACEOF _ACEOF
rm -f conftest.$ac_objext rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_compile) 2>&5 (eval $ac_link) 2>&5
ac_status=$? ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && (exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext' { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5 (eval $ac_try) 2>&5
ac_status=$? ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then (exit $ac_status); }; }; then
ac_header_compiler=yes am_cv_langinfo_codeset=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_compiler=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
echo "${ECHO_T}$ac_header_compiler" >&6
# Is the header present?
echo "$as_me:$LINENO: checking langinfo.h presence" >&5
echo $ECHO_N "checking langinfo.h presence... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <langinfo.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
else
ac_cpp_err=
fi
else
ac_cpp_err=yes
fi
if test -z "$ac_cpp_err"; then
ac_header_preproc=yes
else else
echo "$as_me: failed program was:" >&5 echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5 sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no am_cv_langinfo_codeset=no
fi fi
rm -f conftest.err conftest.$ac_ext rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
echo "${ECHO_T}$ac_header_preproc" >&6
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc in
yes:no )
{ echo "$as_me:$LINENO: WARNING: langinfo.h: accepted by the compiler, rejected by the preprocessor!" >&5
echo "$as_me: WARNING: langinfo.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
{ echo "$as_me:$LINENO: WARNING: langinfo.h: proceeding with the preprocessor's result" >&5
echo "$as_me: WARNING: langinfo.h: proceeding with the preprocessor's result" >&2;}
(
cat <<\_ASBOX
## ------------------------------------ ##
## Report this to bug-autoconf@gnu.org. ##
## ------------------------------------ ##
_ASBOX
) |
sed "s/^/$as_me: WARNING: /" >&2
;;
no:yes )
{ echo "$as_me:$LINENO: WARNING: langinfo.h: present but cannot be compiled" >&5
echo "$as_me: WARNING: langinfo.h: present but cannot be compiled" >&2;}
{ echo "$as_me:$LINENO: WARNING: langinfo.h: check for missing prerequisite headers?" >&5
echo "$as_me: WARNING: langinfo.h: check for missing prerequisite headers?" >&2;}
{ echo "$as_me:$LINENO: WARNING: langinfo.h: proceeding with the preprocessor's result" >&5
echo "$as_me: WARNING: langinfo.h: proceeding with the preprocessor's result" >&2;}
(
cat <<\_ASBOX
## ------------------------------------ ##
## Report this to bug-autoconf@gnu.org. ##
## ------------------------------------ ##
_ASBOX
) |
sed "s/^/$as_me: WARNING: /" >&2
;;
esac
echo "$as_me:$LINENO: checking for langinfo.h" >&5
echo $ECHO_N "checking for langinfo.h... $ECHO_C" >&6
if test "${ac_cv_header_langinfo_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_cv_header_langinfo_h=$ac_header_preproc
fi fi
echo "$as_me:$LINENO: result: $ac_cv_header_langinfo_h" >&5 echo "$as_me:$LINENO: result: $am_cv_langinfo_codeset" >&5
echo "${ECHO_T}$ac_cv_header_langinfo_h" >&6 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
if test $am_cv_langinfo_codeset = yes; then
fi
if test $ac_cv_header_langinfo_h = yes; then
enable_langinfo=yes;
cat >>confdefs.h <<\_ACEOF cat >>confdefs.h <<\_ACEOF
#define HAVE_LANGINFO 1 #define HAVE_LANGINFO_CODESET 1
_ACEOF _ACEOF
else fi
enable_langinfo=no
fi
if test "${ac_cv_header_locale_h+set}" = set; then if test "${ac_cv_header_locale_h+set}" = set; then
echo "$as_me:$LINENO: checking for locale.h" >&5 echo "$as_me:$LINENO: checking for locale.h" >&5
...@@ -11097,9 +11011,9 @@ fi ...@@ -11097,9 +11011,9 @@ fi
if test x$enable_iconv = xyes; then if test x$enable_iconv = xyes; then
echo "$as_me:$LINENO: checking for iconv_open in -liconv" >&5 echo "$as_me:$LINENO: checking for main in -liconv" >&5
echo $ECHO_N "checking for iconv_open in -liconv... $ECHO_C" >&6 echo $ECHO_N "checking for main in -liconv... $ECHO_C" >&6
if test "${ac_cv_lib_iconv_iconv_open+set}" = set; then if test "${ac_cv_lib_iconv_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
ac_check_lib_save_LIBS=$LIBS ac_check_lib_save_LIBS=$LIBS
...@@ -11112,17 +11026,11 @@ cat confdefs.h >>conftest.$ac_ext ...@@ -11112,17 +11026,11 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */ /* end confdefs.h. */
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char iconv_open ();
int int
main () main ()
{ {
iconv_open (); main ();
; ;
return 0; return 0;
} }
...@@ -11139,19 +11047,19 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ...@@ -11139,19 +11047,19 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
ac_status=$? ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then (exit $ac_status); }; }; then
ac_cv_lib_iconv_iconv_open=yes ac_cv_lib_iconv_main=yes
else else
echo "$as_me: failed program was:" >&5 echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5 sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_iconv_iconv_open=no ac_cv_lib_iconv_main=no
fi fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS LIBS=$ac_check_lib_save_LIBS
fi fi
echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_iconv_open" >&5 echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_main" >&5
echo "${ECHO_T}$ac_cv_lib_iconv_iconv_open" >&6 echo "${ECHO_T}$ac_cv_lib_iconv_main" >&6
if test $ac_cv_lib_iconv_iconv_open = yes; then if test $ac_cv_lib_iconv_main = yes; then
MPD_LIBS="$MPD_LIBS $ICONV_LIBS" MPD_LIBS="$MPD_LIBS $ICONV_LIBS"
fi fi
...@@ -13943,7 +13851,7 @@ _ASBOX ...@@ -13943,7 +13851,7 @@ _ASBOX
} >&5 } >&5
cat >&5 <<_CSEOF cat >&5 <<_CSEOF
This file was extended by mpd $as_me 0.10.3, which was This file was extended by mpd $as_me 0.10.4, which was
generated by GNU Autoconf 2.57. Invocation command line was generated by GNU Autoconf 2.57. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
...@@ -14006,7 +13914,7 @@ _ACEOF ...@@ -14006,7 +13914,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\ ac_cs_version="\\
mpd config.status 0.10.3 mpd config.status 0.10.4
configured by $0, generated by GNU Autoconf 2.57, configured by $0, generated by GNU Autoconf 2.57,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
...@@ -15068,7 +14976,7 @@ else ...@@ -15068,7 +14976,7 @@ else
echo "locale support ................disabled" echo "locale support ................disabled"
fi fi
if test x$enable_langinfo = xyes; then if test x$am_cv_langinfo_codeset = xyes; then
echo "langinfo support ..............enabled" echo "langinfo support ..............enabled"
else else
echo "langinfo support ..............disabled" echo "langinfo support ..............disabled"
......
configure.ac
View file @ 57a230e3
...@@ -2,7 +2,7 @@ dnl AC_INIT(src/main.c) ...@@ -2,7 +2,7 @@ dnl AC_INIT(src/main.c)
dnl AM_INIT_AUTOMAKE(mpd, 0.10.0) dnl AM_INIT_AUTOMAKE(mpd, 0.10.0)
AC_PREREQ(2.52) 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) AM_INIT_AUTOMAKE($PACKAGE_NAME, $PACKAGE_VERSION)
dnl MAD wants this stuff dnl MAD wants this stuff
...@@ -69,7 +69,7 @@ AC_CHECK_LIB(nsl,gethostbyname,MPD_LIBS="$MPD_LIBS -lnsl",) ...@@ -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_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) 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 if test x$enable_ipv6 = xyes; then
...@@ -143,7 +143,7 @@ if test x$enable_iconv = xyes; then ...@@ -143,7 +143,7 @@ if test x$enable_iconv = xyes; then
CPPFLAGS=$CFLAGS CPPFLAGS=$CFLAGS
AC_CHECK_HEADER(iconv.h,MPD_CFLAGS="$MPD_CFLAGS $ICONV_CFLAGS",enable_iconv=no) AC_CHECK_HEADER(iconv.h,MPD_CFLAGS="$MPD_CFLAGS $ICONV_CFLAGS",enable_iconv=no)
if test x$enable_iconv = xyes; then 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]) AC_DEFINE(HAVE_ICONV,1,[Define to use iconv])
fi fi
CFLAGS=$oldcflags CFLAGS=$oldcflags
...@@ -494,7 +494,7 @@ else ...@@ -494,7 +494,7 @@ else
echo "locale support ................disabled" echo "locale support ................disabled"
fi fi
if test x$enable_langinfo = xyes; then if test x$am_cv_langinfo_codeset = xyes; then
echo "langinfo support ..............enabled" echo "langinfo support ..............enabled"
else else
echo "langinfo support ..............disabled" echo "langinfo support ..............disabled"
......
src/flac_decode.c
View file @ 57a230e3
...@@ -116,7 +116,8 @@ void flacPlayFile(char *file, Buffer * cb, AudioFormat * af, ...@@ -116,7 +116,8 @@ void flacPlayFile(char *file, Buffer * cb, AudioFormat * af,
dc->seek = 0; 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) { if(!dc->stop) {
flacPrintErroredState(FLAC__file_decoder_get_state(flacDec), flacPrintErroredState(FLAC__file_decoder_get_state(flacDec),
file); file);
......
src/interface.c
View file @ 57a230e3
...@@ -554,7 +554,7 @@ int interfacePrintWithFD(int fd,char * buffer) { ...@@ -554,7 +554,7 @@ int interfacePrintWithFD(int fd,char * buffer) {
interface = interfaces+i; interface = interfaces+i;
while(buflen>0) { while(buflen>0 && !interface->expired) {
copylen = buflen> copylen = buflen>
interface->outBufSize-interface->outBuflen? interface->outBufSize-interface->outBuflen?
interface->outBufSize-interface->outBuflen: interface->outBufSize-interface->outBuflen:
......
src/mp3_decode.c
View file @ 57a230e3
...@@ -144,6 +144,7 @@ void initMp3DecodeData(mp3DecodeData * data) { ...@@ -144,6 +144,7 @@ void initMp3DecodeData(mp3DecodeData * data) {
data->currentFrame = 0; data->currentFrame = 0;
data->flush = 1; data->flush = 1;
mad_stream_init(&data->stream); mad_stream_init(&data->stream);
data->stream.options |= MAD_OPTION_IGNORECRC;
mad_frame_init(&data->frame); mad_frame_init(&data->frame);
mad_synth_init(&data->synth); mad_synth_init(&data->synth);
mad_timer_reset(&data->timer); mad_timer_reset(&data->timer);
...@@ -227,8 +228,8 @@ int decodeNextFrame(mp3DecodeData * data) { ...@@ -227,8 +228,8 @@ int decodeNextFrame(mp3DecodeData * data) {
return DECODE_BREAK; return DECODE_BREAK;
} }
} }
#ifdef HAVE_ID3TAG
if(mad_frame_decode(&data->frame,&data->stream)) { if(mad_frame_decode(&data->frame,&data->stream)) {
#ifdef HAVE_ID3TAG
if((data->stream).error==MAD_ERROR_LOSTSYNC) { if((data->stream).error==MAD_ERROR_LOSTSYNC) {
signed long tagsize = id3_tag_query( signed long tagsize = id3_tag_query(
(data->stream).this_frame, (data->stream).this_frame,
......
src/path.c
View file @ 57a230e3
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include <string.h> #include <string.h>
#ifdef HAVE_LOCALE #ifdef HAVE_LOCALE
#ifdef HAVE_LANGINFO #ifdef HAVE_LANGINFO_CODESET
#include <locale.h> #include <locale.h>
#include <langinfo.h> #include <langinfo.h>
#endif #endif
...@@ -94,7 +94,7 @@ void initPaths() { ...@@ -94,7 +94,7 @@ void initPaths() {
charset = strdup(getConf()[CONF_FS_CHARSET]); charset = strdup(getConf()[CONF_FS_CHARSET]);
} }
#ifdef HAVE_LOCALE #ifdef HAVE_LOCALE
#ifdef HAVE_LANGINFO #ifdef HAVE_LANGINFO_CODESET
else if((originalLocale = setlocale(LC_CTYPE,NULL))) { else if((originalLocale = setlocale(LC_CTYPE,NULL))) {
char * temp; char * temp;
char * currentLocale; char * currentLocale;
......
src/player.c
View file @ 57a230e3
...@@ -390,7 +390,7 @@ int playerSeek(FILE * fp, char * utf8file, float time) { ...@@ -390,7 +390,7 @@ int playerSeek(FILE * fp, char * utf8file, float time) {
if(strcmp(pc->file,file)!=0) { if(strcmp(pc->file,file)!=0) {
decodeType = playerGetDecodeType(utf8file); decodeType = playerGetDecodeType(utf8file);
if(decodeType < 0) { if(decodeType < 0) {
printf("%s unknown file type: %s\n", myfprintf(fp,"%s unknown file type: %s\n",
COMMAND_RESPOND_ERROR, utf8file); COMMAND_RESPOND_ERROR, utf8file);
return -1; return -1;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment