From 64620f8170c376c04fe6cfec9a78c73f41d3b615 Mon Sep 17 00:00:00 2001 From: Masanao Izumo Date: Thu, 20 Jul 2000 04:31:56 +0900 Subject: [PATCH] TiMidity++-2.10.0a2 --- ChangeLog | 17 +- INSTALL | 3 + NEWS | 4 + config.h.in | 3 + configs/msc-config.h | 2 +- configure | 682 +++++++++++++++++++++++----------------------- configure.in | 26 +- doc/C/timidity.1 | 64 ++--- doc/ja_JP.ujis/timidity.1 | 3 - interface/Makefile.in | 7 + interface/alsaseq_c.c | 57 +++- libarc/Makefile.in | 1 + libunimod/Makefile.in | 1 + timidity/Makefile.am | 1 + timidity/Makefile.in | 13 +- timidity/alsa_a.c | 3 +- timidity/aq.c | 3 + timidity/effect.c | 6 +- timidity/esd_a.c | 4 +- timidity/oss_a.c | 2 +- timidity/output.c | 7 +- timidity/timidity.c | 4 +- timidity/vorbis_a.c | 323 ++++++++++++++++++++++ utils/Makefile.in | 1 + 24 files changed, 835 insertions(+), 402 deletions(-) create mode 100644 timidity/vorbis_a.c diff --git a/ChangeLog b/ChangeLog index a193b916..84915099 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2000-07-20 Masanao Izumo + + * vorbis_a.c: Supported Ogg Vorbis output: -Ov + (enabled if TiMidity is configured with --enabel-vorbis=yes option) + +2000-07-18 Takashi Iwai + + * interface/alsaseq_c.c: Enabled OSS emulation. + +2000-07-15 Takashi Iwai + + * interface/alsaseq_c.c: Added new interface: + TiMidity as ALSA sequencer client. This interface enabled if + the timidity is configured with --enable-alsaseq. + 2000-07-15 Masanao Izumo * option -Bn,m sets audio buffer fragments as n, and audio buffer size @@ -8,8 +23,6 @@ * timidity/aq.c: Modified. - * timidity/nas_a.c: Remove PF_CAN_TRACE flag from PlayMode. - 2000-07-05 Masanao Izumo * Version 2.9.5 released. diff --git a/INSTALL b/INSTALL index 3f0b7a48..926f0c2c 100644 --- a/INSTALL +++ b/INSTALL @@ -172,6 +172,9 @@ following: --enable-w32gui Build TiMidity++ as Windows GUI. + --enable-alsaseq + Build TiMidity++ as ALSA sequencer client. + --enable-network This option allows TiMidity++ to play MIDI file getting via network. You can specify the location of MIDI files by diff --git a/NEWS b/NEWS index a22c4fb2..e8603795 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +07/??, 2000 + * Ogg Vorbis output. + * ALSA MIDI sequencer client. + 07/05, 2000 * Version 2.9.5 released. * Upgrade Windows version. diff --git a/config.h.in b/config.h.in index 8d967db5..ce82a9cc 100644 --- a/config.h.in +++ b/config.h.in @@ -179,6 +179,9 @@ /* Define if you have the header file. */ #undef HAVE_SYS_AUDIOIO_H +/* Define if you have the header file. */ +#undef HAVE_SYS_AWE_VOICE_H + /* Define if you have the header file. */ #undef HAVE_SYS_DIR_H diff --git a/configs/msc-config.h b/configs/msc-config.h index 4b64439c..2c5c4e29 100644 --- a/configs/msc-config.h +++ b/configs/msc-config.h @@ -261,7 +261,7 @@ /* In VDS Macro AAA=BBB is not available. */ #define __W32__ -#define TIMID_VERSION "2.10.0a" +#define TIMID_VERSION "2.10.0a2" #define DEFAULT_PATH ".\\" #define AU_W32 #define WINSOCK diff --git a/configure b/configure index 2476b7b5..0d80c43b 100755 --- a/configure +++ b/configure @@ -46,10 +46,11 @@ ac_help="$ac_help alsa: ALSA pcm device alib: HPUX network audio (Alib) nas: NAS - Network Audio System - esd: EsounD" + esd: EsounD + vorbis: Ogg Vorbis" ac_help="$ac_help --with-default-output= Specify default output mode (optional): - default|alsa|alib|nas|esd|wav|au|aiff|list" + default|alsa|alib|nas|esd|wav|au|aiff|list|vorbis" ac_help="$ac_help --enable-esd EsounD (Obsoleted. Use --enable-audio=esd)" ac_help="$ac_help @@ -100,7 +101,7 @@ ac_help="$ac_help ac_help="$ac_help --enable-server Enable server interface (default is no)" ac_help="$ac_help - --enable-alsaseq Enable ALSA sequencer server interface (default is no)" + --enable-alsaseq Enable ALSA sequencer server interface (default is no)" ac_help="$ac_help --enable-w32gui Enable Windows GUI interface (default is no)" ac_help="$ac_help @@ -674,7 +675,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:678: checking host system type" >&5 +echo "configure:679: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -695,7 +696,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:699: checking target system type" >&5 +echo "configure:700: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -713,7 +714,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:717: checking build system type" >&5 +echo "configure:718: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -747,7 +748,7 @@ test "$host_alias" != "$target_alias" && # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:751: checking for a BSD compatible install" >&5 +echo "configure:752: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -800,7 +801,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:804: checking whether build environment is sane" >&5 +echo "configure:805: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -857,7 +858,7 @@ test "$program_suffix" != NONE && test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:861: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:862: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -886,7 +887,7 @@ fi PACKAGE=TiMidity++ -VERSION=2.10.0a +VERSION=2.10.0a2 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -896,7 +897,7 @@ fi missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:900: checking for working aclocal" >&5 +echo "configure:901: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -909,7 +910,7 @@ else fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:913: checking for working autoconf" >&5 +echo "configure:914: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -922,7 +923,7 @@ else fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:926: checking for working automake" >&5 +echo "configure:927: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -935,7 +936,7 @@ else fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:939: checking for working autoheader" >&5 +echo "configure:940: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -948,7 +949,7 @@ else fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:952: checking for working makeinfo" >&5 +echo "configure:953: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -963,7 +964,7 @@ fi echo $ac_n "checking whether grep returns status""... $ac_c" 1>&6 -echo "configure:967: checking whether grep returns status" >&5 +echo "configure:968: checking whether grep returns status" >&5 echo "grimblepritz" >grimble if grep blurfldyick grimble >/dev/null 2>&1 ; then contains="./contains" @@ -998,7 +999,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1002: checking for $ac_word" >&5 +echo "configure:1003: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_EMACS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1036,7 +1037,7 @@ test -n "$EMACS" || EMACS="no" if test $EMACS != "no"; then echo $ac_n "checking where .elc files should go""... $ac_c" 1>&6 -echo "configure:1040: checking where .elc files should go" >&5 +echo "configure:1041: checking where .elc files should go" >&5 lispdir="\$(datadir)/emacs/site-lisp" emacs_flavor=`echo "$EMACS" | sed -e 's,^.*/,,'` if test "x$prefix" = "xNONE"; then @@ -1122,7 +1123,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1126: checking for $ac_word" >&5 +echo "configure:1127: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1152,7 +1153,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1156: checking for $ac_word" >&5 +echo "configure:1157: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1203,7 +1204,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1207: checking for $ac_word" >&5 +echo "configure:1208: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1235,7 +1236,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1239: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1240: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1246,12 +1247,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1250 "configure" +#line 1251 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1277,12 +1278,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1281: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1282: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1286: checking whether we are using GNU C" >&5 +echo "configure:1287: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1291,7 +1292,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1295: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1296: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1310,7 +1311,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1314: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1315: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1353,7 +1354,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1357: checking for a BSD compatible install" >&5 +echo "configure:1358: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1408,7 +1409,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1412: checking for $ac_word" >&5 +echo "configure:1413: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1436,7 +1437,7 @@ else fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1440: checking whether ln -s works" >&5 +echo "configure:1441: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1457,7 +1458,7 @@ else fi echo $ac_n "checking whether -rdynamic option is recognized""... $ac_c" 1>&6 -echo "configure:1461: checking whether -rdynamic option is recognized" >&5 +echo "configure:1462: checking whether -rdynamic option is recognized" >&5 ac_ccoption=`echo rdynamic | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'timidity_cv_ccoption_$ac_ccoption'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1574,7 +1575,7 @@ esac echo $ac_n "checking for sqrt in -lm""... $ac_c" 1>&6 -echo "configure:1578: checking for sqrt in -lm" >&5 +echo "configure:1579: checking for sqrt in -lm" >&5 ac_lib_var=`echo m'_'sqrt | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1582,7 +1583,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1621,7 +1622,7 @@ else fi echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:1625: checking for socket in -lsocket" >&5 +echo "configure:1626: checking for socket in -lsocket" >&5 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1629,7 +1630,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1668,7 +1669,7 @@ else fi echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:1672: checking for dlopen in -ldl" >&5 +echo "configure:1673: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1676,7 +1677,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1710,12 +1711,12 @@ fi for ac_func in gethostbyname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1714: checking for $ac_func" >&5 +echo "configure:1715: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1760,7 +1761,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:1764: checking for gethostbyname in -lnsl" >&5 +echo "configure:1765: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1768,7 +1769,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1810,7 +1811,7 @@ fi done echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1814: checking how to run the C preprocessor" >&5 +echo "configure:1815: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1825,13 +1826,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1835: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1836: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1842,13 +1843,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1852: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1853: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1859,13 +1860,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1869: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1870: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1894,7 +1895,7 @@ echo "$ac_t""$CPP" 1>&6 # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:1898: checking for X" >&5 +echo "configure:1899: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -1956,12 +1957,12 @@ if test "$ac_x_includes" = NO; then # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1965: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1966: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2030,14 +2031,14 @@ if test "$ac_x_libraries" = NO; then ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -2143,17 +2144,17 @@ else case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:2147: checking whether -R must be followed by a space" >&5 +echo "configure:2148: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -2169,14 +2170,14 @@ rm -f conftest* else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -2208,7 +2209,7 @@ rm -f conftest* # libraries were built with DECnet support. And karl@cs.umb.edu says # the Alpha needs dnet_stub (dnet does not exist). echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:2212: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:2213: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2216,7 +2217,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2249,7 +2250,7 @@ fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:2253: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:2254: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2257,7 +2258,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2297,12 +2298,12 @@ fi # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey@clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:2301: checking for gethostbyname" >&5 +echo "configure:2302: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -2346,7 +2347,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:2350: checking for gethostbyname in -lnsl" >&5 +echo "configure:2351: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2354,7 +2355,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2395,12 +2396,12 @@ fi # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:2399: checking for connect" >&5 +echo "configure:2400: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2428: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -2444,7 +2445,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:2448: checking for connect in -lsocket" >&5 +echo "configure:2449: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2452,7 +2453,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2487,12 +2488,12 @@ fi # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:2491: checking for remove" >&5 +echo "configure:2492: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -2536,7 +2537,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:2540: checking for remove in -lposix" >&5 +echo "configure:2541: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2544,7 +2545,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2579,12 +2580,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:2583: checking for shmat" >&5 +echo "configure:2584: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -2628,7 +2629,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:2632: checking for shmat in -lipc" >&5 +echo "configure:2633: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2636,7 +2637,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2680,7 +2681,7 @@ fi # libraries we check for below, so use a different variable. # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:2684: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:2685: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2688,7 +2689,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2747,7 +2748,7 @@ if test "x$with_x" = xyes -a "x$have_x" = xyes; then fi echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:2751: checking for XOpenDisplay in -lX11" >&5 +echo "configure:2752: checking for XOpenDisplay in -lX11" >&5 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2755,7 +2756,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lX11 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2794,12 +2795,12 @@ else fi echo $ac_n "checking X11 version 6""... $ac_c" 1>&6 -echo "configure:2798: checking X11 version 6" >&5 +echo "configure:2799: checking X11 version 6" >&5 if eval "test \"`echo '$''{'timidity_cv_x11_version_6'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -2809,7 +2810,7 @@ fail; ; return 0; } EOF -if { (eval echo configure:2813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* timidity_cv_x11_version_6=yes else @@ -2829,7 +2830,7 @@ fi KEEPLIBS=$LIBS echo $ac_n "checking for XShapeCombineMask in -lXext""... $ac_c" 1>&6 -echo "configure:2833: checking for XShapeCombineMask in -lXext" >&5 +echo "configure:2834: checking for XShapeCombineMask in -lXext" >&5 ac_lib_var=`echo Xext'_'XShapeCombineMask | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2837,7 +2838,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXext $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2870,7 +2871,7 @@ have_xext=no fi echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:2874: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:2875: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2878,7 +2879,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lICE $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2917,7 +2918,7 @@ else fi echo $ac_n "checking for SmcOpenConnection in -lSM""... $ac_c" 1>&6 -echo "configure:2921: checking for SmcOpenConnection in -lSM" >&5 +echo "configure:2922: checking for SmcOpenConnection in -lSM" >&5 ac_lib_var=`echo SM'_'SmcOpenConnection | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2925,7 +2926,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lSM $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2958,7 +2959,7 @@ have_xprelibs=no fi echo $ac_n "checking for XtVaAppInitialize in -lXt""... $ac_c" 1>&6 -echo "configure:2962: checking for XtVaAppInitialize in -lXt" >&5 +echo "configure:2963: checking for XtVaAppInitialize in -lXt" >&5 ac_lib_var=`echo Xt'_'XtVaAppInitialize | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2966,7 +2967,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2999,7 +3000,7 @@ have_xt=no fi echo $ac_n "checking for XmuInternAtom in -lXmu""... $ac_c" 1>&6 -echo "configure:3003: checking for XmuInternAtom in -lXmu" >&5 +echo "configure:3004: checking for XmuInternAtom in -lXmu" >&5 ac_lib_var=`echo Xmu'_'XmuInternAtom | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3007,7 +3008,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXmu $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3041,12 +3042,12 @@ fi for ac_func in XmuRegisterExternalAgent do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3045: checking for $ac_func" >&5 +echo "configure:3046: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3094,7 +3095,7 @@ fi done echo $ac_n "checking for XawInitializeWidgetSet in -lXaw3d""... $ac_c" 1>&6 -echo "configure:3098: checking for XawInitializeWidgetSet in -lXaw3d" >&5 +echo "configure:3099: checking for XawInitializeWidgetSet in -lXaw3d" >&5 ac_lib_var=`echo Xaw3d'_'XawInitializeWidgetSet | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3102,7 +3103,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXaw3d $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3132,7 +3133,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for XawInitializeWidgetSet in -lXaw""... $ac_c" 1>&6 -echo "configure:3136: checking for XawInitializeWidgetSet in -lXaw" >&5 +echo "configure:3137: checking for XawInitializeWidgetSet in -lXaw" >&5 ac_lib_var=`echo Xaw'_'XawInitializeWidgetSet | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3140,7 +3141,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXaw $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3175,7 +3176,7 @@ fi fi echo $ac_n "checking for XmCreateForm in -lXm""... $ac_c" 1>&6 -echo "configure:3179: checking for XmCreateForm in -lXm" >&5 +echo "configure:3180: checking for XmCreateForm in -lXm" >&5 ac_lib_var=`echo Xm'_'XmCreateForm | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3183,7 +3184,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3218,12 +3219,12 @@ fi for ac_func in XShmCreatePixmap do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3222: checking for $ac_func" >&5 +echo "configure:3223: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3279,12 +3280,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:3283: checking for $ac_hdr that defines DIR" >&5 +echo "configure:3284: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> @@ -3292,7 +3293,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:3296: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3297: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -3317,7 +3318,7 @@ done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:3321: checking for opendir in -ldir" >&5 +echo "configure:3322: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3325,7 +3326,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3358,7 +3359,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:3362: checking for opendir in -lx" >&5 +echo "configure:3363: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3366,7 +3367,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3400,12 +3401,12 @@ fi fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:3404: checking for ANSI C header files" >&5 +echo "configure:3405: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3413,7 +3414,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3417: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3418: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3430,7 +3431,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -3448,7 +3449,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -3469,7 +3470,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -3480,7 +3481,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:3484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -3504,12 +3505,12 @@ EOF fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:3508: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:3509: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3525,7 +3526,7 @@ wait (&s); s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:3529: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3530: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -3549,21 +3550,21 @@ for ac_hdr in fcntl.h limits.h malloc.h strings.h sys/ioctl.h sys/time.h \ unistd.h dlfcn.h glob.h getopt.h errno.h machine/endian.h \ stropts.h sys/audioio.h sun/audioio.h sys/types.h \ sys/ipc.h sys/shm.h sys/param.h X11/extensions/XShm.h \ - X11/Xmu/ExtAgent.h sys/soundcard.h + X11/Xmu/ExtAgent.h sys/soundcard.h sys/awe_voice.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3557: checking for $ac_hdr" >&5 +echo "configure:3558: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3567: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3568: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3591,17 +3592,17 @@ done ac_safe=`echo "string.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for string.h""... $ac_c" 1>&6 -echo "configure:3595: checking for string.h" >&5 +echo "configure:3596: checking for string.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3605: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3606: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3625,12 +3626,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:3629: checking for working const" >&5 +echo "configure:3630: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3684: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -3700,14 +3701,14 @@ EOF fi echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6 -echo "configure:3704: checking whether char is unsigned" >&5 +echo "configure:3705: checking whether char is unsigned" >&5 if eval "test \"`echo '$''{'ac_cv_c_char_unsigned'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$GCC" = yes; then # GCC predefines this symbol on systems where it applies. cat > conftest.$ac_ext <&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_char_unsigned=yes else @@ -3763,14 +3764,14 @@ EOF fi echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:3767: checking whether byte ordering is bigendian" >&5 +echo "configure:3768: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext < #include @@ -3781,11 +3782,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:3785: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3786: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext < #include @@ -3796,7 +3797,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:3800: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3801: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -3816,7 +3817,7 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -3853,21 +3854,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:3857: checking for inline" >&5 +echo "configure:3858: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3872: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -3893,12 +3894,12 @@ EOF esac echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:3897: checking for off_t" >&5 +echo "configure:3898: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3926,12 +3927,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:3930: checking for pid_t" >&5 +echo "configure:3931: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3959,12 +3960,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:3963: checking for size_t" >&5 +echo "configure:3964: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3992,12 +3993,12 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:3996: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:3997: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4006,7 +4007,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:4010: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4011: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -4028,19 +4029,19 @@ fi echo $ac_n "checking volatile declaration""... $ac_c" 1>&6 -echo "configure:4032: checking volatile declaration" >&5 +echo "configure:4033: checking volatile declaration" >&5 if eval "test \"`echo '$''{'timidity_cv_type_volatile'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4045: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* timidity_cv_type_volatile=yes else @@ -4058,12 +4059,12 @@ if test $timidity_cv_type_volatile = no; then fi echo $ac_n "checking union semun declaration""... $ac_c" 1>&6 -echo "configure:4062: checking union semun declaration" >&5 +echo "configure:4063: checking union semun declaration" >&5 if eval "test \"`echo '$''{'timidity_cv_type_union_semun'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4072,7 +4073,7 @@ int main() { union semun x ; return 0; } EOF -if { (eval echo configure:4076: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4077: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* timidity_cv_type_union_semun=yes else @@ -4091,13 +4092,13 @@ fi if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:4095: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:4096: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext < Autoconf TIOCGETP @@ -4115,7 +4116,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -4137,7 +4138,7 @@ echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6 fi echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:4141: checking for 8-bit clean memcmp" >&5 +echo "configure:4142: checking for 8-bit clean memcmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4145,7 +4146,7 @@ else ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -4176,17 +4177,17 @@ for ac_hdr in unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4180: checking for $ac_hdr" >&5 +echo "configure:4181: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4190: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4191: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4215,12 +4216,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4219: checking for $ac_func" >&5 +echo "configure:4220: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4268,7 +4269,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:4272: checking for working mmap" >&5 +echo "configure:4273: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4276,7 +4277,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -4439,7 +4440,7 @@ EOF fi echo $ac_n "checking whether setvbuf arguments are reversed""... $ac_c" 1>&6 -echo "configure:4443: checking whether setvbuf arguments are reversed" >&5 +echo "configure:4444: checking whether setvbuf arguments are reversed" >&5 if eval "test \"`echo '$''{'ac_cv_func_setvbuf_reversed'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4447,7 +4448,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < /* If setvbuf has the reversed format, exit 0. */ @@ -4461,7 +4462,7 @@ main () { exit(0); /* Non-reversed systems segv here. */ } EOF -if { (eval echo configure:4465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_setvbuf_reversed=yes else @@ -4485,12 +4486,12 @@ EOF fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:4489: checking return type of signal handlers" >&5 +echo "configure:4490: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4507,7 +4508,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:4511: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4512: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -4526,12 +4527,12 @@ EOF echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:4530: checking for vprintf" >&5 +echo "configure:4531: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -4578,12 +4579,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:4582: checking for _doprnt" >&5 +echo "configure:4583: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -4634,12 +4635,12 @@ for ac_func in gettimeofday select socket strdup strstr vsnprintf snprintf \ sleep usleep strncasecmp strerror getopt getcwd popen signal isatty do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4638: checking for $ac_func" >&5 +echo "configure:4639: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4691,12 +4692,12 @@ if test "x$CYGNUS" = xyes; then case "$ac_cv_header_dirent_dirent_h$ac_cv_header_dirent_sys_ndir_h$ac_cv_header_dirent_sys_dir_h$ac_cv_header_dirent_ndir_h" in *yes*) echo $ac_n "checking for opendir""... $ac_c" 1>&6 -echo "configure:4695: checking for opendir" >&5 +echo "configure:4696: checking for opendir" >&5 if eval "test \"`echo '$''{'ac_cv_func_opendir'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_opendir=yes" else @@ -4747,12 +4748,12 @@ fi esac if test "x$enable_network" = "xyes"; then echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:4751: checking for socket" >&5 +echo "configure:4752: checking for socket" >&5 if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_socket=yes" else @@ -4793,7 +4794,7 @@ if eval "test \"`echo '$ac_cv_func_'socket`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for WSAStartup in -lwsock32""... $ac_c" 1>&6 -echo "configure:4797: checking for WSAStartup in -lwsock32" >&5 +echo "configure:4798: checking for WSAStartup in -lwsock32" >&5 ac_lib_var=`echo wsock32'_'WSAStartup | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'wapi_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4801,7 +4802,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lwsock32 $LIBS" cat > conftest.$ac_ext < #include @@ -4810,7 +4811,7 @@ int main() { WSAStartup(0,0); ; return 0; } EOF -if { (eval echo configure:4814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "wapi_cv_lib_$ac_lib_var=yes" else @@ -4896,7 +4897,7 @@ fi -audio_targets='default oss alsa sun hpux irix mme sb_dsp w32 alib nas esd' +audio_targets='default oss alsa sun hpux irix mme sb_dsp w32 alib nas esd vorbis' # Check whether --with-nas-library or --without-nas-library was given. if test "${with_nas_library+set}" = set; then @@ -5002,7 +5003,7 @@ if test "x$au_enable_default" = xyes; then fi echo $ac_n "checking enable_audio=oss""... $ac_c" 1>&6 -echo "configure:5006: checking enable_audio=oss" >&5 +echo "configure:5007: checking enable_audio=oss" >&5 if test "x$au_enable_oss" = xyes; then EXTRADEFS="$EXTRADEFS -DAU_OSS" SYSEXTRAS="$SYSEXTRAS oss_a.c" @@ -5023,7 +5024,7 @@ else fi echo $ac_n "checking enable_audio=sun""... $ac_c" 1>&6 -echo "configure:5027: checking enable_audio=sun" >&5 +echo "configure:5028: checking enable_audio=sun" >&5 if test "x$au_enable_sun" = xyes; then case "$target" in *-*-sunos4*) @@ -5052,7 +5053,7 @@ else fi echo $ac_n "checking enable_audio=hpux""... $ac_c" 1>&6 -echo "configure:5056: checking enable_audio=hpux" >&5 +echo "configure:5057: checking enable_audio=hpux" >&5 if test "x$au_enable_hpux" = xyes; then case "$target" in *-*-hpux*) echo "$ac_t""yes" 1>&6 ;; @@ -5065,7 +5066,7 @@ else fi echo $ac_n "checking enable_audio=irix""... $ac_c" 1>&6 -echo "configure:5069: checking enable_audio=irix" >&5 +echo "configure:5070: checking enable_audio=irix" >&5 if test "x$au_enable_irix" = xyes; then case "$target" in *-sgi-irix5*|*-sgi-irix6.2) @@ -5085,7 +5086,7 @@ else fi echo $ac_n "checking enable_audio=mme""... $ac_c" 1>&6 -echo "configure:5089: checking enable_audio=mme" >&5 +echo "configure:5090: checking enable_audio=mme" >&5 if test "x$au_enable_mme" = xyes; then case "$target" in *-dec-*) echo "$ac_t""yes" 1>&6 ;; @@ -5100,7 +5101,7 @@ else fi echo $ac_n "checking enable_audio=sb_dsp""... $ac_c" 1>&6 -echo "configure:5104: checking enable_audio=sb_dsp" >&5 +echo "configure:5105: checking enable_audio=sb_dsp" >&5 if test "x$au_enable_sb_dsp" = xyes; then case "$target" in *-*-bsdi2.0) echo "$ac_t""yes" 1>&6 ;; @@ -5113,7 +5114,7 @@ else fi echo $ac_n "checking enable_audio=w32""... $ac_c" 1>&6 -echo "configure:5117: checking enable_audio=w32" >&5 +echo "configure:5118: checking enable_audio=w32" >&5 if test "x$au_enable_w32" = xyes; then case "$target" in *-*-cygwin*) @@ -5136,7 +5137,7 @@ else fi echo $ac_n "checking enable_audio=alsa""... $ac_c" 1>&6 -echo "configure:5140: checking enable_audio=alsa" >&5 +echo "configure:5141: checking enable_audio=alsa" >&5 if test "x$au_enable_alsa" = xyes; then echo "$ac_t""" 1>&6 KEEPCFLAGS=$CFLAGS @@ -5169,7 +5170,7 @@ fi echo $ac_n "checking for ALSA CFLAGS""... $ac_c" 1>&6 -echo "configure:5173: checking for ALSA CFLAGS" >&5 +echo "configure:5174: checking for ALSA CFLAGS" >&5 if test "$alsa_inc_prefix" != "" ; then ALSA_CFLAGS="$ALSA_CFLAGS -I$alsa_inc_prefix" CFLAGS="$CFLAGS -I$alsa_inc_prefix" @@ -5177,7 +5178,7 @@ fi echo "$ac_t""$ALSA_CFLAGS" 1>&6 echo $ac_n "checking for ALSA LDFLAGS""... $ac_c" 1>&6 -echo "configure:5181: checking for ALSA LDFLAGS" >&5 +echo "configure:5182: checking for ALSA LDFLAGS" >&5 if test "$alsa_prefix" != "" ; then ALSA_LIBS="$ALSA_LIBS -L$alsa_prefix" LIBS="-L$alsa_prefix" @@ -5189,7 +5190,7 @@ echo "$ac_t""$ALSA_LIBS" 1>&6 min_alsa_version=0.1.1 echo $ac_n "checking for libasound headers version >= $min_alsa_version""... $ac_c" 1>&6 -echo "configure:5193: checking for libasound headers version >= $min_alsa_version" >&5 +echo "configure:5194: checking for libasound headers version >= $min_alsa_version" >&5 no_alsa="" alsa_min_major_version=`echo $min_alsa_version | \ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` @@ -5199,7 +5200,7 @@ no_alsa="" sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` cat > conftest.$ac_ext < @@ -5240,7 +5241,7 @@ exit(0); ; return 0; } EOF -if { (eval echo configure:5244: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5245: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""found." 1>&6 have_alsa=yes @@ -5254,7 +5255,7 @@ fi rm -f conftest* echo $ac_n "checking for snd_cards in -lasound""... $ac_c" 1>&6 -echo "configure:5258: checking for snd_cards in -lasound" >&5 +echo "configure:5259: checking for snd_cards in -lasound" >&5 ac_lib_var=`echo asound'_'snd_cards | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5262,7 +5263,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lasound $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5329,7 +5330,7 @@ else fi echo $ac_n "checking enable_audio=alib""... $ac_c" 1>&6 -echo "configure:5333: checking enable_audio=alib" >&5 +echo "configure:5334: checking enable_audio=alib" >&5 if test "x$au_enable_alib" = xyes; then case "$target" in *-*-hpux*) echo "$ac_t""yes" 1>&6 ;; @@ -5349,7 +5350,7 @@ else fi echo $ac_n "checking enable_audio=nas""... $ac_c" 1>&6 -echo "configure:5353: checking enable_audio=nas" >&5 +echo "configure:5354: checking enable_audio=nas" >&5 if test "x$au_enable_nas" = xyes; then if test "x$with_x" != xyes; then { echo "configure: error: nas: --with-x option must be specified" 1>&2; exit 1; } @@ -5364,7 +5365,7 @@ if test "x$au_enable_nas" = xyes; then else echo "$ac_t""" 1>&6 echo $ac_n "checking for library containing AuOpenServer""... $ac_c" 1>&6 -echo "configure:5368: checking for library containing AuOpenServer" >&5 +echo "configure:5369: checking for library containing AuOpenServer" >&5 if eval "test \"`echo '$''{'timidity_cv_search_AuOpenServer'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5375,7 +5376,7 @@ for i in $x_libraries/libaudio.a \ /usr/lib/libaudio.a ; do LIBS="$i $ac_func_search_save_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* timidity_cv_search_AuOpenServer="$i"; break else @@ -5419,7 +5420,7 @@ else fi echo $ac_n "checking enable_audio=esd""... $ac_c" 1>&6 -echo "configure:5423: checking enable_audio=esd" >&5 +echo "configure:5424: checking enable_audio=esd" >&5 if test "x$au_enable_esd" = xyes; then echo "$ac_t""" 1>&6 KEEPCFLAGS=$CFLAGS @@ -5466,7 +5467,7 @@ fi # Extract the first word of "esd-config", so it can be a program name with args. set dummy esd-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5470: checking for $ac_word" >&5 +echo "configure:5471: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_ESD_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5501,7 +5502,7 @@ fi min_esd_version=0.2.7 echo $ac_n "checking for ESD - version >= $min_esd_version""... $ac_c" 1>&6 -echo "configure:5505: checking for ESD - version >= $min_esd_version" >&5 +echo "configure:5506: checking for ESD - version >= $min_esd_version" >&5 no_esd="" if test "$ESD_CONFIG" = "no" ; then no_esd=yes @@ -5525,7 +5526,7 @@ echo "configure:5505: checking for ESD - version >= $min_esd_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -5583,7 +5584,7 @@ int main () EOF -if { (eval echo configure:5587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -5617,7 +5618,7 @@ fi CFLAGS="$CFLAGS $ESD_CFLAGS" LIBS="$LIBS $ESD_LIBS" cat > conftest.$ac_ext < @@ -5627,7 +5628,7 @@ int main() { return 0; ; return 0; } EOF -if { (eval echo configure:5631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding ESD or finding the wrong" @@ -5682,6 +5683,18 @@ else echo "$ac_t""no" 1>&6 fi +echo $ac_n "checking enable_audio=vorbis""... $ac_c" 1>&6 +echo "configure:5688: checking enable_audio=vorbis" >&5 +if test "x$au_enable_vorbis" = xyes; then + SYSEXTRAS="$SYSEXTRAS vorbis_a.c" + EXTRADEFS="$EXTRADEFS -DAU_VORBIS" + EXTRALIBS="$EXTRALIBS -lvorbis" + echo "$ac_t""yes" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + if test "x$au_enable_none" = xyes; then EXTRADEFS="$EXTRADEFS -DAU_NONE -DAU_AUDRIV" SYSEXTRAS="$SYSEXTRAS audriv_a.c audriv_none.c" @@ -5689,7 +5702,7 @@ fi echo $ac_n "checking default output mode""... $ac_c" 1>&6 -echo "configure:5693: checking default output mode" >&5 +echo "configure:5706: checking default output mode" >&5 if test "x$DEFAULT_PLAYMODE" = x; then DEFAULT_PLAYMODE=`echo $enable_audio | sed 's/,.*//'` fi @@ -5710,6 +5723,7 @@ case ".$DEFAULT_PLAYMODE" in .au) TIMIDITY_OUTPUT_ID=u ;; .aiff) TIMIDITY_OUTPUT_ID=a ;; .list) TIMIDITY_OUTPUT_ID=l ;; + .vorbis) TIMIDITY_OUTPUT_ID=v ;; *) TIMIDITY_OUTPUT_ID= ;; esac echo "$ac_t""$DEFAULT_PLAYMODE/$TIMIDITY_OUTPUT_ID" 1>&6 @@ -5758,12 +5772,12 @@ if test "$NEEDDLOPEN" = "yes"; then have_dl=no echo $ac_n "checking for LoadLibrary""... $ac_c" 1>&6 -echo "configure:5762: checking for LoadLibrary" >&5 +echo "configure:5776: checking for LoadLibrary" >&5 if eval "test \"`echo '$''{'wapi_cv_func_LoadLibrary'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -5772,7 +5786,7 @@ int main() { LoadLibrary(0); ; return 0; } EOF -if { (eval echo configure:5776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* wapi_cv_func_LoadLibrary=yes else @@ -5795,12 +5809,12 @@ fi if test "$have_dl" = "no"; then echo $ac_n "checking for shl_load""... $ac_c" 1>&6 -echo "configure:5799: checking for shl_load" >&5 +echo "configure:5813: checking for shl_load" >&5 if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shl_load=yes" else @@ -5848,12 +5862,12 @@ fi fi if test "$have_dl" = "no"; then echo $ac_n "checking for dlopen""... $ac_c" 1>&6 -echo "configure:5852: checking for dlopen" >&5 +echo "configure:5866: checking for dlopen" >&5 if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dlopen=yes" else @@ -5898,12 +5912,12 @@ fi fi if test "$have_dl" = "no"; then echo $ac_n "checking for dld_init""... $ac_c" 1>&6 -echo "configure:5902: checking for dld_init" >&5 +echo "configure:5916: checking for dld_init" >&5 if eval "test \"`echo '$''{'ac_cv_func_dld_init'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dld_init=yes" else @@ -5948,7 +5962,7 @@ fi fi if test "$have_dl" = "no"; then echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6 -echo "configure:5952: checking for dld_init in -ldld" >&5 +echo "configure:5966: checking for dld_init in -ldld" >&5 ac_lib_var=`echo dld'_'dld_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5956,7 +5970,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5990,13 +6004,13 @@ fi fi echo $ac_n "checking dynamic link method""... $ac_c" 1>&6 -echo "configure:5994: checking dynamic link method" >&5 +echo "configure:6008: checking dynamic link method" >&5 case "$have_dl" in dlopen) echo "$ac_t""use dl_dlopen.c" 1>&6 SYSEXTRAS="$SYSEXTRAS dl_dlopen.c" echo $ac_n "checking whether your dlsym() needs a leading underscore""... $ac_c" 1>&6 -echo "configure:6000: checking whether your dlsym() needs a leading underscore" >&5 +echo "configure:6014: checking whether your dlsym() needs a leading underscore" >&5 if eval "test \"`echo '$''{'timidity_cv_func_dlsym_underscore'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6144,17 +6158,17 @@ if test "${enable_ncurses+set}" = set; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6148: checking for $ac_hdr" >&5 +echo "configure:6162: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6158: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6172: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6195,7 +6209,7 @@ done esac echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6 -echo "configure:6199: checking for initscr in -lncurses" >&5 +echo "configure:6213: checking for initscr in -lncurses" >&5 ac_lib_var=`echo ncurses'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6203,7 +6217,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6233,7 +6247,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for PDC_set_ctrl_break in -lcurses""... $ac_c" 1>&6 -echo "configure:6237: checking for PDC_set_ctrl_break in -lcurses" >&5 +echo "configure:6251: checking for PDC_set_ctrl_break in -lcurses" >&5 ac_lib_var=`echo curses'_'PDC_set_ctrl_break | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6241,7 +6255,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurses $lib_user32_test $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6274,7 +6288,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for PDC_set_ctrl_break in -lpdcurses""... $ac_c" 1>&6 -echo "configure:6278: checking for PDC_set_ctrl_break in -lpdcurses" >&5 +echo "configure:6292: checking for PDC_set_ctrl_break in -lpdcurses" >&5 ac_lib_var=`echo pdcurses'_'PDC_set_ctrl_break | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6282,7 +6296,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpdcurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6383,7 +6397,7 @@ fi if test "${enable_slang+set}" = set; then enableval="$enable_slang" case "x$enable_slang" in xyes|xdynamic) echo $ac_n "checking for SLang_init_tty in -lslang""... $ac_c" 1>&6 -echo "configure:6387: checking for SLang_init_tty in -lslang" >&5 +echo "configure:6401: checking for SLang_init_tty in -lslang" >&5 ac_lib_var=`echo slang'_'SLang_init_tty | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6391,7 +6405,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lslang $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6428,17 +6442,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6432: checking for $ac_hdr" >&5 +echo "configure:6446: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6442: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6456: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6490,7 +6504,7 @@ xdynamic) dynamic_targets="$dynamic_targets interface_s.\$(so)" s_so_libs="-lslang" echo $ac_n "checking for initscr in -ltermcap""... $ac_c" 1>&6 -echo "configure:6494: checking for initscr in -ltermcap" >&5 +echo "configure:6508: checking for initscr in -ltermcap" >&5 ac_lib_var=`echo termcap'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6498,7 +6512,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6629,7 +6643,7 @@ if test "${enable_tcltk+set}" = set; then tk_lib= for l in tcl tcl8.0jp tcl7.6jp tcl80jp tcl76jp tcl8.0 tcl7.6 tcl80 tcl76; do case "x$tcl_lib" in x) echo $ac_n "checking for Tcl_Init in -l$l""... $ac_c" 1>&6 -echo "configure:6633: checking for Tcl_Init in -l$l" >&5 +echo "configure:6647: checking for Tcl_Init in -l$l" >&5 ac_lib_var=`echo $l'_'Tcl_Init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6637,7 +6651,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$l $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6672,7 +6686,7 @@ fi LIBS="$LIBS $tcl_lib" for l in tk tk8.0jp tk4.2jp tk80jp tk42jp tk8.0 tk4.2 tk80 tk42; do case "x$tk_lib" in x) echo $ac_n "checking for Tk_Init in -l$l""... $ac_c" 1>&6 -echo "configure:6676: checking for Tk_Init in -l$l" >&5 +echo "configure:6690: checking for Tk_Init in -l$l" >&5 ac_lib_var=`echo $l'_'Tk_Init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6680,7 +6694,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$l $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7055,7 +7069,7 @@ fi # Extract the first word of "gtk-config", so it can be a program name with args. set dummy gtk-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7059: checking for $ac_word" >&5 +echo "configure:7073: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7090,7 +7104,7 @@ fi min_gtk_version=1.1.3 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:7094: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:7108: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" = "no" ; then no_gtk=yes @@ -7113,7 +7127,7 @@ echo "configure:7094: checking for GTK - version >= $min_gtk_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -7179,7 +7193,7 @@ main () } EOF -if { (eval echo configure:7183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -7213,7 +7227,7 @@ fi CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat > conftest.$ac_ext < @@ -7223,7 +7237,7 @@ int main() { return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ; return 0; } EOF -if { (eval echo configure:7227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GTK or finding the wrong" @@ -7352,17 +7366,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7356: checking for $ac_hdr" >&5 +echo "configure:7370: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7366: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7380: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7437,17 +7451,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7441: checking for $ac_hdr" >&5 +echo "configure:7455: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7451: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7465: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7543,17 +7557,17 @@ if test "${enable_ump+set}" = set; then fi ac_safe=`echo "X11/xpm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/xpm.h""... $ac_c" 1>&6 -echo "configure:7547: checking for X11/xpm.h" >&5 +echo "configure:7561: checking for X11/xpm.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7557: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7571: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7576,7 +7590,7 @@ else fi echo $ac_n "checking for XpmCreatePixmapFromData in -lXpm""... $ac_c" 1>&6 -echo "configure:7580: checking for XpmCreatePixmapFromData in -lXpm" >&5 +echo "configure:7594: checking for XpmCreatePixmapFromData in -lXpm" >&5 ac_lib_var=`echo Xpm'_'XpmCreatePixmapFromData | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7584,7 +7598,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXpm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7667,7 +7681,7 @@ if test "${enable_offix+set}" = set; then LDFLAGS="$LDFLAGS $offix_lib_dir" LIBS="$LIBS $lib_xmu_opt $lib_xt_opt $lib_xprelibs_opt $lib_xext_opt -lX11" echo $ac_n "checking for DndInitialize in -lDnd""... $ac_c" 1>&6 -echo "configure:7671: checking for DndInitialize in -lDnd" >&5 +echo "configure:7685: checking for DndInitialize in -lDnd" >&5 ac_lib_var=`echo Dnd'_'DndInitialize | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7675,7 +7689,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lDnd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7793,7 +7807,7 @@ if test "${enable_wrd+set}" = set; then EXTRADEFS="$EXTRADEFS -DWRDT_X" enable_sherry_wrd=yes echo $ac_n "checking for zlibVersion in -lz""... $ac_c" 1>&6 -echo "configure:7797: checking for zlibVersion in -lz" >&5 +echo "configure:7811: checking for zlibVersion in -lz" >&5 ac_lib_var=`echo z'_'zlibVersion | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7801,7 +7815,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7835,17 +7849,17 @@ fi ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for png.h""... $ac_c" 1>&6 -echo "configure:7839: checking for png.h" >&5 +echo "configure:7853: checking for png.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7849: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7863: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7868,7 +7882,7 @@ enable_sherry_wrd=no fi echo $ac_n "checking for png_init_io in -lpng""... $ac_c" 1>&6 -echo "configure:7872: checking for png_init_io in -lpng" >&5 +echo "configure:7886: checking for png_init_io in -lpng" >&5 ac_lib_var=`echo png'_'png_init_io | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7876,7 +7890,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpng -lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else diff --git a/configure.in b/configure.in index c1195411..02f72115 100644 --- a/configure.in +++ b/configure.in @@ -55,7 +55,7 @@ dnl AC_INIT(timidity/timidity.c) SHELL=${CONFIG_SHELL-/bin/sh} AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(TiMidity++, 2.10.0a, no-define) +AM_INIT_AUTOMAKE(TiMidity++, 2.10.0a2, no-define) dnl To use CONTAINS() macro (See acinclude.m4) CONTAINS_INIT @@ -288,7 +288,7 @@ AC_CHECK_HEADERS(fcntl.h limits.h malloc.h strings.h sys/ioctl.h sys/time.h \ unistd.h dlfcn.h glob.h getopt.h errno.h machine/endian.h \ stropts.h sys/audioio.h sun/audioio.h sys/types.h \ sys/ipc.h sys/shm.h sys/param.h X11/extensions/XShm.h \ - X11/Xmu/ExtAgent.h sys/soundcard.h) + X11/Xmu/ExtAgent.h sys/soundcard.h sys/awe_voice.h) AC_CHECK_HEADER(string.h,, [ EXTRADEFS="$EXTRADEFS -DNO_STRING_H " ]) dnl Checks for typedefs, structures, and compiler characteristics. @@ -410,8 +410,9 @@ dnl alsa(s): ALSA pcm device dnl alib(A): HPUX network audio (Alib) dnl nas(n): Network Audio System dnl esd(e): EsounD +dnl vorbis(v): Ogg Vorbis -audio_targets='default oss alsa sun hpux irix mme sb_dsp w32 alib nas esd' +audio_targets='default oss alsa sun hpux irix mme sb_dsp w32 alib nas esd vorbis' AC_ARG_WITH(nas-library, [ --with-nas-library=library NAS absolute library path (Don't use -laudio)]) @@ -432,7 +433,8 @@ AC_ARG_ENABLE(audio, alsa: ALSA pcm device alib: HPUX network audio (Alib) nas: NAS - Network Audio System - esd: EsounD], + esd: EsounD + vorbis: Ogg Vorbis], [ enable_audio=$enableval have_audio_opt=yes ], [ enable_audio=yes @@ -451,7 +453,7 @@ dnl Turn on default output mode DEFAULT_PLAYMODE= AC_ARG_WITH(default-output, [ --with-default-output= Specify default output mode (optional): - default|alsa|alib|nas|esd|wav|au|aiff|list], + default|alsa|alib|nas|esd|wav|au|aiff|list|vorbis], [ if test "$enable_audio" != no; then DEFAULT_PLAYMODE=$withval eval "au_enable_$DEFAULT_PLAYMODE=yes" @@ -742,6 +744,17 @@ else AC_MSG_RESULT(no) fi +AC_MSG_CHECKING(enable_audio=vorbis) +if test "x$au_enable_vorbis" = xyes; then + SYSEXTRAS="$SYSEXTRAS vorbis_a.c" + EXTRADEFS="$EXTRADEFS -DAU_VORBIS" + EXTRALIBS="$EXTRALIBS -lvorbis" + AC_MSG_RESULT(yes) +else + AC_MSG_RESULT(no) +fi + + dnl Pseudo audio device (Undocumented). if test "x$au_enable_none" = xyes; then EXTRADEFS="$EXTRADEFS -DAU_NONE -DAU_AUDRIV" @@ -773,6 +786,7 @@ case ".$DEFAULT_PLAYMODE" in .au) TIMIDITY_OUTPUT_ID=u ;; .aiff) TIMIDITY_OUTPUT_ID=a ;; .list) TIMIDITY_OUTPUT_ID=l ;; + .vorbis) TIMIDITY_OUTPUT_ID=v ;; *) TIMIDITY_OUTPUT_ID= ;; esac AC_MSG_RESULT($DEFAULT_PLAYMODE/$TIMIDITY_OUTPUT_ID) @@ -1157,7 +1171,7 @@ CONFIG_INTERFACE(server,SERVER,r, dnl TiMidity ALSA sequencer server AM_CONDITIONAL(ENABLE_ALSASEQ, false) CONFIG_INTERFACE(alsaseq,ALSASEQ,A, - [ --enable-alsaseq Enable ALSA sequencer server interface (default is no)], + [ --enable-alsaseq Enable ALSA sequencer server interface (default is no)], , [ INTERFACE_SRCS="$INTERFACE_SRCS alsaseq_c.c" AC_CHECK_HEADERS(sys/asoundlib.h) diff --git a/doc/C/timidity.1 b/doc/C/timidity.1 index c3150250..0f5ad538 100644 --- a/doc/C/timidity.1 +++ b/doc/C/timidity.1 @@ -157,8 +157,8 @@ lowpass filter before playing, which reduces aliasing noise at low resampling frequencies. .TP -.B \-B \fIfragments\fP -For the Linux / FreeBSD / OSS / Windows sound driver, +.B \-B \fIfragments\fP[,\fIbuffer-bits\fP] +For the Linux / FreeBSD / OSS / ALSA / Windows sound driver, selects the number of buffer fragments in interactive mode. Increasing the number of fragments may reduce choppiness when @@ -170,22 +170,7 @@ the maximum number of fragments available. .TP .B \-b \fImode\fP - -Enables pseudo surround effects. -\fImode\fP parameters are the following: -.RS -.TP -.B \-bl -Sounds are comes mainly from left. -.TP -.B \-br -Sounds are comes mainly from right. -.TP -.B \-bb -Sounds are comes left and right in random. -.TP -.B \-bc -Disables this feature. +(obsoleted) .RE .TP @@ -308,10 +293,7 @@ may be available: dumb interface .TP .B \-in -ncurses interface(old version) -.TP -.B \-iN -NEW ncurses interface +ncurses interface .TP .B \-is slang interface @@ -337,6 +319,16 @@ skin interface Environment variable \fBTIMIDITY_SKIN\fP must be specified with path of the skin data(compressed data are also available). .TP +.B \-ig +gtk interface +.TP +.B \-ir +Launch timidity as MIDI server. +.TP +.B \-iA +Launch timidity as ALSA sequencer client. +.br +.TP .B Interface options Option characters may be added immediately after the interface identifier. The following @@ -357,6 +349,15 @@ Linux sound driver, this is accomplished through the use of short DMA buffer fragments, which can be tuned via the -B option. +.TP +.B l +Loop playing (some interface ignore this option) +.TP +.B r +Randomize file list arguments before playing +.TP +.B s +Sorting file list arguments before playing .RE .TP @@ -477,21 +478,8 @@ If \fIchannel\fP is negative, channel \-\fIchannel\fP is turned back on. If \fIchannel\fP is 0, all channels are turned on. .TP -.BI \-R " value" -Enables Pseudo Reverb Mode. \fIvalue\fP are the following: -.RS -.TP -.B 0 -Long slight release -.TP -.B 1 -Long loud release -.TP -.B 2 -Short release -.TP -.B 3 -No release +.BI \-R " msec" +Enables Pseudo Reverb Mode. \fImsec\fP are envelope release time. .RE .TP @@ -631,7 +619,7 @@ lsmidiprog(1), mididump(1), patinfo(1), sf2text(1), wav2pat(1), timidity.cfg(5) .P .SH COPYRIGHT -Copyright (C) 1999 Masanao Izumo +Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen .P Original version was developed under the name of Tuukka Toivonen diff --git a/doc/ja_JP.ujis/timidity.1 b/doc/ja_JP.ujis/timidity.1 index e00d77d5..164917e1 100644 --- a/doc/ja_JP.ujis/timidity.1 +++ b/doc/ja_JP.ujis/timidity.1 @@ -347,9 +347,6 @@ dumb interface .B \-in ncurses interface .TP -.B \-iN -NEW ncurses interface -.TP .B \-is slang interface .TP diff --git a/interface/Makefile.in b/interface/Makefile.in index e610926f..cfe7b2bb 100644 --- a/interface/Makefile.in +++ b/interface/Makefile.in @@ -360,6 +360,13 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done +alsaseq_c.o: alsaseq_c.c ../config.h ../timidity/timidity.h \ + ../utils/support.h ../timidity/common.h ../libarc/url.h \ + ../utils/mblock.h ../timidity/controls.h ../timidity/instrum.h \ + ../timidity/playmidi.h ../timidity/readmidi.h \ + ../timidity/recache.h ../timidity/output.h ../timidity/aq.h \ + ../utils/timer.h + info-am: info: info-recursive dvi-am: diff --git a/interface/alsaseq_c.c b/interface/alsaseq_c.c index 86ecdd79..0fe3ebdd 100644 --- a/interface/alsaseq_c.c +++ b/interface/alsaseq_c.c @@ -32,7 +32,7 @@ by ALSA seqeuncer core. For invoking ALSA sequencer interface, run timidity as folows: - % timidity -iA -B2 + % timidity -iA -B2,8 The fragment size can be adjustable. The smaller number gives better real-time response. Then timidity shows new port numbers which were newly created (128:0 and 128:1 below). @@ -40,7 +40,7 @@ % timidity -iA -B2,8 TiMidity starting in ALSA server mode Opening sequencer port 128:0 128:1 - ---------------------------- + --------------------------------------- These ports can be connected with any other sequencer ports. For example, playing a MIDI file via pmidi (what's an overkill :-), % pmidi -p128:0 foo.mid @@ -52,6 +52,45 @@ The interface tries to reset process scheduling as SCHED_FIFO and as high priority as possible. For enabling this feature, timidity must be invoked by root or installed with set-uid root. + The SCHED_FIFO'd program shows much better real-time response. + For example, without rescheduled, timidity may cause pauses at + every time /proc is accessed. + + Timidity loads instruments dynamically at each time a PRM_CHANGE + event is received. This causes sometimes pauses during playback. + It occurs often in the playback via pmidi. + Furthermore, timidity resets the loaded instruments when the all + subscriptions are disconnected. Thus for keeping all loaded + instruments also after playback is finished, you need to connect a + dummy port (e.g. midi input port) to timidity port via aconnect: + % aconnect 64:0 128:0 + + If you prefer a bit more fancy visual output, use my tiny program, + aseqview. + % aseqview -p2 & + Then connect two ports to timidity ports: + % aconnect 129:0 128:0 + % aconnect 129:1 128:1 + The outputs ought to be redirected to 129:0,1 instead of 128:0,1. + + You may access to timidity also via OSS MIDI emulation on ALSA + sequencer. Take a look at /proc/asound/seq/oss for checking the + device number to be accessed. + --------------------------------------- + % cat /proc/asound/seq/oss + OSS sequencer emulation version 0.1.8 + ALSA client number 63 + ALSA receiver port 0 + ... + midi 1: [TiMidity port 0] ALSA port 128:0 + capability write / opened none + + midi 2: [TiMidity port 1] ALSA port 128:1 + capability write / opened none + --------------------------------------- + In the case above, the MIDI devices 1 and 2 are assigned to + timidity. Now, play with playmidi: + % playmidi -e -D1 foo.mid BUGS @@ -238,15 +277,17 @@ static void ctl_pass_playing_list(int n, char *args[]) printf("Opening sequencer port:"); for (i = 0; i < NUM_PORTS; i++) { - char portname[32]; - sprintf(portname, "TiMidity port %d", i); - ctxp->port[i] = snd_seq_create_simple_port(ctxp->handle, portname, - SND_SEQ_PORT_CAP_WRITE|SND_SEQ_PORT_CAP_SUBS_WRITE, - SND_SEQ_PORT_TYPE_MIDI_GENERIC); - if (ctxp->port[i] < 0) { + snd_seq_port_info_t pinfo; + memset(&pinfo, 0, sizeof(pinfo)); + sprintf(pinfo.name, "TiMidity port %d", i); + pinfo.capability = SND_SEQ_PORT_CAP_WRITE|SND_SEQ_PORT_CAP_SUBS_WRITE; + pinfo.type = SND_SEQ_PORT_TYPE_MIDI_GENERIC; + strcpy(pinfo.group, SND_SEQ_GROUP_DEVICE); + if (snd_seq_create_port(ctxp->handle, &pinfo) < 0) { fprintf(stderr, "error in snd_seq_create_simple_port\n"); return; } + ctxp->port[i] = pinfo.port; printf(" %d:%d", ctxp->client, ctxp->port[i]); } printf("\n"); diff --git a/libarc/Makefile.in b/libarc/Makefile.in index 1ce2cd11..ba98a15c 100644 --- a/libarc/Makefile.in +++ b/libarc/Makefile.in @@ -248,6 +248,7 @@ distdir: $(DISTFILES) || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done + info-am: info: info-am dvi-am: diff --git a/libunimod/Makefile.in b/libunimod/Makefile.in index 0e739dbb..24be49ef 100644 --- a/libunimod/Makefile.in +++ b/libunimod/Makefile.in @@ -241,6 +241,7 @@ distdir: $(DISTFILES) || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done + info-am: info: info-am dvi-am: diff --git a/timidity/Makefile.am b/timidity/Makefile.am index ca88453d..0df00f34 100644 --- a/timidity/Makefile.am +++ b/timidity/Makefile.am @@ -118,6 +118,7 @@ EXTRA_timidity_SOURCES = \ mfnode.h \ nas_a.c \ sun_a.c \ + vorbis_a.c \ w32_a.c \ w32g_a.c \ timpp32g.ini diff --git a/timidity/Makefile.in b/timidity/Makefile.in index c9663647..dc4a9e55 100644 --- a/timidity/Makefile.in +++ b/timidity/Makefile.in @@ -120,7 +120,7 @@ bin_PROGRAMS = timidity timidity_SOURCES = aenc.h aiff_a.c aq.c aq.h au_a.c audio_cnv.c audio_cnv.h common.c common.h controls.c controls.h dlutils.h effect.c filter.c filter.h instrum.c instrum.h list_a.c loadtab.c mid-j.defs mid.defs miditrace.c miditrace.h mix.c mix.h mod.c mod.h mod2midi.c mod2midi.h output.c output.h playmidi.c playmidi.h raw_a.c rcp.c readmidi.c readmidi.h recache.c recache.h resample.c resample.h reverb.c reverb.h sbkconv.c sffile.c sffile.h sfitem.c sfitem.h sflayer.h smfconv.c smfconv.h sndfont.c tables.c tables.h timidity.c timidity.h version.c wave_a.c wrd.h wrd_read.c wrdt.c -EXTRA_timidity_SOURCES = alsa_a.c audriv.h audriv_a.c audriv_al.c audriv_mme.c audriv_none.c dl_w32.c dl_dld.c dl_dlopen.c dl_hpux.c bsd20_a.c esd_a.c hpux_a.c hpux_d_a.c oss_a.c mac_a.c mac_qt_a.c mac_com.h mac_dlog.c mac_main.c mac_main.h mac_soundspec.c mfnode.c mfnode.h nas_a.c sun_a.c w32_a.c w32g_a.c timpp32g.ini +EXTRA_timidity_SOURCES = alsa_a.c audriv.h audriv_a.c audriv_al.c audriv_mme.c audriv_none.c dl_w32.c dl_dld.c dl_dlopen.c dl_hpux.c bsd20_a.c esd_a.c hpux_a.c hpux_d_a.c oss_a.c mac_a.c mac_qt_a.c mac_com.h mac_dlog.c mac_main.c mac_main.h mac_soundspec.c mfnode.c mfnode.h nas_a.c sun_a.c vorbis_a.c w32_a.c w32g_a.c timpp32g.ini @ENABLE_W32GUI_TRUE@W32GUI_RES = $(top_builddir)/interface/w32g_res.res @@ -266,6 +266,17 @@ distdir: $(DISTFILES) || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done +aq.o: aq.c ../config.h timidity.h ../utils/support.h common.h \ + ../libarc/url.h ../utils/mblock.h output.h aq.h \ + ../utils/timer.h controls.h miditrace.h instrum.h playmidi.h +ogg_a.o: ogg_a.c ../config.h timidity.h ../utils/support.h output.h \ + controls.h +oss_a.o: oss_a.c ../config.h timidity.h ../utils/support.h common.h \ + ../libarc/url.h ../utils/mblock.h output.h controls.h \ + ../utils/timer.h instrum.h playmidi.h miditrace.h +vorbis_a.o: vorbis_a.c ../config.h timidity.h ../utils/support.h \ + output.h controls.h + info-am: info: info-am dvi-am: diff --git a/timidity/alsa_a.c b/timidity/alsa_a.c index 232df186..640be743 100644 --- a/timidity/alsa_a.c +++ b/timidity/alsa_a.c @@ -625,7 +625,8 @@ static int output_data(char *buf, int32 nbytes) ctl->cmsg(CMSG_WARNING, VERB_DEBUG, "%s: %s", dpm.name, (n < 0) ? snd_strerror(n) : "write error"); - /* return -1; ?? */ + if (n != -EPIPE) /* buffer underrun is ignored */ + return -1; } } diff --git a/timidity/aq.c b/timidity/aq.c index 7c8c58f5..21aa4580 100644 --- a/timidity/aq.c +++ b/timidity/aq.c @@ -313,6 +313,9 @@ int aq_add(int32 *samples, int32 count) nbytes = general_output_convert(samples, count); buff = (char *)samples; + if(device_qsize == 0) + return play_mode->output_data(buff, nbytes); + aq_fill_buffer_flag = (aq_add_count <= aq_start_count); if(!aq_fill_buffer_flag) diff --git a/timidity/effect.c b/timidity/effect.c index 3a8b2766..8100ef94 100644 --- a/timidity/effect.c +++ b/timidity/effect.c @@ -106,10 +106,10 @@ static void effect_left_right_delay(int32* buff, int32 count) if(backoff > count) backoff = count; - if(count < AUDIO_BUFFER_SIZE * 2) + if(count < audio_buffer_size * 2) { - memset(buff + count, 0, 4 * (AUDIO_BUFFER_SIZE * 2 - count)); - count = AUDIO_BUFFER_SIZE * 2; + memset(buff + count, 0, 4 * (audio_buffer_size * 2 - count)); + count = audio_buffer_size * 2; } memcpy(save, buff, 4 * count); diff --git a/timidity/esd_a.c b/timidity/esd_a.c index 922e1729..d644a369 100644 --- a/timidity/esd_a.c +++ b/timidity/esd_a.c @@ -60,7 +60,7 @@ static int acntl(int request, void *arg); PlayMode dpm = { DEFAULT_RATE, PE_16BIT|PE_SIGNED, - PF_PCM_STREAM|PF_CAN_TRACE|PF_BUFF_FRAGM_OPT, + PF_PCM_STREAM/*|PF_CAN_TRACE*/, -1, {0}, /* default: get all the buffer fragments you can */ "Enlightened sound daemon", 'e', @@ -110,6 +110,8 @@ static int output_data(char *buf, int32 nbytes) { int n; + // write(1, buf, nbytes);return 0; + while(nbytes > 0) { if((n = write(dpm.fd, buf, nbytes)) == -1) diff --git a/timidity/oss_a.c b/timidity/oss_a.c index ce7b3478..0f4b86d3 100644 --- a/timidity/oss_a.c +++ b/timidity/oss_a.c @@ -229,7 +229,7 @@ static int open_output(void) #ifdef SNDCTL_DSP_GETOSPACE if(ioctl(fd, SNDCTL_DSP_GETOSPACE, &info) != -1) { total_bytes = info.fragstotal * info.fragsize; - ctl->cmsg(CMSG_INFO, VERB_NOISY, "Audio device buffer: %d x %dbytes", + ctl->cmsg(CMSG_INFO, VERB_NOISY, "Audio device buffer: %d x %d bytes", info.fragstotal, info.fragsize); } else diff --git a/timidity/output.c b/timidity/output.c index a6fe2343..a76d677d 100644 --- a/timidity/output.c +++ b/timidity/output.c @@ -88,9 +88,11 @@ extern PlayMode nas_play_mode; /* These are always compiled in. */ extern PlayMode raw_play_mode, wave_play_mode, au_play_mode, aiff_play_mode; extern PlayMode list_play_mode; +#ifdef AU_OGG +extern PlayMode ogg_play_mode; +#endif /* AU_OGG */ #endif /* !__MACOS__ */ - PlayMode *play_mode_list[] = { #ifdef DEV_PLAY_MODE DEV_PLAY_MODE, @@ -117,6 +119,9 @@ PlayMode *play_mode_list[] = { &raw_play_mode, &au_play_mode, &aiff_play_mode, +#ifdef AU_OGG + &ogg_play_mode, +#endif /* AU_OGG */ &list_play_mode, #endif /* __MACOS__ */ 0 diff --git a/timidity/timidity.c b/timidity/timidity.c index a490a9d8..618d1d82 100644 --- a/timidity/timidity.c +++ b/timidity/timidity.c @@ -2436,7 +2436,7 @@ static int parse_opt_B(char *opt) /* bits */ if((p = strchr(opt, ',')) != NULL) { - if(set_value(&val, atoi(p + 1), 0, AUDIO_BUFFER_BITS-1, "Buffer fragments (bit)")) + if(set_value(&val, atoi(p + 1), 0, AUDIO_BUFFER_BITS, "Buffer fragments (bit)")) return -1; if(val >= 0) audio_buffer_bits = val; @@ -2760,7 +2760,7 @@ static RETSIGTYPE sigterm_exit(int sig) s[2] = '\n'; write(2, s, 3); - if(sig == SIGINT && intr < 3) + if(sig == SIGINT && intr < 0) { intr++; signal(SIGINT, sigterm_exit); /* For SysV base */ diff --git a/timidity/vorbis_a.c b/timidity/vorbis_a.c new file mode 100644 index 00000000..fb6b8917 --- /dev/null +++ b/timidity/vorbis_a.c @@ -0,0 +1,323 @@ +/* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + + ogg_a.c + + Functions to output Ogg Vorbis (*.ogg). +*/ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif /* HAVE_CONFIG_H */ +#include + +#ifdef __W32__ +#include +#include +#endif + +#ifdef HAVE_UNISTD_H +#include +#endif /* HAVE_UNISTD_H */ + +#ifndef NO_STRING_H +#include +#else +#include +#endif +#include + +#ifdef __FreeBSD__ +#include +#endif + +#include "timidity.h" +#include "output.h" +#include "controls.h" +#include "vorbis/modes.h" + +static int open_output(void); /* 0=success, 1=warning, -1=fatal error */ +static void close_output(void); +static int output_data(char *buf, int32 bytes); +static int acntl(int request, void *arg); + +/* export the playback mode */ +#define dpm ogg_play_mode + +PlayMode dpm = { + 44100, PE_16BIT|PE_SIGNED, PF_PCM_STREAM, + -1, + {0,0,0,0,0}, + "Ogg Vorbis", 'v', + "output.ogg", + open_output, + close_output, + output_data, + acntl +}; + +static ogg_stream_state os; /* take physical pages, weld into a logical + stream of packets */ +static vorbis_dsp_state vd; /* central working state for the packet->PCM decoder */ +static vorbis_block vb; /* local working space for packet->PCM decode */ + + +/*************************************************************************/ +static int open_output(void) +{ + char *comment = ""; + int include_enc, exclude_enc; + static vorbis_info ogg_info; + vorbis_info *vi; /* struct that stores all the static vorbis bitstream + settings */ + vorbis_comment vc; /* struct that stores all the user comments */ + + /********** Encode setup ************/ + + include_enc = exclude_enc = 0; + + /* only 16 bit is supported */ + include_enc |= PE_16BIT; + exclude_enc &= ~PE_16BIT; + +#ifdef LITTLE_ENDIAN + include_enc &= ~PE_BYTESWAP; + exclude_enc |= PE_BYTESWAP; +#else + include_enc |= PE_BYTESWAP; + exclude_enc &= ~PE_BYTESWAP; +#endif + + dpm.encoding = validate_encoding(dpm.encoding, include_enc, exclude_enc); + + if(dpm.name && dpm.name[0] == '-' && dpm.name[1] == '\0') { + dpm.fd = 1; /* data to stdout */ + comment = "(stdout)"; + } else { + /* Open the audio file */ + dpm.fd = open(dpm.name, FILE_OUTPUT_MODE); + if(dpm.fd < 0) { + ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "%s: %s", + dpm.name, strerror(errno)); + return -1; + } + comment = dpm.name; + } + + /* choose an encoding mode */ + /* (mode 0: 44kHz stereo uncoupled, roughly 128kbps VBR) */ + memcpy(&ogg_info, &info_A, sizeof(ogg_info)); + if(dpm.encoding & PE_MONO) + ogg_info.channels = 1; + else + ogg_info.channels = 2; + ogg_info.rate = dpm.rate; + + vi = &ogg_info; + + /* add a comment */ + vorbis_comment_init(&vc); + vorbis_comment_add(&vc, comment); + + /* set up the analysis state and auxiliary encoding storage */ + vorbis_analysis_init(&vd, vi); + vorbis_block_init(&vd, &vb); + + /* set up our packet->stream encoder */ + /* pick a random serial number; that way we can more likely build + chained streams just by concatenation */ + srand(time(NULL)); + ogg_stream_init(&os, rand()); + + /* Vorbis streams begin with three headers; the initial header (with + most of the codec setup parameters) which is mandated by the Ogg + bitstream spec. The second header holds any comment fields. The + third header holds the bitstream codebook. We merely need to + make the headers, then pass them to libvorbis one at a time; + libvorbis handles the additional Ogg bitstream constraints */ + + { + ogg_packet header; + ogg_packet header_comm; + ogg_packet header_code; + + vorbis_analysis_headerout(&vd, &vc, &header, &header_comm, &header_code); + ogg_stream_packetin(&os, &header); /* automatically placed in its own + page */ + ogg_stream_packetin(&os, &header_comm); + ogg_stream_packetin(&os, &header_code); + + /* no need to write out here. We'll get to that in the main loop */ + } + + return 0; +} + + +/* decides between modes, dispatches to the appropriate mapping. + * + * copy from vorbis_analysis(). I want silence version. + */ +static int vorbis_analysis_silence(vorbis_block *vb, ogg_packet *op){ + vorbis_dsp_state *vd=vb->vd; + vorbis_info *vi=vd->vi; + int type; + int mode=0; + extern vorbis_func_mapping *_mapping_P[]; + + vb->glue_bits=0; + vb->time_bits=0; + vb->floor_bits=0; + vb->res_bits=0; + + /* first things first. Make sure encode is ready */ + _oggpack_reset(&vb->opb); + /* Encode the packet type */ + _oggpack_write(&vb->opb,0,1); + + /* currently lazy. Short block dispatches to 0, long to 1. */ + + if(vb->W &&vi->modes>1)mode=1; + type=vi->map_type[vi->mode_param[mode]->mapping]; + vb->mode=mode; + + /* Encode frame mode, pre,post windowsize, then dispatch */ + _oggpack_write(&vb->opb,mode,vd->modebits); + if(vb->W){ + _oggpack_write(&vb->opb,vb->lW,1); + _oggpack_write(&vb->opb,vb->nW,1); + } + + if(_mapping_P[type]->forward(vb,vd->mode[mode])) + return(-1); + + /* set up the packet wrapper */ + + op->packet=(unsigned char *)_oggpack_buffer(&vb->opb); + op->bytes=_oggpack_bytes(&vb->opb); + op->b_o_s=0; + op->e_o_s=vb->eofflag; + op->frameno=vb->frameno; + op->packetno=vb->sequence; /* for sake of completeness */ + + return(0); +} + +static int output_data(char *readbuffer, int32 bytes) +{ + int i, j, ch = ((dpm.encoding & PE_MONO) ? 1 : 2); + double **buffer; + int16 *samples = (int16 *)readbuffer; + int nsamples = bytes / (2 * ch); + ogg_page og; /* one Ogg bitstream page. Vorbis packets are inside */ + ogg_packet op; /* one raw packet of data for decode */ + + /* data to encode */ + + /* expose the buffer to submit data */ + buffer = vorbis_analysis_buffer(&vd, nsamples); + + /* uninterleave samples */ + for(j = 0; j < ch; j++) + for(i = 0; i < nsamples; i++) + buffer[j][i] = samples[i*ch+j] * (1.0/32768.0); + + /* tell the library how much we actually submitted */ + vorbis_analysis_wrote(&vd, nsamples); + + /* vorbis does some data preanalysis, then divvies up blocks for + more involved (potentially parallel) processing. Get a single + block for encoding now */ + while(vorbis_analysis_blockout(&vd, &vb) == 1) { + + /* analysis */ + vorbis_analysis_silence(&vb, &op); + + /* weld the packet into the bitstream */ + ogg_stream_packetin(&os, &op); + + /* write out pages (if any) */ + while(ogg_stream_pageout(&os, &og) != 0) { + write(dpm.fd, og.header, og.header_len); + write(dpm.fd, og.body, og.body_len); + } + } + return 0; +} + +static void close_output(void) +{ + int eos = 0; + ogg_page og; /* one Ogg bitstream page. Vorbis packets are inside */ + ogg_packet op; /* one raw packet of data for decode */ + + if(dpm.fd < 0) + return; + + /* end of file. this can be done implicitly in the mainline, + but it's easier to see here in non-clever fashion. + Tell the library we're at end of stream so that it can handle + the last frame and mark end of stream in the output properly */ + vorbis_analysis_wrote(&vd, 0); + + /* vorbis does some data preanalysis, then divvies up blocks for + more involved (potentially parallel) processing. Get a single + block for encoding now */ + while(vorbis_analysis_blockout(&vd, &vb) == 1) { + + /* analysis */ + vorbis_analysis_silence(&vb, &op); + + /* weld the packet into the bitstream */ + ogg_stream_packetin(&os, &op); + + /* write out pages (if any) */ + while(!eos){ + int result = ogg_stream_pageout(&os,&og); + if(result == 0) + break; + write(dpm.fd, og.header, og.header_len); + write(dpm.fd, og.body, og.body_len); + + /* this could be set above, but for illustrative purposes, I do + it here (to show that vorbis does know where the stream ends) */ + + if(ogg_page_eos(&og)) + eos = 1; + } + } + + /* clean up and exit. vorbis_info_clear() must be called last */ + + ogg_stream_clear(&os); + vorbis_block_clear(&vb); + vorbis_dsp_clear(&vd); + close(dpm.fd); + dpm.fd = -1; +} + +static int acntl(int request, void *arg) +{ + switch(request) + { + case PM_REQ_DISCARD: + return 0; + } + return -1; +} diff --git a/utils/Makefile.in b/utils/Makefile.in index 5f458ef6..e7369f47 100644 --- a/utils/Makefile.in +++ b/utils/Makefile.in @@ -252,6 +252,7 @@ distdir: $(DISTFILES) || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done + info-am: info: info-am dvi-am: -- 2.11.0