diff -ruN TiMidity++-2.6.0-beta3/ChangeLog TiMidity++-2.6.0-beta4/ChangeLog --- TiMidity++-2.6.0-beta3/ChangeLog Sun Sep 5 21:29:22 1999 +++ TiMidity++-2.6.0-beta4/ChangeLog Thu Sep 9 12:22:50 1999 @@ -1,3 +1,29 @@ +1999-09-09 Masanao Izumo + + * Version 2.6.0-beta4 released for test version. + +1999-09-08 Masanao Izumo + * interface/x_sherry.c: Bug fix. + * interface/{wrd_read.c,x_sherry.c}: Support part of the sherry ver.2. + +1999-09-07 Masanao Izumo + + * configure.in,common.makefile.in: Fix missing of DEFAULT_PATH. + * acinclude.m4: Add gtk.m4 + +1999-09-06 Katsuhiro Ueno + + * timidity/common.c (pathcmp): Bug fixed. + * timidity/{acinclude.m4,configure.in}: Fix misspelled comment and + remove garbage of output. + +1999-09-06 Masanao Izumo + + * timidity/alsa_c.c: + Check output rate with snd_pcm_playback_status. + acntl: PM_REQ_GETQSIZ, PM_REQ_GETFILLABLE, PM_REQ_GETFILLED, + PM_REQ_GETSAMPLES, and PM_REQ_FLUSH are supported. + 1999-09-05 Masanao Izumo * Version 2.6.0-beta3 released for test version. @@ -42,7 +68,7 @@ because it is possible -laudio is not NAS library. * configure.in: Add --with-nas-includes=dir to specify the NAS include directory. - * libarc/url_file.c: Use mapped-file to read the file. + * libarc/url_file.c: On Windows, use mapped-file to read the file. * timidity/timidity.c (handler): Only mark `intr'. * interface/w32g_i.c: Use WaitSingleObject() to wait to terminate the thread. diff -ruN TiMidity++-2.6.0-beta3/acinclude.m4 TiMidity++-2.6.0-beta4/acinclude.m4 --- TiMidity++-2.6.0-beta3/acinclude.m4 Wed Sep 1 14:25:53 1999 +++ TiMidity++-2.6.0-beta4/acinclude.m4 Tue Sep 7 00:53:00 1999 @@ -525,7 +525,7 @@ ]) -dnl CHECK_COMPILER_OPTION(OPTIONS [, ACTION-IF-SUCCESS [, ACTION-IF-FAILED]]) +dnl CHECK_COMPILER_OPTION(OPTIONS [, ACTION-IF-SUCCEED [, ACTION-IF-FAILED]]) AC_DEFUN(CHECK_COMPILER_OPTION, [AC_MSG_CHECKING([whether -$1 option is recognized]) ac_ccoption=`echo $1 | sed 'y%./+-%__p_%'` @@ -573,3 +573,181 @@ else : $4 fi]) + + +# beginning of gtk.m4 +# Configure paths for GTK+ +# Owen Taylor 97-11-3 + +dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) +dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS +dnl +AC_DEFUN(AM_PATH_GTK, +[dnl +dnl Get the cflags and libraries from the gtk-config script +dnl +AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)], + gtk_config_prefix="$withval", gtk_config_prefix="") +AC_ARG_WITH(gtk-exec-prefix,[ --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)], + gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="") +AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run a test GTK program], + , enable_gtktest=yes) + + if test x$gtk_config_exec_prefix != x ; then + gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" + if test x${GTK_CONFIG+set} != xset ; then + GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config + fi + fi + if test x$gtk_config_prefix != x ; then + gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" + if test x${GTK_CONFIG+set} != xset ; then + GTK_CONFIG=$gtk_config_prefix/bin/gtk-config + fi + fi + + AC_PATH_PROG(GTK_CONFIG, gtk-config, no) + min_gtk_version=ifelse([$1], ,0.99.7,$1) + AC_MSG_CHECKING(for GTK - version >= $min_gtk_version) + no_gtk="" + if test "$GTK_CONFIG" = "no" ; then + no_gtk=yes + else + GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags` + GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs` + gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + if test "x$enable_gtktest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GTK_CFLAGS" + LIBS="$LIBS $GTK_LIBS" +dnl +dnl Now check if the installed GTK is sufficiently new. (Also sanity +dnl checks the results of gtk-config to some extent +dnl + rm -f conf.gtktest + AC_TRY_RUN([ +#include +#include + +int +main () +{ + int major, minor, micro; + char *tmp_version; + + system ("touch conf.gtktest"); + + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version = g_strdup("$min_gtk_version"); + if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_gtk_version"); + exit(1); + } + + if ((gtk_major_version != $gtk_config_major_version) || + (gtk_minor_version != $gtk_config_minor_version) || + (gtk_micro_version != $gtk_config_micro_version)) + { + printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", + $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, + gtk_major_version, gtk_minor_version, gtk_micro_version); + printf ("*** was found! If gtk-config was correct, then it is best\n"); + printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); + printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); + printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); + printf("*** required on your system.\n"); + printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n"); + printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n"); + printf("*** before re-running configure\n"); + } + else + { + if ((gtk_major_version > major) || + ((gtk_major_version == major) && (gtk_minor_version > minor)) || + ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) + { + return 0; + } + else + { + printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", + gtk_major_version, gtk_minor_version, gtk_micro_version); + printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n", + major, minor, micro); + printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); + printf("***\n"); + printf("*** If you have already installed a sufficiently new version, this error\n"); + printf("*** probably means that the wrong copy of the gtk-config shell script is\n"); + printf("*** being found. The easiest way to fix this is to remove the old version\n"); + printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n"); + printf("*** correct copy of gtk-config. (In this case, you will have to\n"); + printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); + printf("*** so that the correct libraries are found at run-time))\n"); + } + } + return 1; +} +],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + if test "x$no_gtk" = x ; then + AC_MSG_RESULT(yes) + ifelse([$2], , :, [$2]) + else + AC_MSG_RESULT(no) + if test "$GTK_CONFIG" = "no" ; then + echo "*** The gtk-config script installed by GTK could not be found" + echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in" + echo "*** your path, or set the GTK_CONFIG environment variable to the" + echo "*** full path to gtk-config." + else + if test -f conf.gtktest ; then + : + else + echo "*** Could not run GTK test program, checking why..." + CFLAGS="$CFLAGS $GTK_CFLAGS" + LIBS="$LIBS $GTK_LIBS" + AC_TRY_LINK([ +#include +#include +], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ], + [ 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" + echo "*** version of GTK. If it is not finding GTK, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" + echo "***" + echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" + echo "*** came with the system with the command" + echo "***" + echo "*** rpm --erase --nodeps gtk gtk-devel" ], + [ echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means GTK was incorrectly installed" + echo "*** or that you have moved GTK since it was installed. In the latter case, you" + echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + GTK_CFLAGS="" + GTK_LIBS="" + ifelse([$3], , :, [$3]) + fi + AC_SUBST(GTK_CFLAGS) + AC_SUBST(GTK_LIBS) + rm -f conf.gtktest +]) + +# end of gtk.m4 diff -ruN TiMidity++-2.6.0-beta3/aclocal.m4 TiMidity++-2.6.0-beta4/aclocal.m4 --- TiMidity++-2.6.0-beta3/aclocal.m4 Sat Sep 4 07:16:38 1999 +++ TiMidity++-2.6.0-beta4/aclocal.m4 Wed Sep 8 14:38:32 1999 @@ -537,7 +537,7 @@ ]) -dnl CHECK_COMPILER_OPTION(OPTIONS [, ACTION-IF-SUCCESS [, ACTION-IF-FAILED]]) +dnl CHECK_COMPILER_OPTION(OPTIONS [, ACTION-IF-SUCCEED [, ACTION-IF-FAILED]]) AC_DEFUN(CHECK_COMPILER_OPTION, [AC_MSG_CHECKING([whether -$1 option is recognized]) ac_ccoption=`echo $1 | sed 'y%./+-%__p_%'` @@ -586,168 +586,8 @@ $4 fi]) -# Define a conditional. - -AC_DEFUN(AM_CONDITIONAL, -[AC_SUBST($1_TRUE) -AC_SUBST($1_FALSE) -if $2; then - $1_TRUE= - $1_FALSE='#' -else - $1_TRUE='#' - $1_FALSE= -fi]) - -# Do all the work for Automake. This macro actually does too much -- -# some checks are only needed if your package does certain things. -# But this isn't really a big deal. - -# serial 1 - -dnl Usage: -dnl AM_INIT_AUTOMAKE(package,version, [no-define]) - -AC_DEFUN(AM_INIT_AUTOMAKE, -[AC_REQUIRE([AC_PROG_INSTALL]) -PACKAGE=[$1] -AC_SUBST(PACKAGE) -VERSION=[$2] -AC_SUBST(VERSION) -dnl test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) -fi -ifelse([$3],, -AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) -AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])) -AC_REQUIRE([AM_SANITY_CHECK]) -AC_REQUIRE([AC_ARG_PROGRAM]) -dnl FIXME This is truly gross. -missing_dir=`cd $ac_aux_dir && pwd` -AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir) -AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir) -AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir) -AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) -AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) -AC_REQUIRE([AC_PROG_MAKE_SET])]) - -# -# Check to make sure that the build environment is sane. -# - -AC_DEFUN(AM_SANITY_CHECK, -[AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftestfile -# Do `set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null` - if test "[$]*" = "X"; then - # -L didn't work. - set X `ls -t $srcdir/configure conftestfile` - fi - if test "[$]*" != "X $srcdir/configure conftestfile" \ - && test "[$]*" != "X conftestfile $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi - - test "[$]2" = conftestfile - ) -then - # Ok. - : -else - AC_MSG_ERROR([newly created file is older than distributed files! -Check your system clock]) -fi -rm -f conftest* -AC_MSG_RESULT(yes)]) - -dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY) -dnl The program must properly implement --version. -AC_DEFUN(AM_MISSING_PROG, -[AC_MSG_CHECKING(for working $2) -# Run test in a subshell; some versions of sh will print an error if -# an executable is not found, even if stderr is redirected. -# Redirect stdin to placate older versions of autoconf. Sigh. -if ($2 --version) < /dev/null > /dev/null 2>&1; then - $1=$2 - AC_MSG_RESULT(found) -else - $1="$3/missing $2" - AC_MSG_RESULT(missing) -fi -AC_SUBST($1)]) - -# Like AC_CONFIG_HEADER, but automatically create stamp file. - -AC_DEFUN(AM_CONFIG_HEADER, -[AC_PREREQ([2.12]) -AC_CONFIG_HEADER([$1]) -dnl When config.status generates a header, we must update the stamp-h file. -dnl This file resides in the same directory as the config header -dnl that is generated. We must strip everything past the first ":", -dnl and everything past the last "/". -AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl -ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>, -<>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>, -<>; do - case " <<$>>CONFIG_HEADERS " in - *" <<$>>am_file "*<<)>> - echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx - ;; - esac - am_indx=`expr "<<$>>am_indx" + 1` -done<<>>dnl>>) -changequote([,]))]) - - -# serial 1 - -AC_DEFUN(AM_PATH_LISPDIR, - [# If set to t, that means we are running in a shell under Emacs. - # If you have an Emacs named "t", then use the full path. - test "$EMACS" = t && EMACS= - AC_PATH_PROGS(EMACS, emacs xemacs, no) - if test $EMACS != "no"; then - AC_MSG_CHECKING([where .elc files should go]) - dnl Set default value - lispdir="\$(datadir)/emacs/site-lisp" - emacs_flavor=`echo "$EMACS" | sed -e 's,^.*/,,'` - if test "x$prefix" = "xNONE"; then - if test -d $ac_default_prefix/share/$emacs_flavor/site-lisp; then - lispdir="\$(prefix)/share/$emacs_flavor/site-lisp" - else - if test -d $ac_default_prefix/lib/$emacs_flavor/site-lisp; then - lispdir="\$(prefix)/lib/$emacs_flavor/site-lisp" - fi - fi - else - if test -d $prefix/share/$emacs_flavor/site-lisp; then - lispdir="\$(prefix)/share/$emacs_flavor/site-lisp" - else - if test -d $prefix/lib/$emacs_flavor/site-lisp; then - lispdir="\$(prefix)/lib/$emacs_flavor/site-lisp" - fi - fi - fi - AC_MSG_RESULT($lispdir) - fi - AC_SUBST(lispdir)]) +# beginning of gtk.m4 # Configure paths for GTK+ # Owen Taylor 97-11-3 @@ -921,4 +761,168 @@ AC_SUBST(GTK_LIBS) rm -f conf.gtktest ]) + +# end of gtk.m4 + +# Define a conditional. + +AC_DEFUN(AM_CONDITIONAL, +[AC_SUBST($1_TRUE) +AC_SUBST($1_FALSE) +if $2; then + $1_TRUE= + $1_FALSE='#' +else + $1_TRUE='#' + $1_FALSE= +fi]) + +# Do all the work for Automake. This macro actually does too much -- +# some checks are only needed if your package does certain things. +# But this isn't really a big deal. + +# serial 1 + +dnl Usage: +dnl AM_INIT_AUTOMAKE(package,version, [no-define]) + +AC_DEFUN(AM_INIT_AUTOMAKE, +[AC_REQUIRE([AC_PROG_INSTALL]) +PACKAGE=[$1] +AC_SUBST(PACKAGE) +VERSION=[$2] +AC_SUBST(VERSION) +dnl test to see if srcdir already configured +if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) +fi +ifelse([$3],, +AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) +AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])) +AC_REQUIRE([AM_SANITY_CHECK]) +AC_REQUIRE([AC_ARG_PROGRAM]) +dnl FIXME This is truly gross. +missing_dir=`cd $ac_aux_dir && pwd` +AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir) +AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir) +AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir) +AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) +AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) +AC_REQUIRE([AC_PROG_MAKE_SET])]) + +# +# Check to make sure that the build environment is sane. +# + +AC_DEFUN(AM_SANITY_CHECK, +[AC_MSG_CHECKING([whether build environment is sane]) +# Just in case +sleep 1 +echo timestamp > conftestfile +# Do `set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null` + if test "[$]*" = "X"; then + # -L didn't work. + set X `ls -t $srcdir/configure conftestfile` + fi + if test "[$]*" != "X $srcdir/configure conftestfile" \ + && test "[$]*" != "X conftestfile $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken +alias in your environment]) + fi + + test "[$]2" = conftestfile + ) +then + # Ok. + : +else + AC_MSG_ERROR([newly created file is older than distributed files! +Check your system clock]) +fi +rm -f conftest* +AC_MSG_RESULT(yes)]) + +dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY) +dnl The program must properly implement --version. +AC_DEFUN(AM_MISSING_PROG, +[AC_MSG_CHECKING(for working $2) +# Run test in a subshell; some versions of sh will print an error if +# an executable is not found, even if stderr is redirected. +# Redirect stdin to placate older versions of autoconf. Sigh. +if ($2 --version) < /dev/null > /dev/null 2>&1; then + $1=$2 + AC_MSG_RESULT(found) +else + $1="$3/missing $2" + AC_MSG_RESULT(missing) +fi +AC_SUBST($1)]) + +# Like AC_CONFIG_HEADER, but automatically create stamp file. + +AC_DEFUN(AM_CONFIG_HEADER, +[AC_PREREQ([2.12]) +AC_CONFIG_HEADER([$1]) +dnl When config.status generates a header, we must update the stamp-h file. +dnl This file resides in the same directory as the config header +dnl that is generated. We must strip everything past the first ":", +dnl and everything past the last "/". +AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl +ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>, +<>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>, +<>; do + case " <<$>>CONFIG_HEADERS " in + *" <<$>>am_file "*<<)>> + echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx + ;; + esac + am_indx=`expr "<<$>>am_indx" + 1` +done<<>>dnl>>) +changequote([,]))]) + + +# serial 1 + +AC_DEFUN(AM_PATH_LISPDIR, + [# If set to t, that means we are running in a shell under Emacs. + # If you have an Emacs named "t", then use the full path. + test "$EMACS" = t && EMACS= + AC_PATH_PROGS(EMACS, emacs xemacs, no) + if test $EMACS != "no"; then + AC_MSG_CHECKING([where .elc files should go]) + dnl Set default value + lispdir="\$(datadir)/emacs/site-lisp" + emacs_flavor=`echo "$EMACS" | sed -e 's,^.*/,,'` + if test "x$prefix" = "xNONE"; then + if test -d $ac_default_prefix/share/$emacs_flavor/site-lisp; then + lispdir="\$(prefix)/share/$emacs_flavor/site-lisp" + else + if test -d $ac_default_prefix/lib/$emacs_flavor/site-lisp; then + lispdir="\$(prefix)/lib/$emacs_flavor/site-lisp" + fi + fi + else + if test -d $prefix/share/$emacs_flavor/site-lisp; then + lispdir="\$(prefix)/share/$emacs_flavor/site-lisp" + else + if test -d $prefix/lib/$emacs_flavor/site-lisp; then + lispdir="\$(prefix)/lib/$emacs_flavor/site-lisp" + fi + fi + fi + AC_MSG_RESULT($lispdir) + fi + AC_SUBST(lispdir)]) diff -ruN TiMidity++-2.6.0-beta3/common.makefile.in TiMidity++-2.6.0-beta4/common.makefile.in --- TiMidity++-2.6.0-beta3/common.makefile.in Sun Sep 5 14:23:15 1999 +++ TiMidity++-2.6.0-beta4/common.makefile.in Tue Sep 7 00:44:11 1999 @@ -73,6 +73,9 @@ TCL_DIR = $(PKGLIBDIR) ##CPPFLAGS += -DTKPROGPATH=\"$(TCL_DIR)/tkmidity.tcl\" +# Comment out if you don't want default path. +DEF_DEFAULT_PATH = -DDEFAULT_PATH=\"$(PKGDATADIR)\" + # You sould not change follows definitions. DEF_PKGDATADIR = -DPKGDATADIR=\"$(PKGDATADIR)\" DEF_PKGLIBDIR = -DPKGLIBDIR=\"$(PKGLIBDIR)\" diff -ruN TiMidity++-2.6.0-beta3/configs/msc-config.h TiMidity++-2.6.0-beta4/configs/msc-config.h --- TiMidity++-2.6.0-beta3/configs/msc-config.h Sun Sep 5 21:30:27 1999 +++ TiMidity++-2.6.0-beta4/configs/msc-config.h Thu Sep 9 12:23:34 1999 @@ -217,7 +217,7 @@ #define HAVE_MMSYSTEM_H /* In VDS Macro AAA=BBB is not available. */ -#define TIMID_VERSION "2.6.0-beta3" +#define TIMID_VERSION "2.6.0-beta4" #define DEFAULT_PATH ".\\" #define AU_W32 #define WINSOCK diff -ruN TiMidity++-2.6.0-beta3/configure TiMidity++-2.6.0-beta4/configure --- TiMidity++-2.6.0-beta3/configure Sat Sep 4 07:16:41 1999 +++ TiMidity++-2.6.0-beta4/configure Wed Sep 8 14:38:35 1999 @@ -881,7 +881,7 @@ PACKAGE=TiMidity++ -VERSION=2.6.0-beta3 +VERSION=2.6.0-beta4 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; } @@ -4994,12 +4994,10 @@ echo "configure: warning: No --enable-audio=default audio for $target" 1>&2 ;; esac -else - echo "$ac_t""no" 1>&6 fi echo $ac_n "checking enable_audio=oss""... $ac_c" 1>&6 -echo "configure:5003: checking enable_audio=oss" >&5 +echo "configure:5001: checking enable_audio=oss" >&5 if test "x$au_enable_oss" = xyes; then EXTRADEFS="$EXTRADEFS -DAU_OSS" SYSEXTRAS="$SYSEXTRAS oss_a.c" @@ -5020,7 +5018,7 @@ fi echo $ac_n "checking enable_audio=sun""... $ac_c" 1>&6 -echo "configure:5024: checking enable_audio=sun" >&5 +echo "configure:5022: checking enable_audio=sun" >&5 if test "x$au_enable_sun" = xyes; then case "$target" in *-*-sunos4*) @@ -5049,7 +5047,7 @@ fi echo $ac_n "checking enable_audio=hpux""... $ac_c" 1>&6 -echo "configure:5053: checking enable_audio=hpux" >&5 +echo "configure:5051: checking enable_audio=hpux" >&5 if test "x$au_enable_hpux" = xyes; then case "$target" in *-*-hpux*) echo "$ac_t""yes" 1>&6 ;; @@ -5062,7 +5060,7 @@ fi echo $ac_n "checking enable_audio=irix""... $ac_c" 1>&6 -echo "configure:5066: checking enable_audio=irix" >&5 +echo "configure:5064: checking enable_audio=irix" >&5 if test "x$au_enable_irix" = xyes; then case "$target" in *-sgi-irix5*|*-sgi-irix6.2) @@ -5082,7 +5080,7 @@ fi echo $ac_n "checking enable_audio=mme""... $ac_c" 1>&6 -echo "configure:5086: checking enable_audio=mme" >&5 +echo "configure:5084: checking enable_audio=mme" >&5 if test "x$au_enable_mme" = xyes; then case "$target" in *-dec-*) echo "$ac_t""yes" 1>&6 ;; @@ -5097,7 +5095,7 @@ fi echo $ac_n "checking enable_audio=sb_dsp""... $ac_c" 1>&6 -echo "configure:5101: checking enable_audio=sb_dsp" >&5 +echo "configure:5099: checking enable_audio=sb_dsp" >&5 if test "x$au_enable_sb_dsp" = xyes; then case "$target" in *-*-bsdi2.0) echo "$ac_t""yes" 1>&6 ;; @@ -5110,7 +5108,7 @@ fi echo $ac_n "checking enable_audio=w32""... $ac_c" 1>&6 -echo "configure:5114: checking enable_audio=w32" >&5 +echo "configure:5112: checking enable_audio=w32" >&5 if test "x$au_enable_w32" = xyes; then case "$target" in *-*-cygwin32*) @@ -5133,7 +5131,7 @@ fi echo $ac_n "checking enable_audio=alsa""... $ac_c" 1>&6 -echo "configure:5137: checking enable_audio=alsa" >&5 +echo "configure:5135: checking enable_audio=alsa" >&5 if test "x$au_enable_alsa" = xyes; then echo "$ac_t""" 1>&6 KEEPCFLAGS=$CFLAGS @@ -5166,7 +5164,7 @@ echo $ac_n "checking for ALSA CFLAGS""... $ac_c" 1>&6 -echo "configure:5170: checking for ALSA CFLAGS" >&5 +echo "configure:5168: 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" @@ -5174,7 +5172,7 @@ echo "$ac_t""$ALSA_CFLAGS" 1>&6 echo $ac_n "checking for ALSA LDFLAGS""... $ac_c" 1>&6 -echo "configure:5178: checking for ALSA LDFLAGS" >&5 +echo "configure:5176: checking for ALSA LDFLAGS" >&5 if test "$alsa_prefix" != "" ; then ALSA_LIBS="$ALSA_LIBS -L$alsa_prefix" LIBS="-L$alsa_prefix" @@ -5186,7 +5184,7 @@ min_alsa_version=0.1.1 echo $ac_n "checking for libasound headers version >= $min_alsa_version""... $ac_c" 1>&6 -echo "configure:5190: checking for libasound headers version >= $min_alsa_version" >&5 +echo "configure:5188: 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/'` @@ -5196,7 +5194,7 @@ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` cat > conftest.$ac_ext < @@ -5237,7 +5235,7 @@ ; return 0; } EOF -if { (eval echo configure:5241: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5239: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""found." 1>&6 have_alsa=yes @@ -5251,7 +5249,7 @@ rm -f conftest* echo $ac_n "checking for snd_cards in -lasound""... $ac_c" 1>&6 -echo "configure:5255: checking for snd_cards in -lasound" >&5 +echo "configure:5253: 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 @@ -5259,7 +5257,7 @@ ac_save_LIBS="$LIBS" LIBS="-lasound $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5326,7 +5324,7 @@ fi echo $ac_n "checking enable_audio=alib""... $ac_c" 1>&6 -echo "configure:5330: checking enable_audio=alib" >&5 +echo "configure:5328: checking enable_audio=alib" >&5 if test "x$au_enable_alib" = xyes; then case "$target" in *-*-hpux*) echo "$ac_t""yes" 1>&6 ;; @@ -5346,7 +5344,7 @@ fi echo $ac_n "checking enable_audio=nas""... $ac_c" 1>&6 -echo "configure:5350: checking enable_audio=nas" >&5 +echo "configure:5348: checking enable_audio=nas" >&5 if test "x$au_enable_nas" = xyes; then if test "x$with_x" != xyes; then { echo "configure: error: nas: --with-x option must be specified" 1>&2; exit 1; } @@ -5361,7 +5359,7 @@ else echo "$ac_t""" 1>&6 echo $ac_n "checking for library containing AuOpenServer""... $ac_c" 1>&6 -echo "configure:5365: checking for library containing AuOpenServer" >&5 +echo "configure:5363: checking for library containing AuOpenServer" >&5 if eval "test \"`echo '$''{'timidity_cv_search_AuOpenServer'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5372,7 +5370,7 @@ /usr/lib/libaudio.a ; do LIBS="$i $ac_func_search_save_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* timidity_cv_search_AuOpenServer="$i"; break else @@ -5416,7 +5414,7 @@ fi echo $ac_n "checking enable_audio=esd""... $ac_c" 1>&6 -echo "configure:5420: checking enable_audio=esd" >&5 +echo "configure:5418: checking enable_audio=esd" >&5 if test "x$au_enable_esd" = xyes; then echo "$ac_t""" 1>&6 KEEPCFLAGS=$CFLAGS @@ -5463,7 +5461,7 @@ # Extract the first word of "esd-config", so it can be a program name with args. set dummy esd-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5467: checking for $ac_word" >&5 +echo "configure:5465: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_ESD_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5498,7 +5496,7 @@ min_esd_version=0.2.7 echo $ac_n "checking for ESD - version >= $min_esd_version""... $ac_c" 1>&6 -echo "configure:5502: checking for ESD - version >= $min_esd_version" >&5 +echo "configure:5500: checking for ESD - version >= $min_esd_version" >&5 no_esd="" if test "$ESD_CONFIG" = "no" ; then no_esd=yes @@ -5522,7 +5520,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -5580,7 +5578,7 @@ EOF -if { (eval echo configure:5584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -5614,7 +5612,7 @@ CFLAGS="$CFLAGS $ESD_CFLAGS" LIBS="$LIBS $ESD_LIBS" cat > conftest.$ac_ext < @@ -5624,7 +5622,7 @@ return 0; ; return 0; } EOF -if { (eval echo configure:5628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding ESD or finding the wrong" @@ -5686,7 +5684,7 @@ echo $ac_n "checking default output mode""... $ac_c" 1>&6 -echo "configure:5690: checking default output mode" >&5 +echo "configure:5688: checking default output mode" >&5 if test "x$DEFAULT_PLAYMODE" = x; then DEFAULT_PLAYMODE=`echo $enable_audio | sed 's/,.*//'` fi @@ -5755,12 +5753,12 @@ have_dl=no echo $ac_n "checking for LoadLibrary""... $ac_c" 1>&6 -echo "configure:5759: checking for LoadLibrary" >&5 +echo "configure:5757: checking for LoadLibrary" >&5 if eval "test \"`echo '$''{'wapi_cv_func_LoadLibrary'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -5769,7 +5767,7 @@ LoadLibrary(0); ; return 0; } EOF -if { (eval echo configure:5773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* wapi_cv_func_LoadLibrary=yes else @@ -5792,12 +5790,12 @@ if test "$have_dl" = "no"; then echo $ac_n "checking for shl_load""... $ac_c" 1>&6 -echo "configure:5796: checking for shl_load" >&5 +echo "configure:5794: checking for shl_load" >&5 if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shl_load=yes" else @@ -5845,12 +5843,12 @@ fi if test "$have_dl" = "no"; then echo $ac_n "checking for dlopen""... $ac_c" 1>&6 -echo "configure:5849: checking for dlopen" >&5 +echo "configure:5847: checking for dlopen" >&5 if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dlopen=yes" else @@ -5895,12 +5893,12 @@ fi if test "$have_dl" = "no"; then echo $ac_n "checking for dld_init""... $ac_c" 1>&6 -echo "configure:5899: checking for dld_init" >&5 +echo "configure:5897: checking for dld_init" >&5 if eval "test \"`echo '$''{'ac_cv_func_dld_init'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dld_init=yes" else @@ -5945,7 +5943,7 @@ fi if test "$have_dl" = "no"; then echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6 -echo "configure:5949: checking for dld_init in -ldld" >&5 +echo "configure:5947: 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 @@ -5953,7 +5951,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5987,13 +5985,13 @@ fi echo $ac_n "checking dynamic link method""... $ac_c" 1>&6 -echo "configure:5991: checking dynamic link method" >&5 +echo "configure:5989: 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:5997: checking whether your dlsym() needs a leading underscore" >&5 +echo "configure:5995: 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 @@ -6141,17 +6139,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6145: checking for $ac_hdr" >&5 +echo "configure:6143: 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:6155: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6153: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6192,7 +6190,7 @@ esac echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6 -echo "configure:6196: checking for initscr in -lncurses" >&5 +echo "configure:6194: 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 @@ -6200,7 +6198,7 @@ ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6230,7 +6228,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for PDC_set_ctrl_break in -lcurses""... $ac_c" 1>&6 -echo "configure:6234: checking for PDC_set_ctrl_break in -lcurses" >&5 +echo "configure:6232: checking for PDC_set_ctrl_break in -lcurses" >&5 ac_lib_var=`echo curses'_'PDC_set_ctrl_break | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6238,7 +6236,7 @@ ac_save_LIBS="$LIBS" LIBS="-lcurses $lib_user32_test $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6336,7 +6334,7 @@ if test "${enable_slang+set}" = set; then enableval="$enable_slang" case "x$enable_slang" in xyes|xdynamic) echo $ac_n "checking for SLang_init_tty in -lslang""... $ac_c" 1>&6 -echo "configure:6340: checking for SLang_init_tty in -lslang" >&5 +echo "configure:6338: 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 @@ -6344,7 +6342,7 @@ ac_save_LIBS="$LIBS" LIBS="-lslang $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6381,17 +6379,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6385: checking for $ac_hdr" >&5 +echo "configure:6383: 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:6395: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6393: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6443,7 +6441,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:6447: checking for initscr in -ltermcap" >&5 +echo "configure:6445: 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 @@ -6451,7 +6449,7 @@ ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6582,7 +6580,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:6586: checking for Tcl_Init in -l$l" >&5 +echo "configure:6584: 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 @@ -6590,7 +6588,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$l $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6625,7 +6623,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:6629: checking for Tk_Init in -l$l" >&5 +echo "configure:6627: 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 @@ -6633,7 +6631,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$l $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7008,7 +7006,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:7012: checking for $ac_word" >&5 +echo "configure:7010: 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 @@ -7043,7 +7041,7 @@ min_gtk_version=1.1.3 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:7047: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:7045: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" = "no" ; then no_gtk=yes @@ -7066,7 +7064,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -7132,7 +7130,7 @@ } EOF -if { (eval echo configure:7136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -7166,7 +7164,7 @@ CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat > conftest.$ac_ext < @@ -7176,7 +7174,7 @@ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ; return 0; } EOF -if { (eval echo configure:7180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7178: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GTK or finding the wrong" @@ -7326,17 +7324,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:7330: checking for X11/xpm.h" >&5 +echo "configure:7328: 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:7340: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7338: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7359,7 +7357,7 @@ fi echo $ac_n "checking for XpmCreatePixmapFromData in -lXpm""... $ac_c" 1>&6 -echo "configure:7363: checking for XpmCreatePixmapFromData in -lXpm" >&5 +echo "configure:7361: 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 @@ -7367,7 +7365,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXpm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7474,17 +7472,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7478: checking for $ac_hdr" >&5 +echo "configure:7476: 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:7488: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7486: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7535,7 +7533,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:7539: checking for DndInitialize in -lDnd" >&5 +echo "configure:7537: 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 @@ -7543,7 +7541,7 @@ ac_save_LIBS="$LIBS" LIBS="-lDnd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7637,7 +7635,7 @@ EXTRADEFS="$EXTRADEFS -DWRDT_X" enable_sherry_wrd=yes echo $ac_n "checking for zlibVersion in -lz""... $ac_c" 1>&6 -echo "configure:7641: checking for zlibVersion in -lz" >&5 +echo "configure:7639: checking for zlibVersion in -lz" >&5 ac_lib_var=`echo z'_'zlibVersion | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7645,7 +7643,7 @@ ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7679,17 +7677,17 @@ ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for png.h""... $ac_c" 1>&6 -echo "configure:7683: checking for png.h" >&5 +echo "configure:7681: checking for png.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7693: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7691: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7712,7 +7710,7 @@ fi echo $ac_n "checking for png_init_io in -lpng""... $ac_c" 1>&6 -echo "configure:7716: checking for png_init_io in -lpng" >&5 +echo "configure:7714: checking for png_init_io in -lpng" >&5 ac_lib_var=`echo png'_'png_init_io | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7720,7 +7718,7 @@ ac_save_LIBS="$LIBS" LIBS="-lpng -lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7846,9 +7844,8 @@ CPPFLAGS="$val" rm -f wordtmp >/dev/null 2>&1 -#CPPFLAGS="$CPPFLAGS -DDEFAULT_PATH=\\\"\$(TIMID_DIR)\\\"" -CPPFLAGS="$CPPFLAGS \$(DEF_PKGDATADIR) \$(DEF_PKGLIBDIR)" +CPPFLAGS="$CPPFLAGS \$(DEF_PKGDATADIR) \$(DEF_PKGLIBDIR) \$(DEF_DEFAULT_PATH)" if test "x$TIMIDITY_OUTPUT_ID" != x; then CPPFLAGS="$CPPFLAGS -DTIMIDITY_OUTPUT_ID=\\\"$TIMIDITY_OUTPUT_ID\\\"" diff -ruN TiMidity++-2.6.0-beta3/configure.in TiMidity++-2.6.0-beta4/configure.in --- TiMidity++-2.6.0-beta3/configure.in Sat Sep 4 06:38:03 1999 +++ TiMidity++-2.6.0-beta4/configure.in Wed Sep 8 14:38:12 1999 @@ -55,7 +55,7 @@ AC_INIT(timidity/timidity.c) SHELL=${CONFIG_SHELL-/bin/sh} AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(TiMidity++, 2.6.0-beta3, no-define) +AM_INIT_AUTOMAKE(TiMidity++, 2.6.0-beta4, no-define) dnl To use CONTAINS() macro (See acinclude.m4) CONTAINS_INIT @@ -508,8 +508,6 @@ AC_MSG_WARN(No --enable-audio=default audio for $target) ;; esac -else - AC_MSG_RESULT(no) fi dnl @@ -1255,9 +1253,8 @@ SET_UNIQ_WORDS(SHLDFLAGS,$SHLDFLAGS) SET_UNIQ_WORDS(CFLAGS,$EXTRACFLAGS $CFLAGS) SET_UNIQ_WORDS(CPPFLAGS,$CPPFLAGS $EXTRADEFS) -#CPPFLAGS="$CPPFLAGS -DDEFAULT_PATH=\\\"\$(TIMID_DIR)\\\"" -CPPFLAGS="$CPPFLAGS \$(DEF_PKGDATADIR) \$(DEF_PKGLIBDIR)" +CPPFLAGS="$CPPFLAGS \$(DEF_PKGDATADIR) \$(DEF_PKGLIBDIR) \$(DEF_DEFAULT_PATH)" if test "x$TIMIDITY_OUTPUT_ID" != x; then CPPFLAGS="$CPPFLAGS -DTIMIDITY_OUTPUT_ID=\\\"$TIMIDITY_OUTPUT_ID\\\"" diff -ruN TiMidity++-2.6.0-beta3/interface/x_sherry.c TiMidity++-2.6.0-beta4/interface/x_sherry.c --- TiMidity++-2.6.0-beta3/interface/x_sherry.c Sat Aug 28 00:27:51 1999 +++ TiMidity++-2.6.0-beta4/interface/x_sherry.c Thu Sep 9 00:27:37 1999 @@ -74,6 +74,10 @@ #define JISX0201 "-*-fixed-*-r-normal--16-*-*-*-*-*-jisx0201.1976-*" #define JISX0208 "-*-fixed-*-r-normal--16-*-*-*-*-*-jisx0208.1983-*" +/* (mask & src) | (~mask & dst) equals as Windows API BitBlt ROP 0x00CA0749 */ +/* #define ROP3_CA0749(ptn, src, dst) (((ptn) & (src)) | (~(ptn) & (dst))) */ +#define ROP3_CA0749(ptn, src, dst) ((dst) ^ ((ptn) & ((src) ^ (dst)))) + typedef struct _ImagePixmap { Pixmap pm; @@ -129,7 +133,8 @@ static VirtualScreen **virtualScreen; /* MAX_VIRTUAL_SCREENS */ static VirtualScreen *tmpScreen; static VirtualScreen *alloc_vscreen(int width, int height, int transParent); -static void free_vscreen(VirtualScreen *scr); +static void free_vscreen(VirtualScreen *scr); + #define VSCREEN_PIXEL(scr, x, y) ((scr)->data[(scr)->width * (y) + (x)]) static unsigned long basePixel; /* base pixel */ @@ -139,7 +144,7 @@ static SherryPalette **virtualPalette; /* MAX_VIRTUAL_PALETTES, 仮想パレット */ static SherryPaletteEntry realPalette[MAX_PALETTES]; -static uint8 *pseudoImage; /* For TrueColor */ +static uint8 *pseudoImage = NULL; /* For TrueColor */ static int draw_ctl_flag = True; static int err_to_stop = 0; @@ -414,10 +419,12 @@ return error_flag; } - if(strchr(opts, 'p')) - try_pseudo = 1; - else - try_pseudo = 0; + try_pseudo = 0; + if(opts) + { + if(strchr(opts, 'p')) + try_pseudo = 1; + } if((theDisplay = XOpenDisplay(NULL)) == NULL) { @@ -523,7 +530,7 @@ for(i = 0; i < MAX_VIRTUAL_SCREENS; i++) if(virtualScreen[i] != NULL) { - free(virtualScreen[i]); + free_vscreen(virtualScreen[i]); virtualScreen[i] = NULL; } free(virtualScreen); @@ -539,7 +546,8 @@ virtualPalette[i] = NULL; } free(virtualPalette); - free(pseudoImage); + if(pseudoImage) + free(pseudoImage); XFreeFont(theDisplay, theFont8); XFreeFont(theDisplay, theFont16); XCloseDisplay(theDisplay); @@ -607,7 +615,7 @@ n = SRY_GET_SHORT(data + i) & 0xffff; if(virtualScreen[n] != NULL) { - free(virtualScreen[n]); + free_vscreen(virtualScreen[n]); virtualScreen[n] = NULL; } } @@ -939,6 +947,7 @@ png_read_update_info(pngPtr, infoPtr); rowbytes = png_get_rowbytes(pngPtr, infoPtr); + /* rowbytes == width */ rowPointers = (png_bytep *)safe_malloc(height * sizeof(png_bytep)); rowPointers[0] = (png_byte *)safe_malloc(rowbytes * height * sizeof(png_byte)); @@ -961,13 +970,16 @@ } if(scr == NULL) scr = virtualScreen[screen] = - alloc_vscreen(width, height, transParent); + alloc_vscreen(width, height*2, transParent); else scr->transParent = transParent; if(virtualPalette[vpalette] == NULL) + { virtualPalette[vpalette] = (SherryPalette *)safe_malloc(sizeof(SherryPalette)); + memset(virtualPalette[vpalette], 0, sizeof(SherryPalette)); + } entry = virtualPalette[vpalette]->entry; for(i = 0; i < numPalette; i++) @@ -1007,6 +1019,9 @@ printf("Trans all: %d:(%d,%d)\n", screen, sx, sy); #endif /* SRY_DEBUG */ + if(!check_range(scr, sx, sy, + sx + REAL_SCREEN_SIZE_X - 1, sy + REAL_SCREEN_SIZE_Y - 1)) + return; if(theClass != TrueColor) { @@ -1104,17 +1119,15 @@ height_require = REAL_SCREEN_SIZE_Y; return tmpScreen = alloc_vscreen(width_require, height_require, 0); } -/* if(tmpScreen->width * tmpScreen->height >= width_require * height_require) { tmpScreen->width = width_require; tmpScreen->height = height_require; return tmpScreen; } - free(tmpScreen); + if(tmpScreen) + free_vscreen(tmpScreen); return tmpScreen = alloc_vscreen(width_require, height_require, 0); -*/ - return tmpScreen; } static void normalize_rect(int *x1, int *y1, int *x2, int *y2) @@ -1223,7 +1236,7 @@ continue; i = (dest_y + y) * dw + dest_x + x; q = target[i]; - target[i] = (mask & p) | (~mask & q); + target[i] = ROP3_CA0749(mask, p, q); } } } @@ -1346,7 +1359,7 @@ { dstP = VSCREEN_PIXEL(dest, toX + x, toY + y); VSCREEN_PIXEL(dest, toX + x, toY + y) = - (planeMask & srcP) | (~planeMask & dstP); + ROP3_CA0749(planeMask, srcP, dstP); } } } @@ -1394,7 +1407,7 @@ int i; i = v->width * y + x; p = v->data[i]; - v->data[i] = (mask & color) | (~mask & p); + v->data[i] = ROP3_CA0749(mask, color, p); } } } @@ -1407,6 +1420,7 @@ if(scr == NULL) return; + if(x1 < 0 || y1 < 0 || x2 >= scr->width || @@ -1444,7 +1458,7 @@ } idx = scr->width * y + x; - scr->data[idx] = (mask & pixel) | (~mask & scr->data[idx]); + scr->data[idx] = ROP3_CA0749(mask, pixel, scr->data[idx]); if((y2 - y1) * ydirflag > 0) { while(x < xend) @@ -1458,7 +1472,7 @@ d += incr2; } idx = scr->width * y + x; - scr->data[idx] = (mask & pixel) | (~mask & scr->data[idx]); + scr->data[idx] = ROP3_CA0749(mask, pixel, scr->data[idx]); } } else @@ -1474,7 +1488,7 @@ d += incr2; } idx = scr->width * y + x; - scr->data[idx] = (mask & pixel) | (~mask & scr->data[idx]); + scr->data[idx] = ROP3_CA0749(mask, pixel, scr->data[idx]); } } } @@ -1498,7 +1512,7 @@ xdirflag = 1; } idx = scr->width * y + x; - scr->data[idx] = (mask & pixel) | (~mask & scr->data[idx]); + scr->data[idx] = ROP3_CA0749(mask, pixel, scr->data[idx]); if((x2 - x1) * xdirflag > 0) { while(y < yend) @@ -1512,7 +1526,7 @@ d += incr2; } idx = scr->width * y + x; - scr->data[idx] = (mask & pixel) | (~mask & scr->data[idx]); + scr->data[idx] = ROP3_CA0749(mask, pixel, scr->data[idx]); } } else @@ -1528,7 +1542,7 @@ d += incr2; } idx = scr->width * y + x; - scr->data[idx] = (mask & pixel) | (~mask & scr->data[idx]); + scr->data[idx] = ROP3_CA0749(mask, pixel, scr->data[idx]); } } } @@ -1739,7 +1753,7 @@ { p = VSCREEN_PIXEL(scr, tx + bx, ty + by); VSCREEN_PIXEL(scr, tx + bx, ty + by) = - (mask & fg) | (~mask & p); + ROP3_CA0749(mask, fg, p); } } else @@ -1748,7 +1762,7 @@ { p = VSCREEN_PIXEL(scr, tx + bx, ty + by); VSCREEN_PIXEL(scr, tx + bx, ty + by) = - (mask & bg) | (~mask & p); + ROP3_CA0749(mask, bg, p); } } } @@ -1772,6 +1786,7 @@ err_to_stop = 0; init_palette(); + XSetWindowBackground(theDisplay, theWindow, basePixel); XClearWindow(theDisplay, theWindow); @@ -1780,9 +1795,14 @@ for(i = 0; i < MAX_VIRTUAL_SCREENS; i++) if(virtualScreen[i] != NULL) { - free(virtualScreen[i]); + free_vscreen(virtualScreen[i]); virtualScreen[i] = NULL; } + if(tmpScreen) + { + free(tmpScreen); + tmpScreen = NULL; + } for(i = 0; i < MAX_VIRTUAL_PALETTES; i++) if(virtualPalette[i] != NULL) @@ -1790,6 +1810,9 @@ free(virtualPalette[i]); virtualPalette[i] = NULL; } + memset(realPalette, 0, sizeof(realPalette)); + if(theClass == TrueColor) + memset(pseudoImage, 0, REAL_SCREEN_SIZE_X * REAL_SCREEN_SIZE_Y); } @@ -1829,9 +1852,12 @@ skip_bit = op & 0x80; if(skip_bit && aq_filled_ratio() < 0.2) return; + op &= 0x7F; - switch(op & 0x7F) + switch(op) { + case 0x00: /* DataEnd */ + break; case 0x01: ctl->cmsg(CMSG_INFO, VERB_DEBUG, "sherry start"); wrd_init_path(); @@ -1912,11 +1938,25 @@ ctl->cmsg(CMSG_INFO, VERB_DEBUG, "image copy 0x62"); sry_trans_partial_mask(data); break; - - case 0: - case 0x20: + case 0x10: + case 0x11: + case 0x12: + case 0x13: + case 0x14: + case 0x15: + case 0x16: + case 0x17: + case 0x18: + case 0x19: + case 0x1a: + case 0x1b: + case 0x1c: + case 0x1d: + case 0x1e: + case 0x1f: case 0x71: case 0x72: + case 0x7f: ctl->cmsg(CMSG_WARNING, VERB_DEBUG, "Sherry WRD 0x%x: not supported, ignore", op); break; @@ -2243,14 +2283,7 @@ } - - /**** VirtualScreen intarfaces ****/ -static void free_vscreen(VirtualScreen *scr) -{ - free(scr); -} - static VirtualScreen *alloc_vscreen(int width, int height, int transParent) { VirtualScreen *scr; @@ -2260,8 +2293,14 @@ scr = (VirtualScreen *)safe_malloc(sizeof(VirtualScreen) + size); scr->width = width; scr->height = height; + scr->transParent = transParent; memset(scr->data, transParent, size); return scr; +} + +static void free_vscreen(VirtualScreen *scr) +{ + free(scr); } void x_sry_event(void) diff -ruN TiMidity++-2.6.0-beta3/timidity/Makefile.in TiMidity++-2.6.0-beta4/timidity/Makefile.in --- TiMidity++-2.6.0-beta3/timidity/Makefile.in Sun Sep 5 21:30:17 1999 +++ TiMidity++-2.6.0-beta4/timidity/Makefile.in Thu Sep 9 12:23:25 1999 @@ -314,7 +314,8 @@ playmidi.o: playmidi.c ../config.h timidity.h ../utils/support.h \ common.h ../libarc/url.h ../utils/mblock.h instrum.h playmidi.h \ readmidi.h output.h mix.h controls.h miditrace.h recache.h \ - ../libarc/arc.h reverb.h wrd.h aq.h tables.h + ../libarc/arc.h reverb.h wrd.h aq.h ../interface/soundspec.h \ + tables.h raw_a.o: raw_a.c ../config.h timidity.h ../utils/support.h output.h \ controls.h rcp.o: rcp.c ../config.h timidity.h ../utils/support.h common.h \ @@ -350,8 +351,8 @@ timidity.o: timidity.c ../config.h ../interface.h timidity.h \ ../utils/support.h common.h ../libarc/url.h ../utils/mblock.h \ instrum.h playmidi.h readmidi.h output.h controls.h tables.h \ - miditrace.h reverb.h recache.h ../libarc/arc.h \ - ../utils/strtab.h wrd.h mid.defs aq.h dlutils.h + miditrace.h reverb.h ../interface/soundspec.h recache.h \ + ../libarc/arc.h ../utils/strtab.h wrd.h mid.defs aq.h wave_a.o: wave_a.c ../config.h timidity.h ../utils/support.h output.h \ controls.h wrd_read.o: wrd_read.c ../config.h timidity.h ../utils/support.h \ diff -ruN TiMidity++-2.6.0-beta3/timidity/alsa_a.c TiMidity++-2.6.0-beta4/timidity/alsa_a.c --- TiMidity++-2.6.0-beta3/timidity/alsa_a.c Mon Feb 22 18:31:48 1999 +++ TiMidity++-2.6.0-beta4/timidity/alsa_a.c Mon Sep 6 06:42:38 1999 @@ -51,17 +51,11 @@ #include "playmidi.h" #include "miditrace.h" -/* Define if you want to use soft audio buffering (AUDIO_FILLING_SEC sec.) */ -/* #define AUDIO_FILLING_MILSEC 3000 */ - -/* Defined if you want to use initial audio buffering */ -/* #define INITIAL_FILLING */ - static int open_output(void); /* 0=success, 1=warning, -1=fatal error */ static void close_output(void); static int output_data(char *buf, int32 nbytes); static int acntl(int request, void *arg); - +static int total_bytes, output_counter; /* export the playback mode */ @@ -87,7 +81,7 @@ /*ALSA PCM handler*/ -static void* handle = NULL; +static snd_pcm_t* handle = NULL; static int card = 0; static int device = 0; @@ -107,7 +101,7 @@ /*Search sound cards*/ struct snd_ctl_hw_info ctl_hw_info; snd_pcm_info_t pcm_info; - void* ctl_handle; + snd_ctl_t* ctl_handle; const char* env_sound_card = getenv ("TIMIDITY_SOUND_CARD"); const char* env_pcm_device = getenv ("TIMIDITY_PCM_DEVICE"); int tmp; @@ -219,6 +213,7 @@ snd_pcm_playback_info_t playback_info; snd_pcm_format_t pcm_format; struct snd_pcm_playback_params playback_params; + struct snd_pcm_playback_status playback_status; int tmp; memset (&pcm_format, 0, sizeof (pcm_format)); memset (&playback_params, 0, sizeof (playback_params)); @@ -282,7 +277,7 @@ else { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, - "%s doesn't support mono or stereo samples", + "%s doesn't support 16 bit sample width", dpm.name); return -1; } @@ -304,7 +299,7 @@ else { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, - "%s doesn't support mono or stereo samples", + "%s doesn't support 8 bit sample width", dpm.name); return -1; } @@ -331,13 +326,6 @@ ((*encoding__ & PE_MONO) != 0)? "mono" : "stereo"); ret_val = 1; } - if (pcm_format.rate != orig_rate) - { - ctl->cmsg(CMSG_WARNING, VERB_VERBOSE, - "Output rate adjusted to %d Hz (requested %d Hz)", - pcm_format.rate, orig_rate); - ret_val = 1; - } /* Set buffer fragments (in extra_param[0]) */ tmp = AUDIO_BUFFER_BITS; @@ -354,10 +342,12 @@ playback_params.fragments_max = extra_param[0]; #else playback_params.fragment_size = (1 << tmp); + if (extra_param[0] == 0) playback_params.fragments_max = 15;/*default value. What's value is apporpriate?*/ else playback_params.fragments_max = extra_param[0]; + #endif playback_params.fragments_room = 1; tmp = snd_pcm_playback_params (handle__, &playback_params); @@ -373,6 +363,21 @@ ret_val =1; } + if(snd_pcm_playback_status(handle__, &playback_status) == 0) + { + if (playback_status.rate != orig_rate) + { + ctl->cmsg(CMSG_WARNING, VERB_VERBOSE, + "Output rate adjusted to %d Hz (requested %d Hz)", + playback_status.rate, orig_rate); + dpm.rate = playback_status.rate; + ret_val = 1; + } + total_bytes = playback_status.count; + } + else + total_bytes = -1; /* snd_pcm_playback_status fails */ + return ret_val; } @@ -405,6 +410,7 @@ } dpm.fd = snd_pcm_file_descriptor (handle); + output_counter = 0; return warnings; } @@ -440,6 +446,7 @@ } buf += n; nbytes -= n; + output_counter += n; } return 0; @@ -447,11 +454,54 @@ static int acntl(int request, void *arg) { + struct snd_pcm_playback_status playback_status; + int i; + switch(request) { + case PM_REQ_GETQSIZ: + if(total_bytes == -1) + return -1; + *((int *)arg) = total_bytes; + return 0; + + case PM_REQ_GETFILLABLE: + if(total_bytes == -1) + return -1; + if(snd_pcm_playback_status(handle, &playback_status) != 0) + return -1; + *((int *)arg) = playback_status.count; + return 0; + + case PM_REQ_GETFILLED: + if(total_bytes == -1) + return -1; + if(snd_pcm_playback_status(handle, &playback_status) != 0) + return -1; + *((int *)arg) = playback_status.queue; + return 0; + + case PM_REQ_GETSAMPLES: + if(total_bytes == -1) + return -1; + if(snd_pcm_playback_status(handle, &playback_status) != 0) + return -1; + i = output_counter - playback_status.queue; + if(!(dpm.encoding & PE_MONO)) i >>= 1; + if(dpm.encoding & PE_16BIT) i >>= 1; + *((int *)arg) = i; + return 0; + case PM_REQ_DISCARD: if(snd_pcm_drain_playback (handle) != 0) return -1; /* error */ + output_counter = 0; + return 0; + + case PM_REQ_FLUSH: + if(snd_pcm_flush_playback(handle) != 0) + return -1; /* error */ + output_counter = 0; return 0; } return -1; diff -ruN TiMidity++-2.6.0-beta3/timidity/common.c TiMidity++-2.6.0-beta4/timidity/common.c --- TiMidity++-2.6.0-beta3/timidity/common.c Sat Sep 4 07:21:03 1999 +++ TiMidity++-2.6.0-beta4/timidity/common.c Mon Sep 6 19:09:48 1999 @@ -1001,8 +1001,7 @@ ignore_case = 1; /* Always ignore the case */ #endif - while(*p1 && *p2) - { + do { c1 = *p1++ & 0xff; c2 = *p2++ & 0xff; if(ignore_case) @@ -1010,21 +1009,10 @@ c1 = tolower(c1); c2 = tolower(c2); } - if(IS_PATH_SEP(c1)) c1 = 0; - if(IS_PATH_SEP(c2)) c2 = 0; - if(c1 != c2) - return c1 - c2; - } + if(IS_PATH_SEP(c1)) c1 = *p1 ? 0x100 : 0; + if(IS_PATH_SEP(c2)) c2 = *p2 ? 0x100 : 0; + } while(c1 == c2 && c1 /* && c2 */); - c1 = *p1 & 0xff; - c2 = *p2 & 0xff; - if(ignore_case) - { - c1 = tolower(c1); - c2 = tolower(c2); - } - if(IS_PATH_SEP(c1)) c1 = 0; - if(IS_PATH_SEP(c2)) c2 = 0; return c1 - c2; } diff -ruN TiMidity++-2.6.0-beta3/timidity/wrd_read.c TiMidity++-2.6.0-beta4/timidity/wrd_read.c --- TiMidity++-2.6.0-beta3/timidity/wrd_read.c Sun Jul 18 02:12:50 1999 +++ TiMidity++-2.6.0-beta4/timidity/wrd_read.c Thu Sep 9 00:11:20 1999 @@ -1771,6 +1771,8 @@ static int sherry_started; /* 0 - before start command 0x01*/ /* 1 - after start command 0x01*/ +static int sry_timebase_mode = 0; /* 0 is default */ + static int32 sry_getVariableLength(struct timidity_file *tf) { int32 value= 0; @@ -1886,7 +1888,7 @@ return 0; } -static void sry_readinit(struct wrd_step_tracer* wrdstep, int timebase) +static void sry_timebase21(struct wrd_step_tracer* wrdstep, int timebase) { sherry_started=0; memset(wrdstep, 0, sizeof(struct wrd_step_tracer)); @@ -1928,6 +1930,41 @@ #endif /* DEBUG */ } +static void sry_timebase22(struct wrd_step_tracer* wrdstep, int mode) +{ + sry_timebase_mode = mode; + if(sry_timebase_mode) + ctl->cmsg(CMSG_WARNING, VERB_NORMAL, + "Sherry time synchronize mode is not supported"); +} + +static void sry_wrdinfo(uint8 *info, int len) +{ + char *info1, *info2, *desc; + int i; + + /* "info1\0info2\0desc\0" */ + /* FIXME: Need to convert SJIS to "output_text_code" */ + + i = 0; + info1 = (char *)info; + while(i < len && info[i]) + i++; + i++; /* skip '\0' */ + if(i >= len) + return; + info2 = info + i; + while(i < len && info[i]) + i++; + i++; /* skip '\0' */ + if(i >= len) + return; + desc = info + i; + + ctl->cmsg(CMSG_INFO, VERB_VERBOSE, + "Sherry WRD: %s: %s: %s", info1, info2, desc); +} + static void sry_show_debug(uint8 *data) { switch(data[0]) @@ -1937,11 +1974,13 @@ ctl->cmsg(CMSG_INFO, VERB_NOISY, "Sherry WRD Compiler: %s", data + 1); break; - case 0x72: + case 0x72: /* Source Name */ if(data[1]) ctl->cmsg(CMSG_INFO, VERB_NOISY, "Sherry WRD Compiled from %s", data + 1); break; + case 0x7f: /* Compiler Private */ + break; } } @@ -1960,12 +1999,24 @@ err= sry_read_datapacket(tf, &packet); if( err ) break; sry_regist_datapacket(wrdstep , &packet); - if( packet.data[0]==0x21 || packet.data[0]==0x20 ){ - sry_readinit(wrdstep, SRY_GET_SHORT(packet.data+1)); - } else if( (packet.data[0]&0x70) == 0x70) { - sry_show_debug(packet.data); + switch(packet.data[0]) + { + case 0x00: /* end of header */ + return; + case 0x21: + sry_timebase21(wrdstep, SRY_GET_SHORT(packet.data+1)); + break; + case 0x22: + sry_timebase22(wrdstep, packet.data[1]); + break; + case 0x61: + sry_wrdinfo(packet.data + 1, packet.len - 1); + break; + default: + if((packet.data[0] & 0x70) == 0x70) + sry_show_debug(packet.data); + break; } - if( packet.data[0] == 0x00 ) break; /* end of header */ } } @@ -1985,7 +2036,7 @@ WRD_ADDEVENT(wrdstep->at, WRD_SHERRY_UPDATE, WRD_NOARG); need_update = 0; } - err= sry_read_datapacket(tf, &packet); + err = sry_read_datapacket(tf, &packet); if( err ) break; /* cur_time =+ delta_time;*/ /* wrdstep_wait(wrdstep, delta_time,0); */ @@ -2058,6 +2109,4 @@ return 1; } - #endif /*ENABLE_SHERRY*/ -