diff -ruN TiMidity++-1.3.4/ChangeLog TiMidity++-1.3.5/ChangeLog --- TiMidity++-1.3.4/ChangeLog Mon Mar 1 19:54:15 1999 +++ TiMidity++-1.3.5/ChangeLog Mon Mar 8 11:29:18 1999 @@ -1,3 +1,36 @@ +-- 1.3.5 +Mon Mar 8 1999 + +Summary: + * In XAW interface, added new user interfaces. + * Added AM_EXEEXT test for configuring. + +Date: Mon Mar 8 1999 +From: Masanao Izumo +Files: configure.in + Added AM_EXEEXT test for configuring. + +From: Yoshishige Arai +Date: Sat, 06 Mar 1999 23:36:24 +0900 (JST) +Files: interface/{xaw_i.c,xaw_c.c,xaw.h} + doc/C/README.xaw doc/ja_JP.ujis/README.xaw + Patched for XAW interface. + Fixed some probrems and changed some interfaces. + Added documentation for XAW interface. + +From: Yoshishige Arai +Date: Thu, 04 Mar 1999 03:06:04 +0900 (JST) +Files: interface/xaw_i.c + Patched for XAW interface. + Fixed some bugs and changed some interfaces. + +Date: Wed, 03 Mar 1999 00:21:46 +0900 (JST) +From: Yoshishige Arai +Files: interface/{xaw_i.c,xaw_c.c,xaw.h,on.xbm,off.xbm} + Patched for XAW interface. + Added the list window to select to play. + Added the control window to change timidity extends mode (-E). + -- 1.3.4 Mon Mar 1 1999 Summary: diff -ruN TiMidity++-1.3.4/Makefile.in TiMidity++-1.3.5/Makefile.in --- TiMidity++-1.3.4/Makefile.in Mon Mar 1 19:57:17 1999 +++ TiMidity++-1.3.5/Makefile.in Mon Mar 8 11:40:46 1999 @@ -88,6 +88,7 @@ CC = @CC@ ELFILES = @ELFILES@ EMACS = @EMACS@ +EXEEXT = @EXEEXT@ EXTRADEFS = @EXTRADEFS@ EXTRALIBS = @EXTRALIBS@ GTK_CFLAGS = @GTK_CFLAGS@ diff -ruN TiMidity++-1.3.4/NEWS TiMidity++-1.3.5/NEWS --- TiMidity++-1.3.4/NEWS Mon Mar 1 17:58:42 1999 +++ TiMidity++-1.3.5/NEWS Mon Mar 8 09:06:47 1999 @@ -1,3 +1,7 @@ +* 3/8, 1999 + Released TiMidity++ v1.3.5. + * In XAW interface, added new user interfaces. + * 3/1, 1999 Released TiMidity++ v1.3.4. * Fixed some bugs and probrems. diff -ruN TiMidity++-1.3.4/aclocal.m4 TiMidity++-1.3.5/aclocal.m4 --- TiMidity++-1.3.4/aclocal.m4 Mon Mar 1 19:51:55 1999 +++ TiMidity++-1.3.5/aclocal.m4 Mon Mar 8 11:29:36 1999 @@ -539,6 +539,70 @@ fi AC_SUBST(lispdir)]) +# Check to see if we're running under Win32, without using +# AC_CANONICAL_*. If so, set output variable EXEEXT to ".exe". +# Otherwise set it to "". + +dnl AM_EXEEXT() +dnl This knows we add .exe if we're building in the Cygwin32 +dnl environment. But if we're not, then it compiles a test program +dnl to see if there is a suffix for executables. +AC_DEFUN(AM_EXEEXT, +[AC_REQUIRE([AM_CYGWIN32]) +AC_REQUIRE([AM_MINGW32]) +AC_MSG_CHECKING([for executable suffix]) +AC_CACHE_VAL(am_cv_exeext, +[if test "$CYGWIN32" = yes || test "$MINGW32" = yes; then +am_cv_exeext=.exe +else +cat > am_c_test.c << 'EOF' +int main() { +/* Nothing needed here */ +} +EOF +${CC-cc} -o am_c_test $CFLAGS $CPPFLAGS $LDFLAGS am_c_test.c $LIBS 1>&5 +am_cv_exeext= +for file in am_c_test.*; do + case $file in + *.c) ;; + *.o) ;; + *) am_cv_exeext=`echo $file | sed -e s/am_c_test//` ;; + esac +done +rm -f am_c_test*]) +test x"${am_cv_exeext}" = x && am_cv_exeext=no +fi +EXEEXT="" +test x"${am_cv_exeext}" != xno && EXEEXT=${am_cv_exeext} +AC_MSG_RESULT(${am_cv_exeext}) +AC_SUBST(EXEEXT)]) + +# Check to see if we're running under Cygwin32, without using +# AC_CANONICAL_*. If so, set output variable CYGWIN32 to "yes". +# Otherwise set it to "no". + +dnl AM_CYGWIN32() +AC_DEFUN(AM_CYGWIN32, +[AC_CACHE_CHECK(for Cygwin32 environment, am_cv_cygwin32, +[AC_TRY_COMPILE(,[return __CYGWIN32__;], +am_cv_cygwin32=yes, am_cv_cygwin32=no) +rm -f conftest*]) +CYGWIN32= +test "$am_cv_cygwin32" = yes && CYGWIN32=yes]) + +# Check to see if we're running under Mingw, without using +# AC_CANONICAL_*. If so, set output variable MINGW32 to "yes". +# Otherwise set it to "no". + +dnl AM_MINGW32() +AC_DEFUN(AM_MINGW32, +[AC_CACHE_CHECK(for Mingw32 environment, am_cv_mingw32, +[AC_TRY_COMPILE(,[return __MINGW32__;], +am_cv_mingw32=yes, am_cv_mingw32=no) +rm -f conftest*]) +MINGW32= +test "$am_cv_mingw32" = yes && MINGW32=yes]) + # Configure paths for GTK+ # Owen Taylor 97-11-3 diff -ruN TiMidity++-1.3.4/configure TiMidity++-1.3.5/configure --- TiMidity++-1.3.4/configure Mon Mar 1 19:51:59 1999 +++ TiMidity++-1.3.5/configure Mon Mar 8 11:29:40 1999 @@ -836,7 +836,7 @@ PACKAGE=TiMidity++ -VERSION=1.3.4 +VERSION=1.3.5 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; } @@ -1373,7 +1373,6 @@ esac so="dll" CYGNUS=yes - program_suffix=.exe ;; *-dec-*) EXTRADEFS="-DDEC" @@ -1391,8 +1390,100 @@ ;; esac +echo $ac_n "checking for Cygwin32 environment""... $ac_c" 1>&6 +echo "configure:1395: checking for Cygwin32 environment" >&5 +if eval "test \"`echo '$''{'am_cv_cygwin32'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + am_cv_cygwin32=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + am_cv_cygwin32=no +fi +rm -f conftest* +rm -f conftest* +fi + +echo "$ac_t""$am_cv_cygwin32" 1>&6 +CYGWIN32= +test "$am_cv_cygwin32" = yes && CYGWIN32=yes +echo $ac_n "checking for Mingw32 environment""... $ac_c" 1>&6 +echo "configure:1424: checking for Mingw32 environment" >&5 +if eval "test \"`echo '$''{'am_cv_mingw32'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + am_cv_mingw32=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + am_cv_mingw32=no +fi +rm -f conftest* +rm -f conftest* +fi + +echo "$ac_t""$am_cv_mingw32" 1>&6 +MINGW32= +test "$am_cv_mingw32" = yes && MINGW32=yes + + +echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 +echo "configure:1455: checking for executable suffix" >&5 +if eval "test \"`echo '$''{'am_cv_exeext'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$CYGWIN32" = yes || test "$MINGW32" = yes; then +am_cv_exeext=.exe +else +cat > am_c_test.c << 'EOF' +int main() { +/* Nothing needed here */ +} +EOF +${CC-cc} -o am_c_test $CFLAGS $CPPFLAGS $LDFLAGS am_c_test.c $LIBS 1>&5 +am_cv_exeext= +for file in am_c_test.*; do + case $file in + *.c) ;; + *.o) ;; + *) am_cv_exeext=`echo $file | sed -e s/am_c_test//` ;; + esac +done +rm -f am_c_test* +fi + +test x"${am_cv_exeext}" = x && am_cv_exeext=no +fi +EXEEXT="" +test x"${am_cv_exeext}" != xno && EXEEXT=${am_cv_exeext} +echo "$ac_t""${am_cv_exeext}" 1>&6 + + echo $ac_n "checking for sqrt in -lm""... $ac_c" 1>&6 -echo "configure:1396: checking for sqrt in -lm" >&5 +echo "configure:1487: 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 @@ -1400,7 +1491,7 @@ ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1439,7 +1530,7 @@ fi echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:1443: checking for socket in -lsocket" >&5 +echo "configure:1534: 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 @@ -1447,7 +1538,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1486,7 +1577,7 @@ fi echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:1490: checking for dlopen in -ldl" >&5 +echo "configure:1581: 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 @@ -1494,7 +1585,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1528,12 +1619,12 @@ for ac_func in gethostbyname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1532: checking for $ac_func" >&5 +echo "configure:1623: 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; then +if { (eval echo configure:1651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1578,7 +1669,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:1582: checking for gethostbyname in -lnsl" >&5 +echo "configure:1673: 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 @@ -1586,7 +1677,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1628,7 +1719,7 @@ done echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1632: checking how to run the C preprocessor" >&5 +echo "configure:1723: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1643,13 +1734,13 @@ # 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:1653: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1744: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1660,13 +1751,13 @@ 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:1670: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1761: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1693,7 +1784,7 @@ # 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:1697: checking for X" >&5 +echo "configure:1788: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -1755,12 +1846,12 @@ # 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:1764: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1855: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1829,14 +1920,14 @@ ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -1942,17 +2033,17 @@ 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:1946: checking whether -R must be followed by a space" >&5 +echo "configure:2037: 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; then +if { (eval echo configure:2047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_R_nospace=yes else @@ -1968,14 +2059,14 @@ else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_R_space=yes else @@ -2007,7 +2098,7 @@ # 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:2011: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:2102: 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 @@ -2015,7 +2106,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2048,7 +2139,7 @@ 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:2052: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:2143: 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 @@ -2056,7 +2147,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2096,12 +2187,12 @@ # 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:2100: checking for gethostbyname" >&5 +echo "configure:2191: 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; then +if { (eval echo configure:2219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -2145,7 +2236,7 @@ if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:2149: checking for gethostbyname in -lnsl" >&5 +echo "configure:2240: 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 @@ -2153,7 +2244,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2194,12 +2285,12 @@ # -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:2198: checking for connect" >&5 +echo "configure:2289: 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; then +if { (eval echo configure:2317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -2243,7 +2334,7 @@ if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:2247: checking for connect in -lsocket" >&5 +echo "configure:2338: 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 @@ -2251,7 +2342,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2286,12 +2377,12 @@ # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:2290: checking for remove" >&5 +echo "configure:2381: 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; then +if { (eval echo configure:2409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -2335,7 +2426,7 @@ if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:2339: checking for remove in -lposix" >&5 +echo "configure:2430: 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 @@ -2343,7 +2434,7 @@ ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2378,12 +2469,12 @@ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:2382: checking for shmat" >&5 +echo "configure:2473: 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; then +if { (eval echo configure:2501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -2427,7 +2518,7 @@ if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:2431: checking for shmat in -lipc" >&5 +echo "configure:2522: 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 @@ -2435,7 +2526,7 @@ ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2479,7 +2570,7 @@ # 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:2483: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:2574: 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 @@ -2487,7 +2578,7 @@ ac_save_LIBS="$LIBS" LIBS="-lICE $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2539,7 +2630,7 @@ fi echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:2543: checking for XOpenDisplay in -lX11" >&5 +echo "configure:2634: 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 @@ -2547,7 +2638,7 @@ ac_save_LIBS="$LIBS" LIBS="-lX11 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2586,12 +2677,12 @@ fi echo $ac_n "checking X11 version 6""... $ac_c" 1>&6 -echo "configure:2590: checking X11 version 6" >&5 +echo "configure:2681: 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() { @@ -2601,7 +2692,7 @@ ; return 0; } EOF -if { (eval echo configure:2605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* timidity_cv_x11_version_6=yes else @@ -2621,7 +2712,7 @@ KEEPLIBS=$LIBS echo $ac_n "checking for XShapeCombineMask in -lXext""... $ac_c" 1>&6 -echo "configure:2625: checking for XShapeCombineMask in -lXext" >&5 +echo "configure:2716: 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 @@ -2629,7 +2720,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXext $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2662,7 +2753,7 @@ fi echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:2666: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:2757: 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 @@ -2670,7 +2761,7 @@ ac_save_LIBS="$LIBS" LIBS="-lICE $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2709,7 +2800,7 @@ fi echo $ac_n "checking for SmcOpenConnection in -lSM""... $ac_c" 1>&6 -echo "configure:2713: checking for SmcOpenConnection in -lSM" >&5 +echo "configure:2804: 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 @@ -2717,7 +2808,7 @@ ac_save_LIBS="$LIBS" LIBS="-lSM $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2750,7 +2841,7 @@ fi echo $ac_n "checking for XtVaAppInitialize in -lXt""... $ac_c" 1>&6 -echo "configure:2754: checking for XtVaAppInitialize in -lXt" >&5 +echo "configure:2845: 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 @@ -2758,7 +2849,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2791,7 +2882,7 @@ fi echo $ac_n "checking for XmuInternAtom in -lXmu""... $ac_c" 1>&6 -echo "configure:2795: checking for XmuInternAtom in -lXmu" >&5 +echo "configure:2886: 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 @@ -2799,7 +2890,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXmu $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2831,7 +2922,7 @@ fi echo $ac_n "checking for XawInitializeWidgetSet in -lXaw3d""... $ac_c" 1>&6 -echo "configure:2835: checking for XawInitializeWidgetSet in -lXaw3d" >&5 +echo "configure:2926: 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 @@ -2839,7 +2930,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXaw3d $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2869,7 +2960,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for XawInitializeWidgetSet in -lXaw""... $ac_c" 1>&6 -echo "configure:2873: checking for XawInitializeWidgetSet in -lXaw" >&5 +echo "configure:2964: 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 @@ -2877,7 +2968,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXaw $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2912,7 +3003,7 @@ fi echo $ac_n "checking for XmCreateForm in -lXm""... $ac_c" 1>&6 -echo "configure:2916: checking for XmCreateForm in -lXm" >&5 +echo "configure:3007: 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 @@ -2920,7 +3011,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2961,12 +3052,12 @@ 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:2965: checking for $ac_hdr that defines DIR" >&5 +echo "configure:3056: 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> @@ -2974,7 +3065,7 @@ DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:2978: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3069: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -2999,7 +3090,7 @@ # 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:3003: checking for opendir in -ldir" >&5 +echo "configure:3094: 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 @@ -3007,7 +3098,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3040,7 +3131,7 @@ else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:3044: checking for opendir in -lx" >&5 +echo "configure:3135: 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 @@ -3048,7 +3139,7 @@ ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3082,12 +3173,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:3086: checking for ANSI C header files" >&5 +echo "configure:3177: 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 @@ -3095,7 +3186,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3099: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3190: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3112,7 +3203,7 @@ 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 @@ -3130,7 +3221,7 @@ 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 @@ -3151,7 +3242,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -3162,7 +3253,7 @@ exit (0); } EOF -if { (eval echo configure:3166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -3186,12 +3277,12 @@ fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:3190: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:3281: 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 @@ -3207,7 +3298,7 @@ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:3211: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3302: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -3233,17 +3324,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3237: checking for $ac_hdr" >&5 +echo "configure:3328: 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:3247: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3338: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3271,17 +3362,17 @@ ac_safe=`echo "string.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for string.h""... $ac_c" 1>&6 -echo "configure:3275: checking for string.h" >&5 +echo "configure:3366: 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:3285: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3376: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3305,12 +3396,12 @@ echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:3309: checking for working const" >&5 +echo "configure:3400: 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:3454: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -3380,14 +3471,14 @@ fi echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6 -echo "configure:3384: checking whether char is unsigned" >&5 +echo "configure:3475: 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 && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_c_char_unsigned=yes else @@ -3443,14 +3534,14 @@ fi echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:3447: checking whether byte ordering is bigendian" >&5 +echo "configure:3538: 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 @@ -3461,11 +3552,11 @@ #endif ; return 0; } EOF -if { (eval echo configure:3465: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3556: \"$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 @@ -3476,7 +3567,7 @@ #endif ; return 0; } EOF -if { (eval echo configure:3480: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3571: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -3496,7 +3587,7 @@ { 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 && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -3533,21 +3624,21 @@ fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:3537: checking for inline" >&5 +echo "configure:3628: 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:3642: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -3573,12 +3664,12 @@ esac echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:3577: checking for off_t" >&5 +echo "configure:3668: 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 @@ -3606,12 +3697,12 @@ fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:3610: checking for pid_t" >&5 +echo "configure:3701: 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 @@ -3639,12 +3730,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:3643: checking for size_t" >&5 +echo "configure:3734: 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 @@ -3672,12 +3763,12 @@ fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:3676: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:3767: 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 @@ -3686,7 +3777,7 @@ struct tm *tp; ; return 0; } EOF -if { (eval echo configure:3690: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3781: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -3708,19 +3799,19 @@ echo $ac_n "checking volatile declaration""... $ac_c" 1>&6 -echo "configure:3712: checking volatile declaration" >&5 +echo "configure:3803: 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:3815: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* timidity_cv_type_volatile=yes else @@ -3738,12 +3829,12 @@ fi echo $ac_n "checking union semun declaration""... $ac_c" 1>&6 -echo "configure:3742: checking union semun declaration" >&5 +echo "configure:3833: 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 @@ -3752,7 +3843,7 @@ union semun x ; return 0; } EOF -if { (eval echo configure:3756: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3847: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* timidity_cv_type_union_semun=yes else @@ -3773,13 +3864,13 @@ if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:3777: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:3868: 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 @@ -3797,7 +3888,7 @@ if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -3819,7 +3910,7 @@ fi echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:3823: checking for 8-bit clean memcmp" >&5 +echo "configure:3914: 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 @@ -3827,7 +3918,7 @@ ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -3858,17 +3949,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3862: checking for $ac_hdr" >&5 +echo "configure:3953: 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:3872: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3963: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3897,12 +3988,12 @@ for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3901: checking for $ac_func" >&5 +echo "configure:3992: 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; then +if { (eval echo configure:4020: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3950,7 +4041,7 @@ done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:3954: checking for working mmap" >&5 +echo "configure:4045: 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 @@ -3958,7 +4049,7 @@ ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -4121,7 +4212,7 @@ fi echo $ac_n "checking whether setvbuf arguments are reversed""... $ac_c" 1>&6 -echo "configure:4125: checking whether setvbuf arguments are reversed" >&5 +echo "configure:4216: 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 @@ -4129,7 +4220,7 @@ { 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. */ @@ -4143,7 +4234,7 @@ exit(0); /* Non-reversed systems segv here. */ } EOF -if { (eval echo configure:4147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_func_setvbuf_reversed=yes else @@ -4167,12 +4258,12 @@ fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:4171: checking return type of signal handlers" >&5 +echo "configure:4262: 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 @@ -4189,7 +4280,7 @@ int i; ; return 0; } EOF -if { (eval echo configure:4193: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4284: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -4208,12 +4299,12 @@ echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:4212: checking for vprintf" >&5 +echo "configure:4303: 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; then +if { (eval echo configure:4331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -4260,12 +4351,12 @@ if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:4264: checking for _doprnt" >&5 +echo "configure:4355: 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; then +if { (eval echo configure:4383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -4316,12 +4407,12 @@ sleep usleep strncasecmp strerror getopt getcwd do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4320: checking for $ac_func" >&5 +echo "configure:4411: 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; then +if { (eval echo configure:4439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4374,12 +4465,12 @@ 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:4378: checking for opendir" >&5 +echo "configure:4469: 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; then +if { (eval echo configure:4497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_opendir=yes" else @@ -4430,12 +4521,12 @@ esac if test "x$enable_network" = "xyes"; then echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:4434: checking for socket" >&5 +echo "configure:4525: 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; then +if { (eval echo configure:4553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_socket=yes" else @@ -4476,7 +4567,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for WSAStartup in -lwsock32""... $ac_c" 1>&6 -echo "configure:4480: checking for WSAStartup in -lwsock32" >&5 +echo "configure:4571: 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 @@ -4484,7 +4575,7 @@ ac_save_LIBS="$LIBS" LIBS="-lwsock32 $LIBS" cat > conftest.$ac_ext < #include @@ -4493,7 +4584,7 @@ WSAStartup(0,0); ; return 0; } EOF -if { (eval echo configure:4497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "wapi_cv_lib_$ac_lib_var=yes" else @@ -4579,7 +4670,7 @@ echo $ac_n "checking whether to enable audio""... $ac_c" 1>&6 -echo "configure:4583: checking whether to enable audio" >&5 +echo "configure:4674: checking whether to enable audio" >&5 # Check whether --enable-audio or --disable-audio was given. if test "${enable_audio+set}" = set; then enableval="$enable_audio" @@ -4625,7 +4716,7 @@ echo $ac_n "checking for ALSA CFLAGS""... $ac_c" 1>&6 -echo "configure:4629: checking for ALSA CFLAGS" >&5 +echo "configure:4720: 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" @@ -4633,7 +4724,7 @@ echo "$ac_t""$ALSA_CFLAGS" 1>&6 echo $ac_n "checking for ALSA LDFLAGS""... $ac_c" 1>&6 -echo "configure:4637: checking for ALSA LDFLAGS" >&5 +echo "configure:4728: checking for ALSA LDFLAGS" >&5 if test "$alsa_prefix" != "" ; then ALSA_LIBS="$ALSA_LIBS -L$alsa_prefix" LIBS="-L$alsa_prefix" @@ -4645,7 +4736,7 @@ min_alsa_version=0.1.1 echo $ac_n "checking for libasound headers version >= $min_alsa_version""... $ac_c" 1>&6 -echo "configure:4649: checking for libasound headers version >= $min_alsa_version" >&5 +echo "configure:4740: 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/'` @@ -4655,7 +4746,7 @@ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` cat > conftest.$ac_ext < @@ -4696,7 +4787,7 @@ ; return 0; } EOF -if { (eval echo configure:4700: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4791: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""found." 1>&6 have_alsa=yes @@ -4710,7 +4801,7 @@ rm -f conftest* echo $ac_n "checking for snd_cards in -lasound""... $ac_c" 1>&6 -echo "configure:4714: checking for snd_cards in -lasound" >&5 +echo "configure:4805: 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 @@ -4718,7 +4809,7 @@ ac_save_LIBS="$LIBS" LIBS="-lasound $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4883,12 +4974,12 @@ have_dl=no echo $ac_n "checking for LoadLibraryExA""... $ac_c" 1>&6 -echo "configure:4887: checking for LoadLibraryExA" >&5 +echo "configure:4978: checking for LoadLibraryExA" >&5 if eval "test \"`echo '$''{'wapi_cv_func_LoadLibraryExA'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -4897,7 +4988,7 @@ LoadLibraryExA(0,0,0); ; return 0; } EOF -if { (eval echo configure:4901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* wapi_cv_func_LoadLibraryExA=yes else @@ -4920,12 +5011,12 @@ if test "$have_dl" = "no"; then echo $ac_n "checking for shl_load""... $ac_c" 1>&6 -echo "configure:4924: checking for shl_load" >&5 +echo "configure:5015: 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; then +if { (eval echo configure:5043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_shl_load=yes" else @@ -4973,12 +5064,12 @@ fi if test "$have_dl" = "no"; then echo $ac_n "checking for dlopen""... $ac_c" 1>&6 -echo "configure:4977: checking for dlopen" >&5 +echo "configure:5068: 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; then +if { (eval echo configure:5096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_dlopen=yes" else @@ -5023,12 +5114,12 @@ fi if test "$have_dl" = "no"; then echo $ac_n "checking for dld_init""... $ac_c" 1>&6 -echo "configure:5027: checking for dld_init" >&5 +echo "configure:5118: 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; then +if { (eval echo configure:5146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_dld_init=yes" else @@ -5073,7 +5164,7 @@ fi if test "$have_dl" = "no"; then echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6 -echo "configure:5077: checking for dld_init in -ldld" >&5 +echo "configure:5168: 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 @@ -5081,7 +5172,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5115,13 +5206,13 @@ fi echo $ac_n "checking dynamic link method""... $ac_c" 1>&6 -echo "configure:5119: checking dynamic link method" >&5 +echo "configure:5210: 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:5125: checking whether your dlsym() needs a leading underscore" >&5 +echo "configure:5216: 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 @@ -5269,17 +5360,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5273: checking for $ac_hdr" >&5 +echo "configure:5364: 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:5283: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5374: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5306,7 +5397,7 @@ done echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6 -echo "configure:5310: checking for initscr in -lncurses" >&5 +echo "configure:5401: 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 @@ -5314,7 +5405,7 @@ ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5404,7 +5495,7 @@ enableval="$enable_slang" case "x$enable_slang" in xyes|xdynamic) KEEPLIBS=$LIBS echo $ac_n "checking for SLang_init_tty in -lslang""... $ac_c" 1>&6 -echo "configure:5408: checking for SLang_init_tty in -lslang" >&5 +echo "configure:5499: 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 @@ -5412,7 +5503,7 @@ ac_save_LIBS="$LIBS" LIBS="-lslang $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5476,7 +5567,7 @@ 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:5480: checking for initscr in -ltermcap" >&5 +echo "configure:5571: 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 @@ -5484,7 +5575,7 @@ ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5613,7 +5704,7 @@ 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:5617: checking for Tcl_Init in -l$l" >&5 +echo "configure:5708: 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 @@ -5621,7 +5712,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$l $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5656,7 +5747,7 @@ 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:5660: checking for Tk_Init in -l$l" >&5 +echo "configure:5751: 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 @@ -5664,7 +5755,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$l $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6036,7 +6127,7 @@ # 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:6040: checking for $ac_word" >&5 +echo "configure:6131: 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 @@ -6067,7 +6158,7 @@ min_gtk_version=1.1.3 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:6071: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:6162: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" = "no" ; then no_gtk=yes @@ -6090,7 +6181,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -6156,7 +6247,7 @@ } EOF -if { (eval echo configure:6160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -6190,7 +6281,7 @@ CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat > conftest.$ac_ext < @@ -6200,7 +6291,7 @@ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ; return 0; } EOF -if { (eval echo configure:6204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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" @@ -6291,17 +6382,17 @@ fi ac_safe=`echo "X11/xpm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/xpm.h""... $ac_c" 1>&6 -echo "configure:6295: checking for X11/xpm.h" >&5 +echo "configure:6386: 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:6305: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6396: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -6324,7 +6415,7 @@ fi echo $ac_n "checking for XpmCreatePixmapFromData in -lXpm""... $ac_c" 1>&6 -echo "configure:6328: checking for XpmCreatePixmapFromData in -lXpm" >&5 +echo "configure:6419: 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 @@ -6332,7 +6423,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXpm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6415,7 +6506,7 @@ 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:6419: checking for DndInitialize in -lDnd" >&5 +echo "configure:6510: 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 @@ -6423,7 +6514,7 @@ ac_save_LIBS="$LIBS" LIBS="-lDnd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6798,6 +6889,7 @@ s%@CC@%$CC%g s%@RANLIB@%$RANLIB%g s%@LN_S@%$LN_S%g +s%@EXEEXT@%$EXEEXT%g s%@CPP@%$CPP%g s%@X_CFLAGS@%$X_CFLAGS%g s%@X_PRE_LIBS@%$X_PRE_LIBS%g diff -ruN TiMidity++-1.3.4/configure.in TiMidity++-1.3.5/configure.in --- TiMidity++-1.3.4/configure.in Mon Mar 1 19:49:36 1999 +++ TiMidity++-1.3.5/configure.in Mon Mar 8 11:28:11 1999 @@ -54,7 +54,7 @@ AC_INIT(timidity/timidity.c) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(TiMidity++, 1.3.4, no-define) +AM_INIT_AUTOMAKE(TiMidity++, 1.3.5, no-define) dnl To use CONTAINS() macro (See acinclude.m4) CONTAINS_INIT @@ -164,7 +164,6 @@ esac so="dll" CYGNUS=yes - program_suffix=.exe ;; *-dec-*) EXTRADEFS="-DDEC" @@ -181,6 +180,9 @@ so="so" ;; esac + +dnl For .exe +AM_EXEEXT AC_CHECK_LIB(m,sqrt) AC_CHECK_LIB(socket,socket) diff -ruN TiMidity++-1.3.4/doc/C/Makefile.am TiMidity++-1.3.5/doc/C/Makefile.am --- TiMidity++-1.3.4/doc/C/Makefile.am Thu Jan 14 12:39:18 1999 +++ TiMidity++-1.3.5/doc/C/Makefile.am Mon Mar 8 09:59:03 1999 @@ -26,4 +26,5 @@ README.dl \ README.sf \ README.tk \ - README.xskin + README.xskin \ + README.xaw \ No newline at end of file diff -ruN TiMidity++-1.3.4/doc/C/Makefile.in TiMidity++-1.3.5/doc/C/Makefile.in --- TiMidity++-1.3.4/doc/C/Makefile.in Mon Mar 1 19:57:38 1999 +++ TiMidity++-1.3.5/doc/C/Makefile.in Mon Mar 8 11:41:10 1999 @@ -86,6 +86,7 @@ CC = @CC@ ELFILES = @ELFILES@ EMACS = @EMACS@ +EXEEXT = @EXEEXT@ EXTRADEFS = @EXTRADEFS@ EXTRALIBS = @EXTRALIBS@ GTK_CFLAGS = @GTK_CFLAGS@ @@ -115,7 +116,8 @@ README.dl \ README.sf \ README.tk \ - README.xskin + README.xskin \ + README.xaw mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../config.h ../../interface.h CONFIG_CLEAN_FILES = diff -ruN TiMidity++-1.3.4/doc/C/README.xaw TiMidity++-1.3.5/doc/C/README.xaw --- TiMidity++-1.3.4/doc/C/README.xaw Thu Jan 1 09:00:00 1970 +++ TiMidity++-1.3.5/doc/C/README.xaw Mon Mar 8 09:58:49 1999 @@ -0,0 +1,186 @@ +--------------------------------------------------------------------- + HOW TO USE Xaw interface of TiMidity++ + +Xaw interface of TiMidity prepares a GUI only with Athena Widget sets +and Xt libraries that are standard toolkits of X Window System. + + +* WHAT'S NEW int 1.3 + +- Imported shortcut key translations +- Added Trace window including keyboard displaying +- Enabled to configure resources of X +- Supported Drag and Drop used on OffiX application +- Added function to load and/or delete MIDI file entries +- Enabled to modify some of extended option settings + + +* USAGE + +New Xaw interface has following file menu; + + LOAD + Load a new MIDI file. + + SAVE CONFIG + Save the current settings and modes e.g. shuffle, + repeat, auto-start and auto-exit flags to ~/.xtimidity . + + HIDE/UNHIDE MESSAGES + Toggles displaying status text widget showing messages. + + HIDE/UNHIDE TRACE + Toggles displaying status of trace canvas. + + SHUFFLE + Toggles shuffle flag. + + REPEAT + Toggle repeat flag. + + AUTO-START + Toggle auto-start flag. + + AUTO-EXIT + Toggle auto-exit flag to exit or not after all songs are over + + FILE LIST + Popup the playing file list window. + + EXTEND MODES + Popup the extend mode control window. + + QUIT + terminate timidity. + +From ver.1.3, File Load and File List menues that enabled to add and/or +delete playing list. You can append or delete arbitrary files from file +browser. To play a file, you can select it by either of pull-down menu +on the title bar or File List window. +The shortcut key actions on each window are as follows: + +
+ [Enter] or [R] : Start Playing + [Space] : Pause / Start Again + [s] : Stop Playing + [q] : Quit TiMidity++ + [p] or [Left] : Previous File + [n] or [Right] : Next File + [v] or [Down] : Volume Down (10%) + [V] or [Up] : Volume Up (10%) + [Alt + N] : Load Files + [Alt + S] : Save settings to ~/.xtimidity + [Ctrl + M] : Hide/Show Messages + [Ctrl + T] : Hide/Show Trace canvas + [Ctrl + S] : Toggles Shuffle state + [Ctrl + R] : Toggles Repeat state + + + [p] or [Up] : Move the cursor to the previous file + [n] or [Down] : Move the cursor to the next file + [Right] : Move the cursor 5 lines backward + [Left] : Move the cursor 5 lines forward + [v] : Volume Down (10%) + [V] : Volume Up (10%) + [Enter] or [R] : Start Playing the selected file + [d] : Delete the selected file entry + [Space] : Pause / Start Again + [s] : Stop Playing + [q] : Quit TiMidity++ + [c] : Close the window + + + [c] : Close the window + [q] : Quit TiMidity++ + + + [Tab] : File or directory comletion + [Enter] : Select the directory entries. + [Escape] or [CTRL]+[g] : Cancel and close the window + [Ctrl-a] : Move the cursor to the top + [Ctrl-e] : Move the cursor to the line-end + [Ctrl-k] : Delete strings after the cursor + +From version 1.1, trace canvas is realized and renewed overall in +1.3. Specify the interface option flag 't' in command line like as +'timidity -iat' when you execute TiMidity(see timidity man page). +You can see a funny movements of volume, expression, panning, +pitchbending, reverb, chorus and voices et cetera of each channel on the +trace canvas. Click left mouse button on the trace screen and you can +toggle trace screen between 'pitchbend and instrument' or 'tonebank, +reverb and chorus'. + + +* INSTALLATION + +TiMidity++ uses Xaw3d by default while compiling when it exists on your +system because GNU configure is employed. If you feel like to use Xaw, +edit common.makefile manually to delete all of '-DXAW3D' definitions +from CPPFLAGS and/or CFLAGS and correct -lXaw3d to -lXaw after +configure. +If you want to use Label Widget as before, make the following line +enable at interface/xaw.h to remove /* */. + + #define WIDGET_IS_LABEL_WIDGET + +And make clean before build. If you are using X servers compiled +without X_LOCALE on the system that doesn't support locale, rewrite +the folloing line; + + #define I18N + +to '#undef I18N' before compiling TiMidity++. +Although $(HOME)/.xtimidity will be regarded as an initial personal +configuration file, you can rename it by correcting the line; + + #define INITIAL_CONFIG ".xtimidity" + +in xaw.h manually. + + +* RESOURCES + +Application class name is 'TiMidity', so specity resources in +.Xdefaults or .Xresources in your home directory as follows for example; + + TiMidity*textbackground: LemonChiffon + TiMidity*background: PeachPuff1 + TiMidity*menubutton: goldenrod + TiMidity*buttonbackground: gold + TiMidity*labelfont: -adobe-helvetica-bold-o-*-*-14-*-75-75-*-*-*-* + +typical resources are listed below. + +Name Class Default +---------------------------------------------------------- +bitmapDir BitmapDir "DEFAULT_PATH/bitmaps" + directory bitmaps is put. +arrangeTitle ArrangeTitle False + Show MIDI titles on the title bar of the main window. +background Background gray65 + Background color of the main window. +menubutton MenuButtonBackground #CCFF33 + Menu button color. +textbackground TextBackground gray85 + Background color of Text Widget. +togglebackground ToggleBackground MediumBlue + Background color of toggle buttons. +buttonbackground ButtonBackground gray76 + Background color of command buttons and other transient windows. +tracebackground TraceBackground gray90 + Background color of trace canvas. +labelfont LabelFont -adobe-helvetica-bold-r-*-*-14-*-75-75-*-*-*-* + Label widget font. +volumefont VolumeFont -adobe-helvetica-bold-r-*-*-12-*-75-75-*-*-*-* + Volume Label font. +tracefont TraceFont -*-*-medium-r-normal--14-*-*-*-*-*-*-* + Trace window font. + + +* BUGS + +Present Xaw interface doesn't verifies the existence or file type of +each MIDI file before playing, sorry. + + + Yoshishige Arai diff -ruN TiMidity++-1.3.4/doc/Makefile.in TiMidity++-1.3.5/doc/Makefile.in --- TiMidity++-1.3.4/doc/Makefile.in Mon Mar 1 19:57:37 1999 +++ TiMidity++-1.3.5/doc/Makefile.in Mon Mar 8 11:41:09 1999 @@ -86,6 +86,7 @@ CC = @CC@ ELFILES = @ELFILES@ EMACS = @EMACS@ +EXEEXT = @EXEEXT@ EXTRADEFS = @EXTRADEFS@ EXTRALIBS = @EXTRALIBS@ GTK_CFLAGS = @GTK_CFLAGS@ diff -ruN TiMidity++-1.3.4/doc/ja_JP.ujis/Makefile.am TiMidity++-1.3.5/doc/ja_JP.ujis/Makefile.am --- TiMidity++-1.3.4/doc/ja_JP.ujis/Makefile.am Thu Jan 14 11:59:08 1999 +++ TiMidity++-1.3.5/doc/ja_JP.ujis/Makefile.am Mon Mar 8 09:59:15 1999 @@ -24,4 +24,5 @@ README.dl \ README.sf \ README.tk \ - README.xskin + README.xskin \ + README.xaw diff -ruN TiMidity++-1.3.4/doc/ja_JP.ujis/Makefile.in TiMidity++-1.3.5/doc/ja_JP.ujis/Makefile.in --- TiMidity++-1.3.4/doc/ja_JP.ujis/Makefile.in Mon Mar 1 19:57:40 1999 +++ TiMidity++-1.3.5/doc/ja_JP.ujis/Makefile.in Mon Mar 8 11:41:12 1999 @@ -86,6 +86,7 @@ CC = @CC@ ELFILES = @ELFILES@ EMACS = @EMACS@ +EXEEXT = @EXEEXT@ EXTRADEFS = @EXTRADEFS@ EXTRALIBS = @EXTRALIBS@ GTK_CFLAGS = @GTK_CFLAGS@ @@ -113,7 +114,8 @@ README.dl \ README.sf \ README.tk \ - README.xskin + README.xskin \ + README.xaw mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../config.h ../../interface.h CONFIG_CLEAN_FILES = diff -ruN TiMidity++-1.3.4/doc/ja_JP.ujis/README.xaw TiMidity++-1.3.5/doc/ja_JP.ujis/README.xaw --- TiMidity++-1.3.4/doc/ja_JP.ujis/README.xaw Thu Jan 1 09:00:00 1970 +++ TiMidity++-1.3.5/doc/ja_JP.ujis/README.xaw Mon Mar 8 09:58:49 1999 @@ -0,0 +1,188 @@ +--------------------------------------------------------------------- + TiMidity++ ¤Î Xaw ¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Î»È¤¤Êý + +TiMidity++ ¤Î Xaw ¥¤¥ó¥¿¥Õ¥§¡¼¥¹ ¤Ï¡¢X Window System ¤Îɸ½à¤Î¥Ä¡¼¥ë¥­¥Ã¥È +¤Ç¤¢¤ë Athena ¥¦¥£¥¸¥§¥Ã¥È¥»¥Ã¥È¤È Xt ¥é¥¤¥Ö¥é¥ê¤Î¤ß¤Ë¤è¤ë GUI ¤òÄ󶡤·¤Þ +¤¹¡£ + + +* WHAT'S NEW in 1.3 + +- ¥·¥ç¡¼¥È¥«¥Ã¥È¥­¡¼¤ÎƳÆþ +- ¥­¡¼¥Ü¡¼¥Éɽ¼¨¤ò´Þ¤à¥È¥ì¡¼¥¹¥¦¥£¥ó¥É¥¦ +- X ¤Î¥ê¥½¡¼¥¹Êѹ¹¤ò²Äǽ¤Ë¤·¤¿ +- OffiX ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥É¥é¥Ã¥°¥¢¥ó¥É¥É¥í¥Ã¥×¤¬¥µ¥Ý¡¼¥È¤µ¤ì¤¿ +- µ¯Æ°¸å¤Ë MIDI ¥Õ¥¡¥¤¥ë¤ÎÄɲῺï½ü¤¬¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤Ã¤¿ +- µ¯Æ°¸å¤Ë timidity ¤Î³ÈÄ¥¥ª¥×¥·¥ç¥óÀßÄê¤òÊѹ¹¤Ç¤­¤ë¤è¤¦¤Ë¤·¤¿ + + +* USAGE + +¿· Xaw ¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ë¤Ï°Ê²¼¤Î¥Õ¥¡¥¤¥ë¥á¥Ë¥å¡¼¤¬¤¢¤ê¤Þ¤¹¡£ + + LOAD + Äɲà MIDI ¥Õ¥¡¥¤¥ë¤Î¥í¡¼¥É + + SAVE CONFIG + shuffle, repeat, auto-start, auto-exit ¤Ê¤É¤ÎÀßÄê¤ò + ~/.xtimidity ¤ËÊݸ + + HIDE/UNHIDE MESSAGES + ¥á¥Ã¥»¡¼¥¸¤òɽ¼¨¤¹¤ë¥Æ¥­¥¹¥ÈÍó¤Îɽ¼¨¤ò¡¿Èóɽ¼¨¤ÎÀÚ¤êÂؤ¨ + + HIDE/UNHIDE TRACE + ¥È¥ì¡¼¥¹É½¼¨¤ÎÀÚ¤êÂؤ¨ + + SHUFFLE + shuffle¥â¡¼¥É¤ÎÀÚ¤êÂؤ¨ + + REPEAT + ·«¤êÊÖ¤·¥â¡¼¥É¤ÎÀÚ¤êÂؤ¨ + + AUTO-START + ¼«Æ°±éÁդΥե饰 + + AUTO-EXIT + ±éÁÕ¸å¤Î¥×¥í¥°¥é¥à¼«Æ°½ªÎ»¤ò¤¹¤ë¥Õ¥é¥° + + FILE LIST + ±éÁÕ¥Õ¥¡¥¤¥ë¥ê¥¹¥È¥¦¥£¥ó¥É¥¦¤Îɽ¼¨ + + EXTEND MODES + ³ÈÄ¥¥â¡¼¥ÉÀ©¸æ¥¦¥£¥ó¥É¥¦¤Îɽ¼¨ + + QUIT + timidity¤Î½ªÎ» + + +ver.1.3 ¤«¤é¡¢¥Õ¥¡¥¤¥ë¤Î Load ¥á¥Ë¥å¡¼¤È File List ¥¦¥£¥ó¥É¥¦¤«¤é±éÁÕ¥Õ¥¡¥¤¥ë +¤ÎÄɲäȺï½ü¤¬¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£±éÁÕ¥Õ¥¡¥¤¥ë¤ÎÁªÂò¤Ï¡¢¥¿¥¤¥È¥ë¥Ü¥¿ +¥ó¤«¤é¤Î¥×¥ë¥À¥¦¥ó¥á¥Ë¥å¡¼¤È File List ¥¦¥£¥ó¥É¥¦¤ÎξÊý¤Ç¤Ç¤­¤Þ¤¹¡£ +³Æ¥¦¥£¥ó¥É¥¦¤Ë¤ª¤±¤ë¥­¡¼¥Ü¡¼¥É¥·¥ç¡¼¥È¥«¥Ã¥È¤Ï°Ê²¼¤Î¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹: + +¡Ô¥á¥¤¥ó¥¦¥£¥ó¥É¥¦¡Õ + [Enter] : ±éÁÕ³«»Ï + [Space] : °ì»þÄä»ß / ±éÁպƳ« + [c] : Ää»ß + [q] : TiMidity++ ¤Î½ªÎ» + [p] or [Left] : Á°¤Î¶Ê + [n] or [Right] : ¼¡¤Î¶Ê + [v] or [Down] : ¥Ü¥ê¥å¡¼¥à¸º (10%) + [V] or [Up] : ¥Ü¥ê¥å¡¼¥àÁý (10%) + [Alt + N] : ¥Õ¥¡¥¤¥ë¤Î¥í¡¼¥É + [Alt + S] : ÀßÄê¤ÎÊݸ + [Ctrl + M] : ¥á¥Ã¥»¡¼¥¸Íó¤Îɽ¼¨¡¿Èóɽ¼¨ÀÚ¤êÂؤ¨ + [Ctrl + T] : ¥È¥ì¡¼¥¹É½¼¨¤Îɽ¼¨¡¿Èóɽ¼¨ÀÚ¤êÂؤ¨ + [Ctrl + S] : ¥·¥ã¥Ã¥Õ¥ë¤ÎÀÚ¤êÂؤ¨ + [Ctrl + R] : ·«¤êÊÖ¤·¤ÎÀÚ¤êÂؤ¨ + +¡Ô¥Õ¥¡¥¤¥ë¥ê¥¹¥È¥¦¥£¥ó¥É¥¦¡Õ + [p] or [Up] : ¥«¡¼¥½¥ë¤òÁ°¤Î¥Õ¥¡¥¤¥ë¤Ë°ÜÆ° + [n] or [Down] : ¥«¡¼¥½¥ë¤ò¼¡¤Î¥Õ¥¡¥¤¥ë¤Ë°ÜÆ° + [Right] : ¥«¡¼¥½¥ë¤ò 5 ¤ÄÁ°¤Î¥Õ¥¡¥¤¥ë¤Ë°ÜÆ° + [Left] : ¥«¡¼¥½¥ë¤ò 5 ¤Ä¼¡¤Î¥Õ¥¡¥¤¥ë¤Ë°ÜÆ° + [v] : ¥Ü¥ê¥å¡¼¥à¸º (10%) + [V] : ¥Ü¥ê¥å¡¼¥àÁý (10%) + [Enter] or [R] : ¥«¡¼¥½¥ë°ÌÃ֤Υե¡¥¤¥ë¤ò±éÁÕ + [d] : ¥«¡¼¥½¥ë°ÌÃ֤Υե¡¥¤¥ë¤ò¥ê¥¹¥È¤«¤éºï½ü + [Space] : °ì»þÄä»ß / ±éÁպƳ« + [s] : Ää»ß + [q] : TiMidity++ ¤ò½ªÎ» + [c] : ¥¦¥£¥ó¥É¥¦¤òÊĤ¸¤ë + +¡Ô³ÈÄ¥¥ª¥×¥·¥ç¥óÀßÄꥦ¥£¥ó¥É¥¦¡Õ + [c] : ¥¦¥£¥ó¥É¥¦¤òÊĤ¸¤ë + [q] : TiMidity++ ¤Î½ªÎ» + +¡Ô¥Õ¥¡¥¤¥ëÄɲ妥£¥ó¥É¥¦¤ÎÁªÂò¥À¥¤¥¢¥í¥°¡Õ + [Tab] : ¥Õ¥¡¥¤¥ë̾¤ÎÊä´Ö¤ò¤¹¤ë + [Enter] : ¤½¤Î¥Ç¥£¥ì¥¯¥È¥ê¤òÁª¤ó¤ÇºÆɽ¼¨¤¹¤ë + [Escape] or [CTRL]+[g] : ÁªÂò¤ò¥­¥ã¥ó¥»¥ë¤·¡¢¥¦¥£¥ó¥É¥¦¤òÊĤ¸¤ë + [Ctrl-a] : ¥«¡¼¥½¥ë¤ò¹ÔƬ¤Ë°ÜÆ° + [Ctrl-e] : ¥«¡¼¥½¥ë¤ò¹ÔËö¤Ë°ÜÆ° + [Ctrl-k] : ¥«¡¼¥½¥ë°Ê²¼¤Îʸ»úÎó¾Ãµî + + +¥Ð¡¼¥¸¥ç¥ó1.1 ¤«¤é¡¢¥È¥ì¡¼¥¹É½¼¨¤¬¥µ¥Ý¡¼¥È¤µ¤ì¡¢1.3 ¤«¤éɽ¼¨¹àÌܤ¬³ÈÄ¥¤µ¤ì +ɽ¼¨¤â°ì¿·¤µ¤ì¤Þ¤·¤¿¡£É½¼¨¤ò¸«¤ë¤È¤­¤Ï¡¢t ¤È¤¤¤¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹¥ª¥×¥·¥ç¥ó¤ò +²Ã¤¨¤Æ -iat ¤È¤¤¤¦µ¯Æ°¥ª¥×¥·¥ç¥ó¤Ç TiMidity++ ¤òΩ¤Á¾å¤²¤Æ²¼¤µ¤¤¡£ +(¾ÜºÙ¤Ï¥Þ¥Ë¥å¥¢¥ë¤ò»²¾È¤Î¤³¤È) +³Æ MIDI ¥Á¥ã¥ó¥Í¥ëËè¤Î¥Ü¥ê¥å¡¼¥à¡¢Expression, ¥Ñ¥ó¥Ý¥Ã¥È¡¢¥Ô¥Ã¥Á¥Ù¥ó¥É¡¢¥ê +¥Ð¡¼¥Ö¡¢¥³¡¼¥é¥¹¤ÎÆ°¤­¤ä¥¤¥ó¥¹¥È¥ë¥á¥ó¥È»ØÄê¤ò¥ê¥¢¥ë¥¿¥¤¥à¤Ë¸«¤ë¤³¤È¤¬¤Ç¤­¡¢ +³Æ¥Á¥ã¥ó¥Í¥ë¤Î±éÁդϥ­¡¼¥Ü¡¼¥É¾å¤Ëɽ¼¨¤µ¤ì¤Þ¤¹¡£¥È¥ì¡¼¥¹²èÌ̾å¤Ç¥Þ¥¦¥¹º¸¥Ü +¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¤È¡¢¡Ö¥Ô¥Ã¥Á¥Ù¥ó¥É¡¢³Ú´ï̾¡×¤È¡Ö¥È¡¼¥ó¥Ð¥ó¥¯¡¢¥ê¥Ð¡¼¥Ö¡¢¡× +¥³¡¼¥é¥¹¡×¤Îɽ¼¨¤òÀÚ¤êÂؤ¨¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ + + +* INSTALLATION + +TiMidity++ ¤Ç¤Ï GNU configure ¤Ç¥½¡¼¥¹¤Î build ¤ò¹Ô¤Ê¤¤¤Þ¤¹¤¬¡¢libXaw3d ¤¬ +¥·¥¹¥Æ¥à¤Ë¸ºß¤¹¤ë¤È¡¢¥Ç¥Õ¥©¥ë¥È¤Ç¤½¤ì¤ò»È¤¦¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£Xaw ¤ò»È¤¤¤¿¤¤ +¾ì¹ç¤Ï¡¢configure ¸å¤Ë¡¢common.makefile ¤ò¼ê¤ÇÊÔ½¸¤·¤Æ¡¢-DXAW3D ¤òºï¤ê¡¢ +-lXaw3d ¤ò-lXaw ¤Ëľ¤¹¤è¤¦¤Ê½¤Àµ¤ò²Ã¤¨¤Æ²¼¤µ¤¤¡£ +¥Æ¥­¥¹¥ÈÍó¤È¤·¤Æ½¾Íè¤Î¥é¥Ù¥ë¥¦¥£¥¸¥§¥Ã¥È¤ò»È¤¤¤¿¤¤¾ì¹ç¤Ï¡¢interface/xaw.h ¤Î + + #define WIDGET_IS_LABEL_WIDGET + +¹Ô¤¬Í­¸ú¤Ë¤Ê¤ë¤è¤¦¤Ë¥³¥á¥ó¥È(/* */)¤ò³°¤·¤Æ¤«¤é make clean, make ¤·¤Æ²¼¤µ +¤¤¡£ +locale¤Î¥µ¥Ý¡¼¥È¤¬Ìµ¤¤¥·¥¹¥Æ¥à¤Ç¡¢¤«¤Ä X ¤¬¹ñºÝ²½¤µ¤ì¤Æ¤¤¤Ê¤¤(X_LOCALE̵¤·¤Ç¥³ +¥ó¥Ñ¥¤¥ë¤µ¤ì¤Æ¤¤¤ë X¥µ¡¼¥Ð¤ò»È¤Ã¤Æ¤¤¤ë)¾ì¹ç¤Ï¡¢xaw.h ¤Î + + #define I18N + +¤ò #undef I18N ¤Ë½ñ¤­´¹¤¨¤Æ¤«¤é TiMidity++ ¤ò¥³¥ó¥Ñ¥¤¥ë¤·¤Æ²¼¤µ¤¤¡£ +½é´üÀßÄê¥Õ¥¡¥¤¥ë¤Ï¥Ç¥Õ¥©¥ë¥È¤Ç $(HOME)/.xtimidity ¤È¤Ê¤Ã¤Æ¤¤¤Þ¤¹¤¬¡¢¤³¤Î¥Õ¥¡¥¤ +¥ë̾¤òÊѤ¨¤¿¤¤¾ì¹ç¤Ï¡¢ + + #define INITIAL_CONFIG ".xtimidity" + +¹Ô¤òÊѹ¹¤·¤Æ²¼¤µ¤¤¡£ + + +* RESOURCES + +¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¥¯¥é¥¹Ì¾¤Ï TiMidity ¤Ç¤¹¤Î¤Ç¡¢¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤Î +.Xdefaults ¤Þ¤¿¤Ï .Xresource ¤ÎÃæ¤Ç¡¢°Ê²¼¤ÎÎã¤Î¤è¤¦¤Ê»ØÄ꤬¤Ç¤­¤Þ¤¹¡£ + + TiMidity*textbackground: LemonChiffon + TiMidity*background: PeachPuff1 + TiMidity*menubutton: goldenrod + TiMidity*buttonbackground: gold + TiMidity*labelfont: -adobe-helvetica-bold-o-*-*-14-*-75-75-*-*-*-* + +ÂåɽŪ¤Ê¤Ê¥ê¥½¡¼¥¹Ì¾¤Ï°Ê²¼¤ÎÄ̤ê¤Ç¤¹¡£ + +¥ê¥½¡¼¥¹Ì¾ ¥ê¥½¡¼¥¹¤Î¥¯¥é¥¹ ¥Ç¥Õ¥©¥ë¥È¤ÎÃÍ +---------------------------------------------------------- +bitmapDir BitmapDir "DEFAULT_PATH/bitmaps" + ¥Ü¥¿¥ó¤Î¥Ó¥Ã¥È¥Þ¥Ã¥×¥Õ¥¡¥¤¥ë¤¬ÃÖ¤«¤ì¤Æ¤¤¤ë¥Ç¥£¥ì¥¯¥È¥ê +arrangeTitle ArrangeTitle False + ¥¦¥£¥ó¥É¥¦¥¿¥¤¥È¥ë¤Ë MIDI ¥¿¥¤¥È¥ë¤òɽ¼¨¤¹¤ë +background Background gray65 + ¼ç¥¦¥£¥ó¥É¥¦¤ÎÇØ·Ê¿§ +menubutton MenuButtonBackground #CCFF33 + ¥á¥Ë¥å¡¼¥Ü¥¿¥ó¤ÎÇØ·Ê¿§ +textbackground TextBackground gray85 + ¥Æ¥­¥¹¥ÈÍó¤ÎÇØ·Ê¿§ +buttonbackground ButtonBackground gray76 + ¥³¥Þ¥ó¥É¥Ü¥¿¥ó¤È¥Õ¥¡¥¤¥ë¡¿¥ª¥×¥·¥ç¥ó¥¦¥£¥ó¥É¥¦¤ÎÇØ·Ê¿§ +togglebackground ToggleBackground gray76 + ¥È¥°¥ë¥Ü¥¿¥ó¤ÎÇØ·Ê¿§ +tracebackground TraceBackground gray90 + ¥È¥ì¡¼¥¹²èÌ̤ΤÎÇØ·Ê¿§ +labelfont LabelFont -adobe-helvetica-bold-r-*-*-14-*-75-75-*-*-*-* + ¥é¥Ù¥ë¥¦¥£¥¸¥§¥Ã¥È¤Î¥Õ¥©¥ó¥È +volumefont VolumeFont -adobe-helvetica-bold-r-*-*-12-*-75-75-*-*-*-* + volume ¥é¥Ù¥ë¤Î¥Õ¥©¥ó¥È +tracefont TraceFont -*-*-medium-r-normal--14-*-*-*-*-*-*-* + ¥È¥ì¡¼¥¹²èÌ̤Υե©¥ó¥È + + +* BUGS + +¸½ºß¤Î Xaw ¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ç¤Ï¡¢MIDI ¥Õ¥¡¥¤¥ë¤Î¥ê¥¹¥Èɽ¼¨¤ÎºÝ¤Ë¡¢¥Õ¥¡¥¤¥ë +¤Î̵ͭ¤ä MIDI ¥Õ¥¡¥¤¥ë¤Ç¤¢¤ë¤«¤É¤¦¤«¤Î¥Á¥§¥Ã¥¯¤ò¤·¤Æ¤¤¤Þ¤»¤ó¡£ + + + ¹Ó°æÎɽŠ(Yoshishige Arai) diff -ruN TiMidity++-1.3.4/interface/Makefile.am TiMidity++-1.3.5/interface/Makefile.am --- TiMidity++-1.3.4/interface/Makefile.am Wed Feb 24 19:15:17 1999 +++ TiMidity++-1.3.5/interface/Makefile.am Mon Mar 8 10:29:52 1999 @@ -182,7 +182,9 @@ misc.tcl \ timidity.el \ check.xbm \ - arrow.xbm + arrow.xbm \ + on.xbm \ + off.xbm .ptcl.tcl: sed -e s@%TCL_DIR%@$(TCL_DIR)@g -e s@%TIMID_DIR%@$(TIMID_DIR)@g $< > $@ diff -ruN TiMidity++-1.3.4/interface/Makefile.in TiMidity++-1.3.5/interface/Makefile.in --- TiMidity++-1.3.4/interface/Makefile.in Mon Mar 1 19:57:24 1999 +++ TiMidity++-1.3.5/interface/Makefile.in Mon Mar 8 11:40:54 1999 @@ -85,6 +85,7 @@ ALSA_LIBS = @ALSA_LIBS@ CC = @CC@ EMACS = @EMACS@ +EXEEXT = @EXEEXT@ EXTRADEFS = @EXTRADEFS@ EXTRALIBS = @EXTRALIBS@ GTK_CFLAGS = @GTK_CFLAGS@ @@ -243,7 +244,9 @@ misc.tcl \ timidity.el \ check.xbm \ - arrow.xbm + arrow.xbm \ + on.xbm \ + off.xbm @ENABLE_TCLTK_TRUE@install_tk = install.tk @ENABLE_DYNAMIC_TCLTK_TRUE@install_tk = install.tk @@ -514,8 +517,8 @@ ../timidity/playmidi.h ../timidity/readmidi.h \ ../timidity/output.h ../timidity/controls.h \ ../timidity/miditrace.h ../utils/timer.h xaw.h -xaw_i.o: xaw_i.c ../config.h xaw.h check.xbm arrow.xbm \ - ../timidity/timidity.h ../timidity/common.h ../libarc/url.h \ +xaw_i.o: xaw_i.c ../config.h xaw.h ../timidity/timidity.h check.xbm \ + arrow.xbm on.xbm off.xbm ../timidity/common.h ../libarc/url.h \ ../utils/mblock.h ../timidity/instrum.h ../timidity/playmidi.h \ ../timidity/readmidi.h ../timidity/controls.h xskin_c.o: xskin_c.c ../config.h ../timidity/timidity.h \ diff -ruN TiMidity++-1.3.4/interface/bitmaps/Makefile.in TiMidity++-1.3.5/interface/bitmaps/Makefile.in --- TiMidity++-1.3.4/interface/bitmaps/Makefile.in Mon Mar 1 19:57:29 1999 +++ TiMidity++-1.3.5/interface/bitmaps/Makefile.in Mon Mar 8 11:40:59 1999 @@ -86,6 +86,7 @@ CC = @CC@ ELFILES = @ELFILES@ EMACS = @EMACS@ +EXEEXT = @EXEEXT@ EXTRADEFS = @EXTRADEFS@ EXTRALIBS = @EXTRALIBS@ GTK_CFLAGS = @GTK_CFLAGS@ diff -ruN TiMidity++-1.3.4/interface/motif_bitmaps/Makefile.in TiMidity++-1.3.5/interface/motif_bitmaps/Makefile.in --- TiMidity++-1.3.4/interface/motif_bitmaps/Makefile.in Mon Mar 1 19:57:28 1999 +++ TiMidity++-1.3.5/interface/motif_bitmaps/Makefile.in Mon Mar 8 11:40:58 1999 @@ -86,6 +86,7 @@ CC = @CC@ ELFILES = @ELFILES@ EMACS = @EMACS@ +EXEEXT = @EXEEXT@ EXTRADEFS = @EXTRADEFS@ EXTRALIBS = @EXTRALIBS@ GTK_CFLAGS = @GTK_CFLAGS@ diff -ruN TiMidity++-1.3.4/interface/off.xbm TiMidity++-1.3.5/interface/off.xbm --- TiMidity++-1.3.4/interface/off.xbm Thu Jan 1 09:00:00 1970 +++ TiMidity++-1.3.5/interface/off.xbm Mon Mar 8 09:57:06 1999 @@ -0,0 +1,9 @@ +#define off_width 32 +#define off_height 16 +static unsigned char off_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xc0, 0xe3, 0xef, 0x0f, 0x60, 0xc6, 0xcc, 0x0c, 0x30, 0xcc, 0xc8, 0x08, + 0x30, 0xcc, 0xc2, 0x02, 0x30, 0xcc, 0xc3, 0x03, 0x30, 0xcc, 0xc2, 0x02, + 0x30, 0xcc, 0xc0, 0x00, 0x60, 0xc6, 0xc0, 0x00, 0xc0, 0xe3, 0xe1, 0x01, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; diff -ruN TiMidity++-1.3.4/interface/on.xbm TiMidity++-1.3.5/interface/on.xbm --- TiMidity++-1.3.4/interface/on.xbm Thu Jan 1 09:00:00 1970 +++ TiMidity++-1.3.5/interface/on.xbm Mon Mar 8 09:57:06 1999 @@ -0,0 +1,9 @@ +#define on_width 32 +#define on_height 16 +static unsigned char on_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x1e, 0xe7, 0x00, 0x00, 0x33, 0x4e, 0x00, 0x80, 0x61, 0x4e, 0x00, + 0x80, 0x61, 0x5a, 0x00, 0x80, 0x61, 0x5a, 0x00, 0x80, 0x61, 0x72, 0x00, + 0x80, 0x61, 0x72, 0x00, 0x00, 0x33, 0x62, 0x00, 0x00, 0x1e, 0x47, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; diff -ruN TiMidity++-1.3.4/interface/pixmaps/Makefile.in TiMidity++-1.3.5/interface/pixmaps/Makefile.in --- TiMidity++-1.3.4/interface/pixmaps/Makefile.in Mon Mar 1 19:57:31 1999 +++ TiMidity++-1.3.5/interface/pixmaps/Makefile.in Mon Mar 8 11:41:02 1999 @@ -86,6 +86,7 @@ CC = @CC@ ELFILES = @ELFILES@ EMACS = @EMACS@ +EXEEXT = @EXEEXT@ EXTRADEFS = @EXTRADEFS@ EXTRALIBS = @EXTRALIBS@ GTK_CFLAGS = @GTK_CFLAGS@ diff -ruN TiMidity++-1.3.4/interface/timidity.el TiMidity++-1.3.5/interface/timidity.el --- TiMidity++-1.3.4/interface/timidity.el Sun Feb 21 20:11:06 1999 +++ TiMidity++-1.3.5/interface/timidity.el Thu Mar 4 14:18:23 1999 @@ -114,7 +114,7 @@ (error "Window is too small.")) (kill-all-local-variables) (use-local-map timidity-mode-map) - (setq mode-name "TiMydity") + (setq mode-name "TiMidity") (setq major-mode 'timidity-mode) (run-hooks 'timidity-mode-hook) (timidity-make-windows) diff -ruN TiMidity++-1.3.4/interface/xaw.h TiMidity++-1.3.5/interface/xaw.h --- TiMidity++-1.3.4/interface/xaw.h Sun Feb 21 20:13:53 1999 +++ TiMidity++-1.3.5/interface/xaw.h Mon Mar 8 10:24:54 1999 @@ -57,4 +57,73 @@ #define SPACE 0x20 #define TAB 0x09 +#define MODUL_N 0 +#define PORTA_N 1 +#define NRPNV_N 2 +#define REVERB_N 3 +#define CHPRESSURE_N 4 +#define OVERLAPV_N 5 +#define TXTMETA_N 6 +#define MAX_OPTION_N 7 + +#define MODUL_BIT (1<rate; return RC_JUMP; case 'V' : a_pipe_read(local_buf,sizeof(local_buf)); - n=atoi(local_buf+2); amp_diff=n - amplitude; - *valp=(int32)amp_diff; return RC_CHANGE_VOLUME; - case 'v' : a_pipe_read(local_buf,sizeof(local_buf)); - n=atoi(local_buf+2); - *valp=(int32)n; return RC_CHANGE_VOLUME; - case '+': a_pipe_read(local_buf,sizeof(local_buf)); + amplification=atoi(local_buf+2); *valp=(int32)0; + return RC_CHANGE_VOLUME; + case '+': a_pipe_read(local_buf,sizeof(local_buf)); *valp = (int32)1; return RC_KEYUP; - case '-': a_pipe_read(local_buf,sizeof(local_buf)); + case '-': a_pipe_read(local_buf,sizeof(local_buf)); *valp = (int32)-1; return RC_KEYDOWN; case '>': a_pipe_read(local_buf,sizeof(local_buf)); *valp = (int32)1; return RC_SPEEDUP; @@ -411,6 +442,18 @@ a_pipe_read(local_buf,sizeof(local_buf)); if (strcmp("READY",local_buf)) return; xaw_ready=1; + + sprintf(local_buf,"%d", + (opt_modulation_wheel<FILEVPORT_HEIGHT)? h1:FILEVPORT_HEIGHT),NULL); +} + +static void flistcloseCB(Widget w,XtPointer data,XtPointer dummy) { + XtPopdown(popup_file); +} + +/*ARGSUSED*/ +static void optionscloseCB(Widget w,XtPointer data,XtPointer dummy) { + XtPopdown(popup_opt); +} + +/*ARGSUSED*/ +static void optionsdestroyCB(Widget w,XtPointer data,XtPointer dummy) { + popup_shell_exist &= (! OPTIONS_WINDOW); +} + +/*ARGSUSED*/ static void quitCB(Widget w,XtPointer data,XtPointer dummy) { a_pipe_write("Q"); } @@ -682,35 +806,46 @@ a_pipe_write(local_buf); } -static void volsetCB(Widget w,XtPointer data,XtPointer call_data) -{ - static int tmpval; - char s[16]; - float percent = *(float*)call_data; - int value = (float)(MAXVOLUME * percent); +static void setVolbar(int val) { + char s[8]; float thumb, l_thumb; - if (tmpval == value) return; - if (amplitude > MAXVOLUME) amplitude = MAXVOLUME; - tmpval = value; - l_thumb = thumb = (float)amplitude / (float)MAXVOLUME; - sprintf(s, "%d", tmpval); + amplitude = (val > MAXVOLUME)? MAXVOLUME:val; + sprintf(s, "%d", val); XtVaSetValues(vol_l, XtNlabel, s, NULL); - sprintf(s, "V %03d\n", tmpval); + sprintf(s, "V %03d\n", val); a_pipe_write(s); + thumb = (float)val / (float)MAXVOLUME; + sprintf(s, "%d", val); + XtVaSetValues(vol_l, XtNlabel, s, NULL); + if (sizeof(thumb) > sizeof(XtArgVal)) { + XtVaSetValues(vol_bar, XtNtopOfThumb, &thumb, NULL); + } else { + XtArgVal *l_thumb = (XtArgVal *) &thumb; + XtVaSetValues(vol_bar, XtNtopOfThumb,*l_thumb, NULL); + } +} + +static void volsetCB(Widget w,XtPointer data,XtPointer call_data) { + float percent = *(float*)call_data; + int val = (float)(MAXVOLUME * percent); + + if (amplitude == val) return; + setVolbar(val); } static void volupdownCB(Widget w,XtPointer data,XtPointer diff) { - char s[8]; - sprintf(s, "v %03d\n", (((int)diff > 0)? (-10):10)); - a_pipe_write(s); + int i = ((int)diff > 0)? (-10):10; + + i += amplitude; + setVolbar(i); } static void volupdownAction(Widget w,XEvent *e,String *v,Cardinal *n) { - char s[8]; + int i = atoi(*v); - sprintf(s, "v %03d\n", atoi(*v)); - a_pipe_write(s); + i += amplitude; + setVolbar(i); } static void tunesetCB(Widget w,XtPointer data,XtPointer call_data) @@ -770,8 +905,7 @@ Position y1; int i,tmp,tmp2,tmp3; - XtVaGetValues(toplevel,XtNwidth,&w1,NULL); - XtVaGetValues(toplevel,XtNheight,&h1,NULL); + XtVaGetValues(toplevel,XtNwidth,&w1,XtNheight,&h1,NULL); w2 = w1 -8; if(w2>TRACEVPORT_WIDTH) w2 = TRACEVPORT_WIDTH; XtVaGetValues(lyric_t,XtNheight,&h2,NULL); @@ -916,8 +1050,7 @@ break; case ID_HIDETRACE: if(ctl->trace_playing) { - XtVaGetValues(toplevel,XtNheight,&h1,NULL); - XtVaGetValues(toplevel,XtNwidth,&w1,NULL); + XtVaGetValues(toplevel,XtNheight,&h1,XtNwidth,&w1,NULL); if(XtIsManaged(trace_vport)) { tmp = trace_height + (XtIsManaged(lyric_t) ? 0:lyric_height); XtUnmanageChild(trace_vport); @@ -933,8 +1066,7 @@ } break; case ID_HIDETXT: - XtVaGetValues(toplevel,XtNheight,&h1,NULL); - XtVaGetValues(toplevel,XtNwidth,&w1,NULL); + XtVaGetValues(toplevel,XtNheight,&h1,XtNwidth,&w1,NULL); if(XtIsManaged(lyric_t)) { if(ctl->trace_playing) { tmp = lyric_height + (XtIsManaged(trace_vport) ? 0:trace_height); @@ -964,8 +1096,14 @@ case ID_REPEAT: repeatAction(NULL,NULL,NULL,NULL); break; + case ID_OPTIONS: + optionspopupCB(w,NULL,NULL); + break; + case ID_FILELIST: + flistpopupCB(w,NULL,NULL); + break; case ID_QUIT: - quitCB(w, NULL, NULL); + quitCB(w,NULL,NULL); break; } } @@ -1037,6 +1175,7 @@ char s[16], c; int i=0, n, ch, note; float thumb; + String *p; a_pipe_read(local_buf,sizeof(local_buf)); switch (local_buf[0]) { @@ -1066,6 +1205,9 @@ { char *name; name=strrchr(local_buf+2,' '); + n= atoi(local_buf+2); + if(popup_shell_exist & FLIST_WINDOW) + XawListHighlight(file_list, n-1); if(name==NULL) break; name++; @@ -1090,9 +1232,9 @@ break; case 'Q' : exit(0); case 'V': - i=atoi(local_buf+2); - thumb = (float)i / (float)MAXVOLUME; - sprintf(s, "%d", i); + amplitude=atoi(local_buf+2); + thumb = (float)amplitude / (float)MAXVOLUME; + sprintf(s, "%d", amplitude); XtVaSetValues(vol_l, XtNlabel, s, NULL); if (sizeof(thumb) > sizeof(XtArgVal)) { XtVaSetValues(vol_bar, XtNtopOfThumb, &thumb, NULL); @@ -1118,7 +1260,15 @@ max_files+=atoi(local_buf+2); for (i=n;iFILEVPORT_HEIGHT)? h:FILEVPORT_HEIGHT),NULL); } break; case 'Y': @@ -1393,13 +1543,13 @@ } else { f_num++; } - dirlist[i] = XtMalloc(sizeof(char) * strlen(filename) + 1); + dirlist[i] = XtMalloc(sizeof(char) * (strlen(filename) + 1)); strcpy(dirlist[i++], filename); } qsort (dirlist, i, sizeof (char *), dirlist_cmp); dirlist[i] = NULL; snprintf(local_buf, sizeof(local_buf), "%d Directories, %d Files", d_num, f_num); - XawListChange(list, dirlist, 0,0,True); + XawListChange(list,dirlist,0,0,True); XtVaSetValues(label,XtNlabel,currdir,NULL); XtVaSetValues(load_info,XtNlabel,local_buf,NULL); strcpy(basepath, currdir); @@ -1659,8 +1809,7 @@ if(!ctl->trace_playing) return; if(!XtIsRealized(trace)) return; - XtVaGetValues(trace,XtNheight,&h1,NULL); - XtVaGetValues(trace,XtNwidth,&w1,NULL); + XtVaGetValues(trace,XtNheight,&h1,XtNwidth,&w1,NULL); XSetForeground(disp, gct, tracecolor); XFillRectangle(disp,XtWindow(trace),gct, 0,0,w1,h1); XSetForeground(disp, gct, boxcolor); @@ -1760,12 +1909,13 @@ ctl->cmsg(CMSG_WARNING,VERB_NORMAL,"something wrong with getting path."); if(full.basename != NULL) { int len, match = 0; - char filename[PATH_MAX], matchstr[PATH_MAX]; + char filename[PATH_MAX], matchstr[PATH_MAX],*path = "/"; char *fullpath = filename; URL dirp; len = strlen(full.basename); - if (NULL != (dirp=url_dir_open(full.dirname))) { + if(strlen(full.dirname)) path = full.dirname; + if (NULL != (dirp=url_dir_open(path))) { MBlockList pool; init_mblock(&pool); @@ -1835,6 +1985,12 @@ Cfg->shuffle = (Boolean)k; break; case S_DispTrace: Cfg->disptrace = (Boolean)k; break; + case S_CurVol: + Cfg->amplitude = (int)k; break; + case S_ExtOptions: + Cfg->extendopt = (int)k; break; + case S_ChorusOption: + Cfg->chorusopt = (int)k; break; } } @@ -1846,6 +2002,7 @@ static void a_saveconfig (char *file) { FILE *fp; Boolean s1, s2; + int i,flags; if ('\0' != *file) { if (NULL != (fp=fopen(file, "w"))) { @@ -1857,7 +2014,22 @@ fprintf(fp,"set %s %d\n",cfg_items[S_DispText],(int)(file_menu[ID_HIDETXT-100].bmflag ^ TRUE)); fprintf(fp,"set %s %d\n",cfg_items[S_ShufflePlay],(int)s2); fprintf(fp,"set %s %d\n",cfg_items[S_DispTrace],((int)file_menu[ID_HIDETRACE-100].bmflag ? 0:1)); + fprintf(fp,"set %s %d\n",cfg_items[S_CurVol],amplitude); fprintf(fp,"set %s %d\n",cfg_items[S_AutoExit],(int)file_menu[ID_AUTOQUIT-100].bmflag); + flags = 0; + for(i=0; i= 0) XtPopdown(psmenu[i--]); } -static void addOneFile(int max_files,int curr_num,char *fname) { - static Dimension tmpi = 0; - static int menu_height = 0; +/*ARGSUSED*/ +static void closeParent(Widget w, XEvent *e, String *v, Cardinal *n) { + XtPopdown(XtParent(w)); +} + +/*ARGSUSED*/ +static void flistMove(Widget w, XEvent *e, String *v, Cardinal *n) { + int i = atoi(*v); + XawListReturnStruct *lr = XawListShowCurrent(file_list); + + if(popup_shell_exist & FLIST_WINDOW) { + if(lr != NULL && lr->list_index != XAW_LIST_NONE) { + i += atoi(lr->string) -1; + if(i<0) i= 0; + if(i>=max_files) i= max_files -1; + XawListHighlight(file_list, i); + } else { + XawListHighlight(file_list, (i>0)? max_files-1:0); + } + } +} + +#define INIT_FLISTNUM MAX_DIRECTORY_ENTRY +static int max_num = INIT_FLISTNUM; + +static void addFlist(char *fname, int current_n) { + char *p; + + if(max_num < current_n+1) { + max_num += 64; + flist = (String *)safe_realloc(flist,(max_num+1)*sizeof(String)); + } + p = (char *)safe_malloc(sizeof(char) * (strlen(fname) +1)); + flist[current_n]= strcpy(p, fname); + flist[current_n+1]= NULL; +} + +static void addOneFile(int max_files,int curr_num,char *fname,Boolean update_flist) { + static Dimension tmpi; + static int menu_height; static Widget tmpw; - static int j = 0; + static int j; char sbuf[256]; - if (!maxentry_on_a_menu) tmpw = title_sm; + if(curr_num == 0) { + j = 0; tmpi = 0; menu_height = 0; tmpw = title_sm; + } if(menu_height + tmpi*2 > root_height) { if(!maxentry_on_a_menu) { maxentry_on_a_menu = j = curr_num; @@ -2006,8 +2217,257 @@ bsb=XtVaCreateManagedWidget(fname,smeBSBObjectClass,tmpw,NULL); XtAddCallback(bsb,XtNcallback,menuCB,(XtPointer)curr_num); XtVaGetValues(bsb, XtNheight, &tmpi, NULL); - if(!maxentry_on_a_menu) menu_height += tmpi; - else psmenu[submenu_n] = NULL; + if(!maxentry_on_a_menu) + menu_height += tmpi; + else + psmenu[submenu_n] = NULL; + if(update_flist) + addFlist(fname, curr_num); +} + +static void createOptions(void) { + static char s[64]; + + if(!(popup_shell_exist & OPTIONS_WINDOW)) { + popup_opt= XtVaCreatePopupShell("popup_option",transientShellWidgetClass, + toplevel,NULL); + popup_optbox= XtVaCreateManagedWidget("popup_optbox",boxWidgetClass,popup_opt, + XtNorientation,XtorientVertical, + XtNwidth,220,XtNheight,280, + XtNbackground,bgcolor,NULL); + modul_bb=XtVaCreateManagedWidget("modul_box",boxWidgetClass,popup_optbox, + XtNorientation,XtorientHorizontal, + XtNforeground,boxcolor, XtNbackground,bgcolor, + XtNborderWidth,0,NULL); + modul_b=XtVaCreateManagedWidget("modul_button",toggleWidgetClass,modul_bb, + XtNbitmap,off_mark, + XtNforeground,togglecolor, XtNbackground,buttonbgcolor, + NULL); + modul_l=XtVaCreateManagedWidget("modul_label",labelWidgetClass,modul_bb, + XtNlabel,"Modulation control", + XtNforeground,textcolor, XtNbackground,bgcolor, + XtNborderWidth,0,NULL); + porta_bb=XtVaCreateManagedWidget("porta_box",boxWidgetClass,popup_optbox, + XtNorientation,XtorientHorizontal, + XtNforeground,boxcolor, XtNbackground,bgcolor, + XtNborderWidth,0,NULL); + porta_b=XtVaCreateManagedWidget("porta_button",toggleWidgetClass,porta_bb, + XtNbitmap,off_mark,XtNfromVert,modul_b, + XtNforeground,togglecolor, XtNbackground,buttonbgcolor, + NULL); + porta_l=XtVaCreateManagedWidget("porta_label",labelWidgetClass,porta_bb, + XtNlabel,"Portamento control", + XtNforeground,textcolor, XtNbackground,bgcolor, + XtNborderWidth,0,NULL); + nrpnv_bb=XtVaCreateManagedWidget("nrpnv_box",boxWidgetClass,popup_optbox, + XtNorientation,XtorientHorizontal, + XtNforeground,boxcolor, XtNbackground,bgcolor, + XtNborderWidth,0,NULL); + nrpnv_b=XtVaCreateManagedWidget("nrpnv_button",toggleWidgetClass,nrpnv_bb, + XtNbitmap,off_mark,XtNfromVert,porta_b, + XtNforeground,togglecolor, XtNbackground,buttonbgcolor, + NULL); + nrpnv_l=XtVaCreateManagedWidget("nrpnv_label",labelWidgetClass,nrpnv_bb, + XtNlabel,"NRPN Vibration", + XtNforeground,textcolor, XtNbackground,bgcolor, + XtNborderWidth,0,NULL); + reverb_bb=XtVaCreateManagedWidget("reverb_box",boxWidgetClass,popup_optbox, + XtNorientation,XtorientHorizontal, + XtNforeground,boxcolor, XtNbackground,bgcolor, + XtNborderWidth,0,NULL); + reverb_b=XtVaCreateManagedWidget("reverb_button",toggleWidgetClass,reverb_bb, + XtNbitmap,off_mark,XtNfromVert,nrpnv_b, + XtNforeground,togglecolor, XtNbackground,buttonbgcolor, + NULL); + reverb_l=XtVaCreateManagedWidget("reverb_label",labelWidgetClass,reverb_bb, + XtNlabel,"Reverb control", + XtNforeground,textcolor, XtNbackground,bgcolor, + XtNborderWidth,0,NULL); + chorus_bb=XtVaCreateManagedWidget("chorus_box",boxWidgetClass,popup_optbox, + XtNorientation,XtorientHorizontal, + XtNforeground,boxcolor, XtNbackground,bgcolor, + XtNborderWidth,0,NULL); + chorus_b=XtVaCreateManagedWidget("chorus_button",toggleWidgetClass,chorus_bb, + XtNbitmap,off_mark,XtNfromVert,reverb_b, + XtNforeground,togglecolor, XtNbackground,buttonbgcolor, + NULL); + if(init_chorus>1) + sprintf(s, "Chorus control (fixed to %d)", init_chorus); + else + sprintf(s, "Chorus control"); + chorus_l=XtVaCreateManagedWidget("chorus_label",labelWidgetClass,chorus_bb, + XtNlabel,s, + XtNforeground,textcolor, XtNbackground,bgcolor, + XtNborderWidth,0,NULL); + chpressure_bb=XtVaCreateManagedWidget("chpressure_box",boxWidgetClass,popup_optbox, + XtNorientation,XtorientHorizontal,XtNfromVert,chorus_b, + XtNforeground,boxcolor, XtNbackground,bgcolor, + XtNborderWidth,0,NULL); + chpressure_b=XtVaCreateManagedWidget("chpressure_button",toggleWidgetClass,chpressure_bb, + XtNbitmap,off_mark,XtNfromVert,chorus_b, + XtNforeground,togglecolor, XtNbackground,buttonbgcolor, + NULL); + chpressure_l=XtVaCreateManagedWidget("chpressure_label",labelWidgetClass,chpressure_bb, + XtNlabel,"Channel Pressure control", + XtNforeground,textcolor, XtNbackground,bgcolor, + XtNborderWidth,0,NULL); + overlapv_bb=XtVaCreateManagedWidget("overlapvoice_box",boxWidgetClass,popup_optbox, + XtNorientation,XtorientHorizontal,XtNfromVert,chpressure_b, + XtNforeground,boxcolor, XtNbackground,bgcolor, + XtNborderWidth,0,NULL); + overlapv_b=XtVaCreateManagedWidget("overlapvoice_button",toggleWidgetClass,overlapv_bb, + XtNbitmap,off_mark,XtNfromVert,chpressure_b, + XtNforeground,togglecolor, XtNbackground,buttonbgcolor, + NULL); + overlapv_l=XtVaCreateManagedWidget("overlapv_label",labelWidgetClass,overlapv_bb, + XtNlabel,"Allow Multiple Same Notes", + XtNforeground,textcolor, XtNbackground,bgcolor, + XtNborderWidth,0,NULL); + txtmeta_bb=XtVaCreateManagedWidget("txtmeta_box",boxWidgetClass,popup_optbox, + XtNorientation,XtorientHorizontal,XtNfromVert,overlapv_b, + XtNforeground,boxcolor, XtNbackground,bgcolor, + XtNborderWidth,0,NULL); + txtmeta_b=XtVaCreateManagedWidget("txtmeta_button",toggleWidgetClass,txtmeta_bb, + XtNbitmap,off_mark,XtNfromVert,overlapv_b, + XtNforeground,togglecolor, XtNbackground,buttonbgcolor, + NULL); + txtmeta_l=XtVaCreateManagedWidget("txtmeta_label",labelWidgetClass,txtmeta_bb, + XtNlabel,"Tracing All Text Meta Events", + XtNforeground,textcolor, XtNbackground,bgcolor, + XtNborderWidth,0,NULL); + popup_oclose= XtVaCreateManagedWidget("popup_oclose", + commandWidgetClass, popup_optbox, + XtNlabel,"Close", XtNfromVert,txtmeta_b, + XtNfont,volumefont, + XtNwidth,80,XtNresize,False,NULL); + XtAddCallback(popup_opt,XtNdestroyCallback,optionsdestroyCB,NULL); + XtAddCallback(popup_oclose,XtNcallback,optionscloseCB,NULL); + XtAddCallback(modul_b,XtNcallback,optionsCB,(XtPointer)&option_num[MODUL_N].id); + XtAddCallback(porta_b,XtNcallback,optionsCB,(XtPointer)&option_num[PORTA_N].id); + XtAddCallback(nrpnv_b,XtNcallback,optionsCB,(XtPointer)&option_num[NRPNV_N].id); + XtAddCallback(reverb_b,XtNcallback,optionsCB,(XtPointer)&option_num[REVERB_N].id); + XtAddCallback(chpressure_b,XtNcallback,optionsCB,(XtPointer)&option_num[CHPRESSURE_N].id); + XtAddCallback(overlapv_b,XtNcallback,optionsCB,(XtPointer)&option_num[OVERLAPV_N].id); + XtAddCallback(txtmeta_b,XtNcallback,optionsCB,(XtPointer)&option_num[TXTMETA_N].id); + XtAddCallback(chorus_b,XtNcallback,chorusCB,NULL); + option_num[MODUL_N].widget= modul_b; + option_num[PORTA_N].widget= porta_b; + option_num[NRPNV_N].widget= nrpnv_b; + option_num[REVERB_N].widget= reverb_b; + option_num[CHPRESSURE_N].widget= chpressure_b; + option_num[OVERLAPV_N].widget= overlapv_b; + option_num[TXTMETA_N].widget= txtmeta_b; + XtSetKeyboardFocus(popup_opt, popup_optbox); + if(init_options) { + int i; + for(i=0; ilist_index != XAW_LIST_NONE) { + onPlayOffPause(); + sprintf(local_buf,"L %d",atoi(lr->string)); + a_pipe_write(local_buf); + } +} + +static void fdeleteCB(Widget w,XtPointer data,XtPointer call_data) { + XawListReturnStruct *lr = XawListShowCurrent(file_list); + int i,n; + + if(lr != NULL && lr->list_index != XAW_LIST_NONE) { + char *p; + offPlayButton(); + offPauseButton(); + n = atoi(lr->string) -1; + sprintf(local_buf,"d %d",n); + a_pipe_write(local_buf); + --max_files; + free(flist[n]); + for(i= n; iFILEVPORT_HEIGHT)? h:FILEVPORT_HEIGHT),NULL); + if(n>=max_files) --n; + XawListHighlight(file_list,n); + } + if(psmenu != NULL) free(psmenu); + XtDestroyWidget(title_sm); psmenu = NULL; + maxentry_on_a_menu = 0,submenu_n = 0; + title_sm=XtVaCreatePopupShell("title_simplemenu",simpleMenuWidgetClass,title_mb, + XtNforeground,textcolor, XtNbackground,textbgcolor, + XtNbackingStore,NotUseful, XtNsaveUnder,False, NULL); + for(i= 0; i: highlight()\\n\ : reset()\\n\ @@ -2140,40 +2608,31 @@ #else "*lyric_text.international: False", #endif - "*volume_box.height: 36", - "*volume_box.background: gray76", - "*volume_label.background: gray76", "*volume_label.vertDistance: 0", "*volume_box.vertDistance: 2", "*volume_box.borderWidth: 0", "*volume_label.borderWidth: 0", - "*volume_label.label: 70", "*volume_bar.length: 330", - "*tune_box.height: 36", - "*tune_box.background: gray76", "*tune_box.borderWidth: 0", "*tune_label.label: ----", - "*tune_label.background: gray76", "*tune_label.vertDistance: 0", "*tune_label.horizDistance: 0", "*tune_label0.horizDistance: 0", "*tune_box.vertDistance: 2", "*tune_bar.length: 330", - "*popup_load.title: Timidity ", + "*popup_load.title: TiMidity ", "*popup_loadform.height: 400", + "*popup_option.title: TiMidity ", + "*popup_file.title: TiMidity ", "*load_dialog.label: File Name", - "*load_dialog.label.background: gray85", - "*load_dialog*background: gray76", "*load_dialog.borderWidth: 0", "*load_dialog.height: 132", "*trace.vertDistance: 2", "*trace.borderWidth: 1", "*trace_vport.borderWidth: 1", - "*trace_vport.background: gray76", "*load_dialog.label.font: -adobe-helvetica-bold-r-*-*-14-*-75-75-*-*-*-*", "*cwd_label.font: -adobe-helvetica-medium-r-*-*-12-*-75-75-*-*-*-*", "*cwd_info.font: -adobe-helvetica-medium-r-*-*-12-*-75-75-*-*-*-*", - "*cwd_info.background: gray76", "*BitmapDir: " DEFAULT_PATH "/bitmaps/", #ifdef XAW3D "*volume_bar.translations: #override\\n\ @@ -2213,8 +2672,8 @@ ~Ctrl Metas: do-menu(" IDS_SAVECONFIG ")\\n\ Ctrl r: do-menu(" IDS_REPEAT ")\\n\ Ctrl s: do-menu(" IDS_SHUFFLE ")\\n\ - Ctrlt: do-menu(" IDS_HIDETRACE ")\\n\ - Ctrlm: do-menu(" IDS_HIDETXT ")\\n\ + Ctrlt: do-menu(" IDS_HIDETRACE ")\\n\ + Ctrlm: do-menu(" IDS_HIDETXT ")\\n\ ~Ctrlq: do-quit()\\n\ ~Ctrlr: do-play()\\n\ Return: do-play()\\n\ @@ -2223,7 +2682,9 @@ ~Ctrlspace: do-pause()\\n\ ~Ctrls: do-stop()\\n\ p: do-prev()\\n\ + Left: do-prev()\\n\ ~Metan: do-next()\\n\ + Right: do-next()\\n\ f: do-forward()\\n\ b: do-back()\\n\ ~Ctrlplus: do-key()\\n\ @@ -2232,10 +2693,14 @@ KP_Subtract: do-key(1)\\n\ ~Ctrlgreater: do-speed()\\n\ ~Ctrlless: do-speed(1)\\n\ - ~Shifto: do-voice()\\n\ + ~Ctrl ~Shifto: do-voice()\\n\ ~Ctrl Shifto: do-voice(1)\\n\ + Ctrlo: do-options()\\n\ + Ctrll: do-filelist()\\n\ ~Ctrl ~Shiftv: do-volupdown(-10)\\n\ ~Ctrl Shiftv: do-volupdown(10)\\n\ + Down: do-volupdown(-10)\\n\ + Up: do-volupdown(10)\\n\ ~Ctrlx: do-exchange()\\n\ ~Ctrlt: do-toggletrace()\\n\ : do-resize()", @@ -2247,15 +2712,38 @@ Ctrl ~Shiftg: do-dialog-button(1)\\n\ Escape: do-dialog-button(1)", "*trace.translations: #override\\n\ - : do-toggletrace()\\n\ - : do-revcaption()\\n\ - : do-revcaption()\\n\ - : draw-trace()", - "*title_simplemenu.translations: #override\\n\ - : unset()", + : do-toggletrace()\\n\ + : do-revcaption()\\n\ + : do-revcaption()\\n\ + : draw-trace()", "*time_label.translations: #override\\n\ - : do-menu(" IDS_HIDETRACE ")\\n\ - : do-exchange()", + : do-menu(" IDS_HIDETRACE ")\\n\ + : do-exchange()", + "*popup_optbox.translations: #override\\n\ + ~Ctrlc: do-closeparent()\\n\ + ~Ctrlq: do-quit()", + "*popup_fbox.translations: #override\\n\ + ~Ctrlc: do-closeparent()\\n\ + Up: do-flistmove(-1)\\n\ + p: do-flistmove(-1)\\n\ + Prior: do-flistmove(-5)\\n\ + Right: do-flistmove(-5)\\n\ + ~Ctrlr: do-fselect()\\n\ + Return: do-fselect()\\n\ + KP_Enter: do-fselect()\\n\ + Ctrlm: do-fselect()\\n\ + space: do-pause()\\n\ + s: do-stop()\\n\ + Down: do-flistmove(1)\\n\ + n: do-flistmove(1)\\n\ + Next: do-flistmove(5)\\n\ + Left: do-flistmove(5)\\n\ + d: do-fdelete()\\n\ + ~Shiftv: do-volupdown(-10)\\n\ + Shiftv: do-volupdown(10)\\n\ + f: do-forward()\\n\ + b: do-back()\\n\ + ~Ctrlq: do-quit()", NULL, }; XtAppContext app_con; @@ -2266,7 +2754,6 @@ int argc=1; float thumb, l_thumb, l_thumbj; char *argv="timidity", *moretext, *filetext; - XFontStruct *labelfont,*volumefont,*tracefont; #ifdef I18N #define XtNfontDEF XtNfontSet XFontSet textfont; @@ -2299,10 +2786,13 @@ menu_width = (Dimension)app_resources.menu_width; labelfont = app_resources.label_font; volumefont = app_resources.volume_font; + listfont = app_resources.list_font; textfont = app_resources.text_font; tracefont = app_resources.trace_font; ttitlefont = app_resources.ttitle_font; a_readconfig(&Cfg); + amplitude= + (amplification == DEFAULT_AMPLIFICATION)? Cfg.amplitude:amplification; disp = XtDisplay(toplevel); screen = DefaultScreen(disp); root_height = DisplayHeight(disp, screen); @@ -2315,6 +2805,14 @@ RootWindowOfScreen(XtScreen(toplevel)), (char *)arrow_bits, (unsigned int)arrow_width,arrow_height); + on_mark = XCreateBitmapFromData(XtDisplay(toplevel), + RootWindowOfScreen(XtScreen(toplevel)), + (char *)on_bits, + (unsigned int)on_width,on_height); + off_mark = XCreateBitmapFromData(XtDisplay(toplevel), + RootWindowOfScreen(XtScreen(toplevel)), + (char *)off_bits, + (unsigned int)off_width,off_height); for(i= 0; i < MAXBITMAP; i++) { snprintf(cbuf,sizeof(cbuf),"%s/%s",bitmapdir,bmfname[i]); XReadBitmapFile(disp,RootWindow(disp,screen),cbuf,&bm_width[i],&bm_height[i], @@ -2391,11 +2889,11 @@ XtNbackground,bgcolor,XtNfromVert,m_box, NULL); v_box=XtVaCreateManagedWidget("volume_box",boxWidgetClass,base_f, XtNorientation,XtorientHorizontal, - XtNwidth, TRACE_WIDTH_SHORT, + XtNwidth,TRACE_WIDTH_SHORT, XtNheight,36, XtNfromVert,b_box,XtNbackground,bgcolor, NULL); t_box=XtVaCreateManagedWidget("tune_box",boxWidgetClass,base_f, XtNorientation,XtorientHorizontal, - XtNwidth, TRACE_WIDTH_SHORT, + XtNwidth,TRACE_WIDTH_SHORT, XtNheight,36, XtNfromVert,v_box,XtNbackground,bgcolor, NULL); i = XTextWidth(volumefont,"Volume ",7)+8; vol_l0=XtVaCreateManagedWidget("volume_label0",labelWidgetClass,v_box, @@ -2417,7 +2915,7 @@ i = XTextWidth(volumefont," 00:00",6); tune_l0=XtVaCreateManagedWidget("tune_label0",labelWidgetClass,t_box, XtNwidth,i, XtNresize,False, XtNlabel, " 0:00", - XtNfont,volumefont, XtNfromVert,vol_l,XtNborderWidth,0, + XtNfont,volumefont, XtNfromVert,vol_l0,XtNborderWidth,0, XtNforeground,textcolor, XtNbackground,bgcolor, NULL); j = XTextWidth(volumefont,"/ 00:00",7); tune_l=XtVaCreateManagedWidget("tune_label",labelWidgetClass,t_box, @@ -2481,20 +2979,22 @@ popup_load=XtVaCreatePopupShell("popup_load",transientShellWidgetClass,toplevel, NULL); popup_load_f= XtVaCreateManagedWidget("popup_loadform",formWidgetClass,popup_load, - XtNbackground,textbgcolor, NULL); + XtNbackground,bgcolor, NULL); load_d=XtVaCreateManagedWidget("load_dialog",dialogWidgetClass,popup_load_f, - XtNbackground,textbgcolor, XtNresizable,True, NULL); + XtNbackground,bgcolor, XtNresizable,True, NULL); cwd_l = XtVaCreateManagedWidget("cwd_label",labelWidgetClass,popup_load_f, XtNlabel,basepath, XtNborderWidth,0, XtNfromVert,load_d, + XtNwidth,250, XtNheight,20, XtNbackground,text2bgcolor, XtNresizable,True, NULL); load_vport = XtVaCreateManagedWidget("vport",viewportWidgetClass, popup_load_f, - XtNfromVert,cwd_l, XtNallowHoriz,True, XtNallowVert,True, - XtNuseBottom,True, XtNwidth,250, XtNheight,200, NULL); + XtNfromVert,cwd_l, XtNallowHoriz,True, XtNallowVert,True, + XtNbackground,textbgcolor, XtNuseBottom,True, + XtNwidth,250, XtNheight,200, NULL); load_flist = XtVaCreateManagedWidget("files",listWidgetClass,load_vport, XtNverticalList,True, XtNforceColumns,False, - XtNdefaultColumns, 3, NULL); + XtNbackground,tracecolor, XtNdefaultColumns,3, NULL); load_info = XtVaCreateManagedWidget("cwd_info",labelWidgetClass,popup_load_f, - XtNborderWidth,0, XtNwidth,250, XtNheight,32, + XtNborderWidth,0, XtNwidth,250, XtNheight,20, XtNresizable,True, XtNbackground,text2bgcolor, XtNfromVert,load_vport, NULL); XawDialogAddButton(load_d, "OK", popdownLoad,"Y"); XawDialogAddButton(load_d, "Cancel", popdownLoad,NULL); @@ -2513,7 +3013,7 @@ if(ctl->trace_playing) { trace_vport = XtVaCreateManagedWidget("trace_vport",viewportWidgetClass, base_f, XtNallowHoriz,True, XtNallowVert,True, - XtNuseBottom,True, XtNfromVert,lyric_t, + XtNuseBottom,True, XtNfromVert,lyric_t, XtNbackground,tracecolor, #ifdef WIDGET_IS_LABEL_WIDGET XtNuseRight,True, #endif @@ -2559,7 +3059,7 @@ w_title += sizeof(APP_CLASS)+ 2; XtVaGetValues(toplevel,XtNheight,&base_height,NULL); XtVaGetValues(lyric_t,XtNheight,&lyric_height,NULL); - a_print_text(lyric_t,strcpy(local_buf,"<< Timidity Messages >>")); + a_print_text(lyric_t,strcpy(local_buf,"<< TiMidity Messages >>")); a_pipe_write("READY"); if(ctl->trace_playing) { @@ -2652,10 +3152,16 @@ a_print_text(lyric_t,local_buf+2); } bsb=XtVaCreateManagedWidget("dummyfile",smeLineObjectClass,title_sm,NULL); + init_options=atoi(local_buf); + a_pipe_read(local_buf,sizeof(local_buf)); + init_chorus=atoi(local_buf); + + a_pipe_read(local_buf,sizeof(local_buf)); max_files=atoi(local_buf); + flist=(String *)safe_malloc((INIT_FLISTNUM+1)*sizeof(char *)); for (i=0;itrace_playing) { + if(!ctl->trace_playing || !Cfg.disptrace) { Dimension w2,h2,h; - XtVaSetValues(file_menu[ID_HIDETRACE-100].widget,XtNsensitive,False,NULL); - XtVaSetValues(lyric_t,XtNwidth,TRACE_WIDTH_SHORT -12,NULL); + XtVaSetValues(lyric_t,XtNwidth,rotatewidth[0] -12,NULL); XtVaGetValues(toplevel,XtNheight,&h,NULL); - XtMakeResizeRequest(toplevel,TRACE_WIDTH_SHORT,h,&w2,&h2); + XtMakeResizeRequest(toplevel,rotatewidth[0],h,&w2,&h2); } + if (!ctl->trace_playing) + XtVaSetValues(file_menu[ID_HIDETRACE-100].widget,XtNsensitive,False,NULL); /* Please sleep here to make widgets arrange by Form Widget, * otherwise the widget geometry is broken. * Strange!! @@ -2679,6 +3186,17 @@ XSync(disp, False); usleep(10000); } + sprintf(cbuf,"%d",amplitude); + XtVaSetValues(vol_l,XtNlabel,cbuf,NULL); + sprintf(local_buf,"V %d\n",amplitude); + a_pipe_write(local_buf); + if (init_options == DEFAULT_OPTIONS) init_options=Cfg.extendopt; + if (init_chorus == DEFAULT_CHORUS) init_chorus=Cfg.chorusopt; + sprintf(local_buf,"E %03d",init_options); + a_pipe_write(local_buf); + sprintf(local_buf,"C %03d",init_chorus); + a_pipe_write(local_buf); + if(Cfg.autostart) filemenuCB(file_menu[ID_AUTOSTART-100].widget, &file_menu[ID_AUTOSTART-100].id,NULL); diff -ruN TiMidity++-1.3.4/libarc/Makefile.in TiMidity++-1.3.5/libarc/Makefile.in --- TiMidity++-1.3.4/libarc/Makefile.in Mon Mar 1 19:57:21 1999 +++ TiMidity++-1.3.5/libarc/Makefile.in Mon Mar 8 11:40:51 1999 @@ -86,6 +86,7 @@ CC = @CC@ ELFILES = @ELFILES@ EMACS = @EMACS@ +EXEEXT = @EXEEXT@ EXTRADEFS = @EXTRADEFS@ EXTRALIBS = @EXTRALIBS@ GTK_CFLAGS = @GTK_CFLAGS@ diff -ruN TiMidity++-1.3.4/stamp-h1.in TiMidity++-1.3.5/stamp-h1.in --- TiMidity++-1.3.4/stamp-h1.in Mon Mar 1 19:51:56 1999 +++ TiMidity++-1.3.5/stamp-h1.in Mon Mar 8 11:31:02 1999 @@ -0,0 +1 @@ +timestamp diff -ruN TiMidity++-1.3.4/stamp-h2.in TiMidity++-1.3.5/stamp-h2.in --- TiMidity++-1.3.4/stamp-h2.in Mon Mar 1 19:51:56 1999 +++ TiMidity++-1.3.5/stamp-h2.in Mon Mar 8 11:31:05 1999 @@ -0,0 +1 @@ +timestamp diff -ruN TiMidity++-1.3.4/timidity/Makefile.in TiMidity++-1.3.5/timidity/Makefile.in --- TiMidity++-1.3.4/timidity/Makefile.in Mon Mar 1 19:57:33 1999 +++ TiMidity++-1.3.5/timidity/Makefile.in Mon Mar 8 11:41:04 1999 @@ -86,6 +86,7 @@ CC = @CC@ ELFILES = @ELFILES@ EMACS = @EMACS@ +EXEEXT = @EXEEXT@ EXTRADEFS = @EXTRADEFS@ EXTRALIBS = @EXTRALIBS@ GTK_CFLAGS = @GTK_CFLAGS@ @@ -213,6 +214,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h ../interface.h CONFIG_CLEAN_FILES = +bin_PROGRAMS = timidity$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) @@ -299,8 +301,8 @@ maintainer-clean-compile: -timidity: $(timidity_OBJECTS) $(timidity_DEPENDENCIES) - @rm -f timidity +timidity$(EXEEXT): $(timidity_OBJECTS) $(timidity_DEPENDENCIES) + @rm -f timidity$(EXEEXT) $(LINK) $(timidity_LDFLAGS) $(timidity_OBJECTS) $(timidity_LDADD) $(LIBS) tags: TAGS diff -ruN TiMidity++-1.3.4/utils/Makefile.in TiMidity++-1.3.5/utils/Makefile.in --- TiMidity++-1.3.4/utils/Makefile.in Mon Mar 1 19:57:19 1999 +++ TiMidity++-1.3.5/utils/Makefile.in Mon Mar 8 11:40:49 1999 @@ -86,6 +86,7 @@ CC = @CC@ ELFILES = @ELFILES@ EMACS = @EMACS@ +EXEEXT = @EXEEXT@ EXTRADEFS = @EXTRADEFS@ EXTRALIBS = @EXTRALIBS@ GTK_CFLAGS = @GTK_CFLAGS@