diff -ruN TiMidity++-2.11.1/COPYING TiMidity++-2.11.2/COPYING --- TiMidity++-2.11.1/COPYING Wed Jan 20 18:17:12 1999 +++ TiMidity++-2.11.2/COPYING Wed Jan 9 15:44:07 2002 @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 675 Mass Ave, Cambridge, MA 02139, USA + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -279,7 +279,7 @@ END OF TERMS AND CONDITIONS - Appendix: How to Apply These Terms to Your New Programs + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it @@ -291,7 +291,7 @@ the "copyright" line and a pointer to where the full notice is found. - Copyright (C) 19yy + Copyright (C) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -305,14 +305,15 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Also add information on how to contact you by electronic and paper mail. If the program is interactive, make it output a short notice like this when it starts in an interactive mode: - Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff -ruN TiMidity++-2.11.1/ChangeLog TiMidity++-2.11.2/ChangeLog --- TiMidity++-2.11.1/ChangeLog Sat Dec 29 08:00:12 2001 +++ TiMidity++-2.11.2/ChangeLog Sat Jan 12 18:47:34 2002 @@ -1,3 +1,31 @@ +2002-01-12 Masanao Izumo + + * Version 2.11.2 released. + +2002-01-12 Masanao Izumo + + * timidity/readmidi.c: + Bug fixed about fix_string(strdup(...)); + +2002-01-09 Masanao Izumo + + * config.guess: Updated. + * config.sub: Updated. + * configuer.in (Cygwin): DLL gogo is default if --enable-audio=gogo + is specified. + +2002-01-08 Masanao Izumo + + * Update copyrights. + +2002-01-07 Masanao Izumo + + * timidity/{timidity.h,mix.c,playmidi.h}: + Bug fix about LOOKUP_HACK. + * timidity/{timidity.c,instrum.c,instrum.h,common.c,common.h, + readmidi.h,readmidi.c}: + Free config data at end of the main. + 2001-12-29 Masanao Izumo * Version 2.11.1 released. diff -ruN TiMidity++-2.11.1/Makefile.am TiMidity++-2.11.2/Makefile.am --- TiMidity++-2.11.1/Makefile.am Tue Oct 9 17:40:17 2001 +++ TiMidity++-2.11.2/Makefile.am Wed Jan 9 17:06:18 2002 @@ -1,5 +1,5 @@ # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999-2001 Masanao Izumo +# Copyright (C) 1999-2002 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # This Makefile is known to work with GNU make. diff -ruN TiMidity++-2.11.1/Makefile.in TiMidity++-2.11.2/Makefile.in --- TiMidity++-2.11.1/Makefile.in Sat Dec 29 07:27:37 2001 +++ TiMidity++-2.11.2/Makefile.in Wed Jan 9 17:09:21 2002 @@ -14,7 +14,7 @@ @SET_MAKE@ # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999-2001 Masanao Izumo +# Copyright (C) 1999-2002 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify @@ -29,7 +29,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # This Makefile is known to work with GNU make. diff -ruN TiMidity++-2.11.1/NEWS TiMidity++-2.11.2/NEWS --- TiMidity++-2.11.1/NEWS Sat Dec 29 07:27:30 2001 +++ TiMidity++-2.11.2/NEWS Sat Jan 12 16:39:00 2002 @@ -1,3 +1,6 @@ +01/12, 2002 + * Version 2.11.2 released. + 12/29, 2001 * Version 2.11.1 released. diff -ruN TiMidity++-2.11.1/acinclude.m4 TiMidity++-2.11.2/acinclude.m4 --- TiMidity++-2.11.1/acinclude.m4 Thu Dec 20 21:24:55 2001 +++ TiMidity++-2.11.2/acinclude.m4 Wed Jan 9 17:06:12 2002 @@ -1,3 +1,21 @@ +dnl TiMidity++ -- MIDI to WAVE converter and player +dnl Copyright (C) 1999-2002 Masanao Izumo +dnl Copyright (C) 1995 Tuukka Toivonen +dnl +dnl This program is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with this program; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + dnl MY_DEFINE(VARIABLE) AC_DEFUN(MY_DEFINE, [cat >> confdefs.h < +dnl Copyright (C) 1995 Tuukka Toivonen +dnl +dnl This program is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with this program; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + dnl MY_DEFINE(VARIABLE) AC_DEFUN(MY_DEFINE, [cat >> confdefs.h < +# Copyright (C) 1999-2002 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Define follows if you want to change. # Note that the definition of beginning with just one `#' implies diff -ruN TiMidity++-2.11.1/config.guess TiMidity++-2.11.2/config.guess --- TiMidity++-2.11.1/config.guess Wed Oct 31 17:17:17 2001 +++ TiMidity++-2.11.2/config.guess Wed Jan 9 15:32:23 2002 @@ -1,9 +1,9 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -# Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002 Free Software Foundation, Inc. -timestamp='2001-08-21' +timestamp='2002-01-02' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -24,8 +24,9 @@ # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. -# Written by Per Bothner . -# Please send patches to . +# Originally written by Per Bothner . +# Please send patches to . Submit a context +# diff and a properly formatted ChangeLog entry. # # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and @@ -127,29 +128,28 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) - # Netbsd (nbsd) targets should (where applicable) match one or + # NetBSD (nbsd) targets should (where applicable) match one or # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward # compatibility and a consistent mechanism for selecting the # object file format. - # Determine the machine/vendor (is the vendor relevant). - case "${UNAME_MACHINE}" in - amiga) machine=m68k-unknown ;; - arm32) machine=arm-unknown ;; - atari*) machine=m68k-atari ;; - sun3*) machine=m68k-sun ;; - mac68k) machine=m68k-apple ;; - macppc) machine=powerpc-apple ;; - hp3[0-9][05]) machine=m68k-hp ;; - ibmrt|romp-ibm) machine=romp-ibm ;; - *) machine=${UNAME_MACHINE}-unknown ;; + # + # Note: NetBSD doesn't particularly care about the vendor + # portion of the name. We always set it to "unknown". + UNAME_MACHINE_ARCH=`(uname -p) 2>/dev/null` || \ + UNAME_MACHINE_ARCH=unknown + case "${UNAME_MACHINE_ARCH}" in + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; + *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently, or will in the future. - case "${UNAME_MACHINE}" in - i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k) + case "${UNAME_MACHINE_ARCH}" in + arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep __ELF__ >/dev/null @@ -172,6 +172,45 @@ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit 0 ;; + amiga:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + arc:OpenBSD:*:*) + echo mipsel-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + hp300:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mac68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + macppc:OpenBSD:*:*) + echo powerpc-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme88k:OpenBSD:*:*) + echo m88k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvmeppc:OpenBSD:*:*) + echo powerpc-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + pmax:OpenBSD:*:*) + echo mipsel-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + sgi:OpenBSD:*:*) + echo mipseb-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + sun3:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + wgrisc:OpenBSD:*:*) + echo mipsel-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + *:OpenBSD:*:*) + echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; alpha:OSF1:*:*) if test $UNAME_RELEASE = "V4.0"; then UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` @@ -247,29 +286,11 @@ Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 exit 0;; - amiga:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos exit 0 ;; - arc64:OpenBSD:*:*) - echo mips64el-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - arc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - hkmips:OpenBSD:*:*) - echo mips-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - pmax:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sgi:OpenBSD:*:*) - echo mips-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - wgrisc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} + *:[Mm]orph[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-morphos exit 0 ;; *:OS/390:*:*) echo i370-ibm-openedition @@ -333,12 +354,6 @@ aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} exit 0 ;; - sparc*:NetBSD:*) - echo `uname -p`-unknown-netbsd${UNAME_RELEASE} - exit 0 ;; - atari*:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor @@ -365,18 +380,6 @@ *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint${UNAME_RELEASE} exit 0 ;; - sun3*:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mac68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} exit 0 ;; @@ -393,6 +396,7 @@ echo clipper-intergraph-clix${UNAME_RELEASE} exit 0 ;; mips:*:*:UMIPS | mips:*:*:RISCos) + eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #ifdef __cplusplus #include /* for printf() prototype */ @@ -414,7 +418,6 @@ exit (-1); } EOF - eval $set_cc_for_build $CC_FOR_BUILD $dummy.c -o $dummy \ && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ && rm -f $dummy.c $dummy && exit 0 @@ -484,6 +487,7 @@ exit 0 ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then + eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #include @@ -495,7 +499,6 @@ exit(0); } EOF - eval $set_cc_for_build $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 rm -f $dummy.c $dummy echo rs6000-ibm-aix3.2.5 @@ -546,10 +549,8 @@ 9000/31? ) HP_ARCH=m68000 ;; 9000/[34]?? ) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) - case "${HPUX_REV}" in - 11.[0-9][0-9]) - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` case "${sc_cpu_version}" in 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 @@ -558,12 +559,13 @@ case "${sc_kernel_bits}" in 32) HP_ARCH="hppa2.0n" ;; 64) HP_ARCH="hppa2.0w" ;; + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 esac ;; esac - fi ;; - esac - if [ "${HP_ARCH}" = "" ]; then - sed 's/^ //' << EOF >$dummy.c + fi + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c #define _HPUX_SOURCE #include @@ -596,11 +598,10 @@ exit (0); } EOF - eval $set_cc_for_build - (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy` - if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi - rm -f $dummy.c $dummy - fi ;; + (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`./$dummy` + if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi + rm -f $dummy.c $dummy + fi ;; esac echo ${HP_ARCH}-hp-hpux${HPUX_REV} exit 0 ;; @@ -609,6 +610,7 @@ echo ia64-hp-hpux${HPUX_REV} exit 0 ;; 3050*:HI-UX:*:*) + eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #include int @@ -634,7 +636,6 @@ exit (0); } EOF - eval $set_cc_for_build $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 rm -f $dummy.c $dummy echo unknown-hitachi-hiuxwe2 @@ -664,9 +665,6 @@ parisc*:Lites*:*:*) echo hppa1.1-hp-lites exit 0 ;; - hppa*:OpenBSD:*:*) - echo hppa-unknown-openbsd - exit 0 ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd exit 0 ;; @@ -718,9 +716,6 @@ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit 0 ;; - hp300:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} exit 0 ;; @@ -733,9 +728,6 @@ *:FreeBSD:*:*) echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit 0 ;; - *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - exit 0 ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit 0 ;; @@ -745,6 +737,9 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit 0 ;; + x86:Interix*:3*) + echo i386-pc-interix3 + exit 0 ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we @@ -776,10 +771,24 @@ echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; mips:Linux:*:*) - case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in - big) echo mips-unknown-linux-gnu && exit 0 ;; - little) echo mipsel-unknown-linux-gnu && exit 0 ;; - esac + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef mips + #undef mipsel + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=mipsel + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=mips + #else + CPU= + #endif + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` + rm -f $dummy.c + test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0 ;; ppc:Linux:*:*) echo powerpc-unknown-linux-gnu @@ -851,33 +860,26 @@ exit 0 ;; esac # Determine whether the default compiler is a.out or elf - cat >$dummy.c < -#ifdef __cplusplus -#include /* for printf() prototype */ - int main (int argc, char *argv[]) { -#else - int main (argc, argv) int argc; char *argv[]; { -#endif -#ifdef __ELF__ -# ifdef __GLIBC__ -# if __GLIBC__ >= 2 - printf ("%s-pc-linux-gnu\n", argv[1]); -# else - printf ("%s-pc-linux-gnulibc1\n", argv[1]); -# endif -# else - printf ("%s-pc-linux-gnulibc1\n", argv[1]); -# endif -#else - printf ("%s-pc-linux-gnuaout\n", argv[1]); -#endif - return 0; -} -EOF eval $set_cc_for_build - $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0 - rm -f $dummy.c $dummy + sed 's/^ //' << EOF >$dummy.c + #include + #ifdef __ELF__ + # ifdef __GLIBC__ + # if __GLIBC__ >= 2 + LIBC=gnu + # else + LIBC=gnulibc1 + # endif + # else + LIBC=gnulibc1 + # endif + #else + LIBC=gnuaout + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` + rm -f $dummy.c + test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 ;; i*86:DYNIX/ptx:4*:*) @@ -956,7 +958,7 @@ exit 0 ;; M68*:*:R3V[567]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0) + 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` @@ -1065,7 +1067,7 @@ *:QNX:*:4*) echo i386-pc-qnx exit 0 ;; - NSR-[KW]:NONSTOP_KERNEL:*:*) + NSR-[GKLNPTVW]:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit 0 ;; *:NonStop-UX:*:*) @@ -1114,11 +1116,15 @@ i*86:XTS-300:*:STOP) echo ${UNAME_MACHINE}-unknown-stop exit 0 ;; + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos + exit 0 ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 +eval $set_cc_for_build cat >$dummy.c < @@ -1233,7 +1239,6 @@ } EOF -eval $set_cc_for_build $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0 rm -f $dummy.c $dummy diff -ruN TiMidity++-2.11.1/config.sub TiMidity++-2.11.2/config.sub --- TiMidity++-2.11.1/config.sub Wed Oct 31 17:17:17 2001 +++ TiMidity++-2.11.2/config.sub Wed Jan 9 15:32:23 2002 @@ -1,9 +1,9 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -# Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002 Free Software Foundation, Inc. -timestamp='2001-08-13' +timestamp='2002-01-02' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -29,7 +29,8 @@ # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. -# Please send patches to . +# Please send patches to . Submit a context +# diff and a properly formatted ChangeLog entry. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -226,6 +227,7 @@ 1750a | 580 \ | a29k \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ | c4x | clipper \ | d10v | d30v | dsp16xx \ @@ -236,21 +238,21 @@ | mips16 | mips64 | mips64el | mips64orion | mips64orionel \ | mips64vr4100 | mips64vr4100el | mips64vr4300 \ | mips64vr4300el | mips64vr5000 | mips64vr5000el \ - | mipsbe | mipsel | mipsle | mipstx39 | mipstx39el \ + | mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \ + | mipsisa32 \ | mn10200 | mn10300 \ | ns16k | ns32k \ | openrisc \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | s390 | s390x \ | sh | sh[34] | sh[34]eb | shbe | shle \ | sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \ | strongarm \ | tahoe | thumb | tic80 | tron \ - | v850 \ + | v850 | v850e \ | we32k \ - | x86 | xscale \ + | x86 | xscale | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; @@ -277,8 +279,10 @@ 580-* \ | a29k-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alphapca5[67]-* | arc-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armv*-* \ + | avr-* \ | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c54x-* \ | clipper-* | cray2-* | cydra-* \ @@ -293,22 +297,22 @@ | m88110-* | m88k-* | mcore-* \ | mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \ | mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipsel-* \ - | mipsle-* | mipstx39-* | mipstx39el-* \ + | mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \ + | mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | s390-* | s390x-* \ | sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \ | sparc-* | sparc64-* | sparc86x-* | sparclite-* \ | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* \ | t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \ - | v850-* | vax-* \ + | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \ + | x86-* | x86_64-* | xmp-* | xps100-* | xscale-* | xstormy16-* \ + | xtensa-* \ | ymp-* \ | z8k-*) ;; @@ -417,6 +421,14 @@ decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) basic_machine=mips-dec ;; + decsystem10* | dec10*) + basic_machine=pdp10-dec + os=-tops10 + ;; + decsystem20* | dec20*) + basic_machine=pdp10-dec + os=-tops20 + ;; delta | 3300 | motorola-3300 | motorola-delta \ | 3300-motorola | delta-motorola) basic_machine=m68k-motorola @@ -619,6 +631,10 @@ basic_machine=m68k-rom68k os=-coff ;; + morphos) + basic_machine=powerpc-unknown + os=-morphos + ;; msdos) basic_machine=i386-pc os=-msdos @@ -723,7 +739,7 @@ pc532 | pc532-*) basic_machine=ns32k-pc532 ;; - pentium | p5 | k5 | k6 | nexgen) + pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; pentiumpro | p6 | 6x86 | athlon) @@ -732,7 +748,7 @@ pentiumii | pentium2) basic_machine=i686-pc ;; - pentium-* | p5-* | k5-* | k6-* | nexgen-*) + pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pentiumpro-* | p6-* | 6x86-* | athlon-*) @@ -783,6 +799,12 @@ rtpc | rtpc-*) basic_machine=romp-ibm ;; + s390 | s390-*) + basic_machine=s390-ibm + ;; + s390x | s390x-*) + basic_machine=s390x-ibm + ;; sa29200) basic_machine=a29k-amd os=-udi @@ -794,7 +816,7 @@ basic_machine=sh-hitachi os=-hms ;; - sparclite-wrs) + sparclite-wrs | simso-wrs) basic_machine=sparclite-wrs os=-vxworks ;; @@ -874,6 +896,10 @@ tx39el) basic_machine=mipstx39el-unknown ;; + toad1) + basic_machine=pdp10-xkl + os=-tops20 + ;; tower | tower-32) basic_machine=m68k-ncr ;; @@ -1067,7 +1093,7 @@ | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos*) + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* | -morphos*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1119,6 +1145,9 @@ -acis*) os=-aos ;; + -atheos*) + os=-atheos + ;; -386bsd) os=-bsd ;; @@ -1199,6 +1228,7 @@ arm*-semi) os=-aout ;; + # This must come before the *-dec entry. pdp10-*) os=-tops20 ;; diff -ruN TiMidity++-2.11.1/configs/msc-config.h TiMidity++-2.11.2/configs/msc-config.h --- TiMidity++-2.11.1/configs/msc-config.h Sat Dec 29 08:53:42 2001 +++ TiMidity++-2.11.2/configs/msc-config.h Sat Jan 12 19:35:15 2002 @@ -267,11 +267,12 @@ /* In VDS Macro AAA=BBB is not available. */ #define __W32__ -#define TIMID_VERSION "2.11.1" +#define TIMID_VERSION "2.11.2" #define DEFAULT_PATH ".\\" #define AU_W32 #define AU_VORBIS #define AU_GOGO +#define AU_GOGO_DLL #define WINSOCK #define __W32READDIR__ // #define URL_DIR_CACHE_ENABLE diff -ruN TiMidity++-2.11.1/configs/msc-config.h.in TiMidity++-2.11.2/configs/msc-config.h.in --- TiMidity++-2.11.1/configs/msc-config.h.in Sat Dec 29 08:53:42 2001 +++ TiMidity++-2.11.2/configs/msc-config.h.in Sat Jan 12 19:35:15 2002 @@ -272,6 +272,7 @@ #define AU_W32 #define AU_VORBIS #define AU_GOGO +#define AU_GOGO_DLL #define WINSOCK #define __W32READDIR__ // #define URL_DIR_CACHE_ENABLE diff -ruN TiMidity++-2.11.1/configure TiMidity++-2.11.2/configure --- TiMidity++-2.11.1/configure Sat Dec 29 07:27:39 2001 +++ TiMidity++-2.11.2/configure Wed Jan 9 17:09:24 2002 @@ -1400,7 +1400,7 @@ # Define the identity of the package. PACKAGE=TiMidity++ -VERSION=2.11.1 +VERSION=2.11.2 cat >>confdefs.h <&5 diff -ruN TiMidity++-2.11.1/configure.in TiMidity++-2.11.2/configure.in --- TiMidity++-2.11.1/configure.in Sat Dec 29 07:26:26 2001 +++ TiMidity++-2.11.2/configure.in Wed Jan 9 17:05:18 2002 @@ -1,5 +1,5 @@ dnl TiMidity++ -- MIDI to WAVE converter and player -dnl Copyright (C) 1999-2001 Masanao Izumo +dnl Copyright (C) 1999-2002 Masanao Izumo dnl Copyright (C) 1995 Tuukka Toivonen dnl dnl This program is free software; you can redistribute it and/or modify @@ -14,7 +14,7 @@ dnl dnl You should have received a copy of the GNU General Public License dnl along with this program; if not, write to the Free Software -dnl Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl Template file for GNU Autoconf dnl Process this file with autoconf to produce a configure script. @@ -55,7 +55,7 @@ AC_INIT(timidity/timidity.c) SHELL=${CONFIG_SHELL-/bin/sh} AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(TiMidity++, 2.11.1) +AM_INIT_AUTOMAKE(TiMidity++, 2.11.2) dnl To use CONTAINS() macro (See acinclude.m4) CONTAINS_INIT @@ -818,7 +818,7 @@ fi have_gogo=yes SYSEXTRAS="$SYSEXTRAS gogo_a.c w32_gogo.c" - EXTRADEFS="$EXTRADEFS -DAU_GOGO" + EXTRADEFS="$EXTRADEFS -DAU_GOGO -DAU_GOGO_DLL" EXTRALIBS="$EXTRALIBS -lgogo" else AC_MSG_RESULT(no) diff -ruN TiMidity++-2.11.1/doc/C/Makefile.am TiMidity++-2.11.2/doc/C/Makefile.am --- TiMidity++-2.11.1/doc/C/Makefile.am Tue Mar 13 10:07:39 2001 +++ TiMidity++-2.11.2/doc/C/Makefile.am Wed Jan 9 17:06:54 2002 @@ -1,5 +1,5 @@ # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999-2001 Masanao Izumo +# Copyright (C) 1999-2002 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA include $(top_builddir)/common.makefile diff -ruN TiMidity++-2.11.1/doc/C/Makefile.in TiMidity++-2.11.2/doc/C/Makefile.in --- TiMidity++-2.11.1/doc/C/Makefile.in Sat Dec 29 07:28:07 2001 +++ TiMidity++-2.11.2/doc/C/Makefile.in Wed Jan 9 17:09:39 2002 @@ -14,7 +14,7 @@ @SET_MAKE@ # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999-2001 Masanao Izumo +# Copyright (C) 1999-2002 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify @@ -29,7 +29,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA SHELL = @SHELL@ diff -ruN TiMidity++-2.11.1/doc/C/timidity.1 TiMidity++-2.11.2/doc/C/timidity.1 --- TiMidity++-2.11.1/doc/C/timidity.1 Thu Dec 27 10:12:39 2001 +++ TiMidity++-2.11.2/doc/C/timidity.1 Wed Jan 9 17:11:59 2002 @@ -707,7 +707,7 @@ .P .SH COPYRIGHT -Copyright (C) 1999-2001 Masanao Izumo +Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen .P The original version was developed by Tuukka Toivonen @@ -726,7 +726,7 @@ .P You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA .SH AVAILABILITY diff -ruN TiMidity++-2.11.1/doc/C/timidity.cfg.5 TiMidity++-2.11.2/doc/C/timidity.cfg.5 --- TiMidity++-2.11.1/doc/C/timidity.cfg.5 Tue Jul 4 16:58:58 2000 +++ TiMidity++-2.11.2/doc/C/timidity.cfg.5 Wed Jan 9 17:11:54 2002 @@ -233,7 +233,7 @@ .P You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA .SH AVAILABILITY diff -ruN TiMidity++-2.11.1/doc/Makefile.am TiMidity++-2.11.2/doc/Makefile.am --- TiMidity++-2.11.1/doc/Makefile.am Mon Jun 25 20:09:53 2001 +++ TiMidity++-2.11.2/doc/Makefile.am Wed Jan 9 17:07:04 2002 @@ -1,5 +1,5 @@ # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999-2001 Masanao Izumo +# Copyright (C) 1999-2002 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA include $(top_builddir)/common.makefile SUFFIXES = .1 .5 .txt .ps diff -ruN TiMidity++-2.11.1/doc/Makefile.in TiMidity++-2.11.2/doc/Makefile.in --- TiMidity++-2.11.1/doc/Makefile.in Sat Dec 29 07:28:06 2001 +++ TiMidity++-2.11.2/doc/Makefile.in Wed Jan 9 17:09:38 2002 @@ -14,7 +14,7 @@ @SET_MAKE@ # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999-2001 Masanao Izumo +# Copyright (C) 1999-2002 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify @@ -29,7 +29,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA SHELL = @SHELL@ diff -ruN TiMidity++-2.11.1/doc/ja_JP.ujis/Makefile.am TiMidity++-2.11.2/doc/ja_JP.ujis/Makefile.am --- TiMidity++-2.11.1/doc/ja_JP.ujis/Makefile.am Tue Mar 13 10:07:39 2001 +++ TiMidity++-2.11.2/doc/ja_JP.ujis/Makefile.am Wed Jan 9 17:06:59 2002 @@ -1,5 +1,5 @@ # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999-2001 Masanao Izumo +# Copyright (C) 1999-2002 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA include $(top_builddir)/common.makefile diff -ruN TiMidity++-2.11.1/doc/ja_JP.ujis/Makefile.in TiMidity++-2.11.2/doc/ja_JP.ujis/Makefile.in --- TiMidity++-2.11.1/doc/ja_JP.ujis/Makefile.in Sat Dec 29 07:28:07 2001 +++ TiMidity++-2.11.2/doc/ja_JP.ujis/Makefile.in Wed Jan 9 17:09:38 2002 @@ -14,7 +14,7 @@ @SET_MAKE@ # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999-2001 Masanao Izumo +# Copyright (C) 1999-2002 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify @@ -29,7 +29,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA SHELL = @SHELL@ diff -ruN TiMidity++-2.11.1/doc/ja_JP.ujis/timidity.1 TiMidity++-2.11.2/doc/ja_JP.ujis/timidity.1 --- TiMidity++-2.11.1/doc/ja_JP.ujis/timidity.1 Sat Jul 15 00:50:08 2000 +++ TiMidity++-2.11.2/doc/ja_JP.ujis/timidity.1 Wed Jan 9 17:11:46 2002 @@ -657,7 +657,7 @@ .P You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA .SH AVAILABILITY diff -ruN TiMidity++-2.11.1/doc/ja_JP.ujis/timidity.cfg.5 TiMidity++-2.11.2/doc/ja_JP.ujis/timidity.cfg.5 --- TiMidity++-2.11.1/doc/ja_JP.ujis/timidity.cfg.5 Fri Mar 3 13:21:58 2000 +++ TiMidity++-2.11.2/doc/ja_JP.ujis/timidity.cfg.5 Wed Jan 9 17:11:34 2002 @@ -225,7 +225,7 @@ .P You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA .SH AVAILABILITY The latest release is available on the TiMidity++ Page, diff -ruN TiMidity++-2.11.1/interface/Makefile.am TiMidity++-2.11.2/interface/Makefile.am --- TiMidity++-2.11.1/interface/Makefile.am Thu Dec 27 19:45:29 2001 +++ TiMidity++-2.11.2/interface/Makefile.am Wed Jan 9 17:07:39 2002 @@ -1,5 +1,5 @@ # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999-2001 Masanao Izumo +# Copyright (C) 1999-2002 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA include $(top_builddir)/common.makefile diff -ruN TiMidity++-2.11.1/interface/Makefile.in TiMidity++-2.11.2/interface/Makefile.in --- TiMidity++-2.11.1/interface/Makefile.in Sat Dec 29 07:28:00 2001 +++ TiMidity++-2.11.2/interface/Makefile.in Wed Jan 9 17:09:41 2002 @@ -14,7 +14,7 @@ @SET_MAKE@ # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999-2001 Masanao Izumo +# Copyright (C) 1999-2002 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify @@ -29,7 +29,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA SHELL = @SHELL@ diff -ruN TiMidity++-2.11.1/interface/alsaseq_c.c TiMidity++-2.11.2/interface/alsaseq_c.c --- TiMidity++-2.11.1/interface/alsaseq_c.c Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/alsaseq_c.c Wed Jan 9 19:09:31 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA alsaseq_c.c - ALSA sequencer server interface @@ -32,12 +32,12 @@ by ALSA seqeuncer core. For invoking ALSA sequencer interface, run timidity as folows: - % timidity -iA -B2,8 + % timidity -iA -B2,8 -q0/0 -k0 The fragment size can be adjustable. The smaller number gives better real-time response. Then timidity shows new port numbers which were newly created (128:0 and 128:1 below). --------------------------------------- - % timidity -iA -B2,8 + % timidity -iA -B2,8 -q0/0 -k0 TiMidity starting in ALSA server mode Opening sequencer port 128:0 128:1 --------------------------------------- @@ -46,9 +46,13 @@ % pmidi -p128:0 foo.mid If a midi file needs two ports, you may connect like this: % pmidi -p128:0,128:1 bar.mid + Vertual keyboard: + % vkeybd --addr 128:0 Connecting from external MIDI keyboard may become like this: % aconnect 64:0 128:0 - + + See also http://www.alsa-project.org/~iwai/alsa.html + The interface tries to reset process scheduling as SCHED_FIFO and as high priority as possible. For enabling this feature, timidity must be invoked by root or installed with set-uid root. diff -ruN TiMidity++-2.11.1/interface/bitmaps/Makefile.am TiMidity++-2.11.2/interface/bitmaps/Makefile.am --- TiMidity++-2.11.1/interface/bitmaps/Makefile.am Tue Mar 13 10:07:39 2001 +++ TiMidity++-2.11.2/interface/bitmaps/Makefile.am Wed Jan 9 17:07:24 2002 @@ -1,5 +1,5 @@ # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999-2001 Masanao Izumo +# Copyright (C) 1999-2002 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA include $(top_builddir)/common.makefile diff -ruN TiMidity++-2.11.1/interface/bitmaps/Makefile.in TiMidity++-2.11.2/interface/bitmaps/Makefile.in --- TiMidity++-2.11.1/interface/bitmaps/Makefile.in Sat Dec 29 07:28:02 2001 +++ TiMidity++-2.11.2/interface/bitmaps/Makefile.in Wed Jan 9 17:09:42 2002 @@ -14,7 +14,7 @@ @SET_MAKE@ # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999-2001 Masanao Izumo +# Copyright (C) 1999-2002 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify @@ -29,7 +29,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA SHELL = @SHELL@ diff -ruN TiMidity++-2.11.1/interface/browser.tcl TiMidity++-2.11.2/interface/browser.tcl --- TiMidity++-2.11.1/interface/browser.tcl Tue Mar 13 10:01:18 2001 +++ TiMidity++-2.11.2/interface/browser.tcl Wed Jan 9 19:09:23 2002 @@ -1,5 +1,5 @@ # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999-2001 Masanao Izumo +# Copyright (C) 1999-2002 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #---------------------------------------------------------------- # file selection dialog diff -ruN TiMidity++-2.11.1/interface/dumb_c.c TiMidity++-2.11.2/interface/dumb_c.c --- TiMidity++-2.11.1/interface/dumb_c.c Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/dumb_c.c Wed Jan 9 19:09:16 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dumb_c.c Minimal control mode -- no interaction, just prints out messages. diff -ruN TiMidity++-2.11.1/interface/dynamic_c.c TiMidity++-2.11.2/interface/dynamic_c.c --- TiMidity++-2.11.1/interface/dynamic_c.c Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/dynamic_c.c Wed Jan 9 19:09:14 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef HAVE_CONFIG_H diff -ruN TiMidity++-2.11.1/interface/emacs_c.c TiMidity++-2.11.2/interface/emacs_c.c --- TiMidity++-2.11.1/interface/emacs_c.c Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/emacs_c.c Wed Jan 9 19:09:11 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA emacs_c.c Emacs control mode - written by Masanao Izumo diff -ruN TiMidity++-2.11.1/interface/gtk_c.c TiMidity++-2.11.2/interface/gtk_c.c --- TiMidity++-2.11.1/interface/gtk_c.c Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/gtk_c.c Wed Jan 9 19:09:08 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA motif_ctl.c: written by Vincent Pagel (pagel@loria.fr) 10/4/95 diff -ruN TiMidity++-2.11.1/interface/gtk_h.h TiMidity++-2.11.2/interface/gtk_h.h --- TiMidity++-2.11.1/interface/gtk_h.h Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/gtk_h.h Wed Jan 9 19:09:05 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA motif.h: written by Vincent Pagel (pagel@loria.fr) 10/4/95 diff -ruN TiMidity++-2.11.1/interface/gtk_i.c TiMidity++-2.11.2/interface/gtk_i.c --- TiMidity++-2.11.1/interface/gtk_i.c Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/gtk_i.c Wed Jan 9 19:09:02 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA gtk_i.c - Glenn Trigg 29 Oct 1998 diff -ruN TiMidity++-2.11.1/interface/gtk_p.c TiMidity++-2.11.2/interface/gtk_p.c --- TiMidity++-2.11.1/interface/gtk_p.c Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/gtk_p.c Wed Jan 9 19:09:00 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA motif_pipe.c: written by Vincent Pagel (pagel@loria.fr) 10/4/95 diff -ruN TiMidity++-2.11.1/interface/mac_c.c TiMidity++-2.11.2/interface/mac_c.c --- TiMidity++-2.11.1/interface/mac_c.c Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/mac_c.c Wed Jan 9 19:08:50 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Macintosh interface for TiMidity by T.Nogami diff -ruN TiMidity++-2.11.1/interface/mac_c.h TiMidity++-2.11.2/interface/mac_c.h --- TiMidity++-2.11.1/interface/mac_c.h Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/mac_c.h Wed Jan 9 19:08:47 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Macintosh interface for TiMidity by T.Nogami diff -ruN TiMidity++-2.11.1/interface/mac_mag.c TiMidity++-2.11.2/interface/mac_mag.c --- TiMidity++-2.11.1/interface/mac_mag.c Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/mac_mag.c Wed Jan 9 19:08:44 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Macintosh interface for TiMidity by T.Nogami diff -ruN TiMidity++-2.11.1/interface/mac_mag.h TiMidity++-2.11.2/interface/mac_mag.h --- TiMidity++-2.11.1/interface/mac_mag.h Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/mac_mag.h Wed Jan 9 19:08:41 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Macintosh interface for TiMidity by T.Nogami diff -ruN TiMidity++-2.11.1/interface/mac_trace.c TiMidity++-2.11.2/interface/mac_trace.c --- TiMidity++-2.11.1/interface/mac_trace.c Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/mac_trace.c Wed Jan 9 19:08:38 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Macintosh interface for TiMidity by T.Nogami diff -ruN TiMidity++-2.11.1/interface/mac_wrdwindow.c TiMidity++-2.11.2/interface/mac_wrdwindow.c --- TiMidity++-2.11.1/interface/mac_wrdwindow.c Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/mac_wrdwindow.c Wed Jan 9 19:08:36 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Macintosh interface for TiMidity by T.Nogami diff -ruN TiMidity++-2.11.1/interface/mac_wrdwindow.h TiMidity++-2.11.2/interface/mac_wrdwindow.h --- TiMidity++-2.11.1/interface/mac_wrdwindow.h Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/mac_wrdwindow.h Wed Jan 9 19:08:33 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Macintosh interface for TiMidity by T.Nogami diff -ruN TiMidity++-2.11.1/interface/misc.tcl TiMidity++-2.11.2/interface/misc.tcl --- TiMidity++-2.11.1/interface/misc.tcl Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/interface/misc.tcl Wed Jan 9 19:08:27 2002 @@ -1,5 +1,5 @@ # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999-2001 Masanao Izumo +# Copyright (C) 1999-2002 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #---------------------------------------------------------------- # Miscellaneous procedures diff -ruN TiMidity++-2.11.1/interface/motif.h TiMidity++-2.11.2/interface/motif.h --- TiMidity++-2.11.1/interface/motif.h Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/motif.h Wed Jan 9 19:08:21 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA motif.h: written by Vincent Pagel (pagel@loria.fr) 10/4/95 diff -ruN TiMidity++-2.11.1/interface/motif_bitmaps/Makefile.am TiMidity++-2.11.2/interface/motif_bitmaps/Makefile.am --- TiMidity++-2.11.1/interface/motif_bitmaps/Makefile.am Tue Mar 13 10:07:39 2001 +++ TiMidity++-2.11.2/interface/motif_bitmaps/Makefile.am Wed Jan 9 17:07:29 2002 @@ -1,5 +1,5 @@ # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999-2001 Masanao Izumo +# Copyright (C) 1999-2002 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA BITMAPS = \ back.xbm \ diff -ruN TiMidity++-2.11.1/interface/motif_bitmaps/Makefile.in TiMidity++-2.11.2/interface/motif_bitmaps/Makefile.in --- TiMidity++-2.11.1/interface/motif_bitmaps/Makefile.in Sat Dec 29 07:28:01 2001 +++ TiMidity++-2.11.2/interface/motif_bitmaps/Makefile.in Wed Jan 9 17:09:42 2002 @@ -14,7 +14,7 @@ @SET_MAKE@ # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999-2001 Masanao Izumo +# Copyright (C) 1999-2002 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify @@ -29,7 +29,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA SHELL = @SHELL@ diff -ruN TiMidity++-2.11.1/interface/motif_c.c TiMidity++-2.11.2/interface/motif_c.c --- TiMidity++-2.11.1/interface/motif_c.c Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/motif_c.c Wed Jan 9 19:08:17 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA motif_ctl.c: written by Vincent Pagel (pagel@loria.fr) 10/4/95 diff -ruN TiMidity++-2.11.1/interface/motif_i.c TiMidity++-2.11.2/interface/motif_i.c --- TiMidity++-2.11.1/interface/motif_i.c Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/motif_i.c Wed Jan 9 19:08:14 2002 @@ -1,47 +1,47 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo - Copyright (C) 1995 Tuukka Toivonen - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - motif_interface.c: written by Vincent Pagel (pagel@loria.fr) 10/4/95 - - Policy : I choose to make a separate process for a TIMIDITY motif - interface for TIMIDITY (if the interface was in the same process - X redrawings would interfere with the audio computation. Besides - XtAppAddWorkProc mechanism is not easily controlable) - - The solution : I create a pipe between Timidity and the forked interface - and use XtAppAddInput to watch the data arriving on the pipe. - - 10/4/95 - - Initial working version with prev, next, and quit button and a - text display - - 17/5/95 - - Add timidity icon with filename displaying to play midi while - I work without having that big blue window in the corner of - my screen :) - - Solve the problem of concurent scale value modification + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999-2002 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + motif_interface.c: written by Vincent Pagel (pagel@loria.fr) 10/4/95 + + Policy : I choose to make a separate process for a TIMIDITY motif + interface for TIMIDITY (if the interface was in the same process + X redrawings would interfere with the audio computation. Besides + XtAppAddWorkProc mechanism is not easily controlable) + + The solution : I create a pipe between Timidity and the forked interface + and use XtAppAddInput to watch the data arriving on the pipe. + + 10/4/95 + - Initial working version with prev, next, and quit button and a + text display + + 17/5/95 + - Add timidity icon with filename displaying to play midi while + I work without having that big blue window in the corner of + my screen :) + - Solve the problem of concurent scale value modification - 21/5/95 - - Add menus, file selection box + 21/5/95 + - Add menus, file selection box - 14/6/95 - - Make the visible part of file list follow the selection + 14/6/95 + - Make the visible part of file list follow the selection */ diff -ruN TiMidity++-2.11.1/interface/motif_p.c TiMidity++-2.11.2/interface/motif_p.c --- TiMidity++-2.11.1/interface/motif_p.c Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/motif_p.c Wed Jan 9 19:07:40 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA motif_pipe.c: written by Vincent Pagel (pagel@loria.fr) 10/4/95 diff -ruN TiMidity++-2.11.1/interface/ncurs_c.c TiMidity++-2.11.2/interface/ncurs_c.c --- TiMidity++-2.11.1/interface/ncurs_c.c Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/ncurs_c.c Wed Jan 9 19:07:37 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA nncurs_c.c: written by Masanao Izumo and Aoki Daisuke . @@ -433,7 +433,7 @@ wmove(dftwin, VERSION_LINE,0); waddstr(dftwin, "TiMidity++ v"); waddstr(dftwin, timidity_version); wmove(dftwin, VERSION_LINE,COLS-54); - waddstr(dftwin, "(C) 1995,1999-2001 Tuukka Toivonen, Masanao Izumo"); + waddstr(dftwin, "(C) 1995,1999-2002 Tuukka Toivonen, Masanao Izumo"); wmove(dftwin, FILE_LINE,0); waddstr(dftwin, "File:"); #ifdef MIDI_TITLE diff -ruN TiMidity++-2.11.1/interface/pixmaps/Makefile.am TiMidity++-2.11.2/interface/pixmaps/Makefile.am --- TiMidity++-2.11.1/interface/pixmaps/Makefile.am Tue Mar 13 10:07:39 2001 +++ TiMidity++-2.11.2/interface/pixmaps/Makefile.am Wed Jan 9 17:07:20 2002 @@ -1,5 +1,5 @@ # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999-2001 Masanao Izumo +# Copyright (C) 1999-2002 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA PIXMAPS = \ ff.xpm \ diff -ruN TiMidity++-2.11.1/interface/pixmaps/Makefile.in TiMidity++-2.11.2/interface/pixmaps/Makefile.in --- TiMidity++-2.11.1/interface/pixmaps/Makefile.in Sat Dec 29 07:28:03 2001 +++ TiMidity++-2.11.2/interface/pixmaps/Makefile.in Wed Jan 9 17:09:41 2002 @@ -14,7 +14,7 @@ @SET_MAKE@ # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999-2001 Masanao Izumo +# Copyright (C) 1999-2002 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify @@ -29,7 +29,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA SHELL = @SHELL@ diff -ruN TiMidity++-2.11.1/interface/server_c.c TiMidity++-2.11.2/interface/server_c.c --- TiMidity++-2.11.1/interface/server_c.c Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/server_c.c Wed Jan 9 19:07:31 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA server_c.c - TiMidity server written by Masanao Izumo Mon Apr 5 1999: Initial created. diff -ruN TiMidity++-2.11.1/interface/server_defs.h TiMidity++-2.11.2/interface/server_defs.h --- TiMidity++-2.11.1/interface/server_defs.h Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/server_defs.h Wed Jan 9 19:07:28 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA remote_def.c - written by Masanao Izumo Define some macros diff -ruN TiMidity++-2.11.1/interface/slang_c.c TiMidity++-2.11.2/interface/slang_c.c --- TiMidity++-2.11.1/interface/slang_c.c Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/slang_c.c Wed Jan 9 19:07:24 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA slang_c.c, Riccardo Facchetti (riccardo@cdc8g5.cdc.polimi.it) diff -ruN TiMidity++-2.11.1/interface/soundspec.c TiMidity++-2.11.2/interface/soundspec.c --- TiMidity++-2.11.1/interface/soundspec.c Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/soundspec.c Wed Jan 9 19:07:20 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef HAVE_CONFIG_H diff -ruN TiMidity++-2.11.1/interface/soundspec.h TiMidity++-2.11.2/interface/soundspec.h --- TiMidity++-2.11.1/interface/soundspec.h Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/soundspec.h Wed Jan 9 19:07:17 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef ___SOUNDSPEC_H_ diff -ruN TiMidity++-2.11.1/interface/timidity.el TiMidity++-2.11.2/interface/timidity.el --- TiMidity++-2.11.1/interface/timidity.el Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/interface/timidity.el Wed Jan 9 19:07:10 2002 @@ -1,7 +1,7 @@ ;; TiMidity interface for Emacs ;; ;; TiMidity++ -- MIDI to WAVE converter and player -;; Copyright (C) 1999-2001 Masanao Izumo +;; Copyright (C) 1999-2002 Masanao Izumo ;; Copyright (C) 1995 Tuukka Toivonen ;; ;; This program is free software; you can redistribute it and/or modify @@ -16,7 +16,7 @@ ;; ;; You should have received a copy of the GNU General Public License ;; along with this program; if not, write to the Free Software -;; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ;; ;; ;; Author: Masanao Izumo diff -ruN TiMidity++-2.11.1/interface/tk_c.c TiMidity++-2.11.2/interface/tk_c.c --- TiMidity++-2.11.1/interface/tk_c.c Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/tk_c.c Wed Jan 9 19:07:02 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff -ruN TiMidity++-2.11.1/interface/tkmidity.ptcl TiMidity++-2.11.2/interface/tkmidity.ptcl --- TiMidity++-2.11.1/interface/tkmidity.ptcl Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/interface/tkmidity.ptcl Wed Jan 9 19:06:57 2002 @@ -1,7 +1,7 @@ #!/usr/local/bin/wishx -f # # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999-2001 Masanao Izumo +# Copyright (C) 1999-2002 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify @@ -16,7 +16,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # # TkMidity -- Tcl/Tk Interface for TiMidity diff -ruN TiMidity++-2.11.1/interface/tkpanel.tcl TiMidity++-2.11.2/interface/tkpanel.tcl --- TiMidity++-2.11.1/interface/tkpanel.tcl Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/interface/tkpanel.tcl Wed Jan 9 19:06:51 2002 @@ -1,7 +1,7 @@ #!/usr/local/bin/wishx -f # # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999-2001 Masanao Izumo +# Copyright (C) 1999-2002 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify @@ -16,7 +16,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # TkMidity -- Tcl/Tk Interface for TiMidity # written by Takashi IWAI diff -ruN TiMidity++-2.11.1/interface/vt100.c TiMidity++-2.11.2/interface/vt100.c --- TiMidity++-2.11.1/interface/vt100.c Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/vt100.c Wed Jan 9 19:06:43 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef HAVE_CONFIG_H diff -ruN TiMidity++-2.11.1/interface/vt100.h TiMidity++-2.11.2/interface/vt100.h --- TiMidity++-2.11.1/interface/vt100.h Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/vt100.h Wed Jan 9 19:06:40 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef ___VT100_H_ diff -ruN TiMidity++-2.11.1/interface/vt100_c.c TiMidity++-2.11.2/interface/vt100_c.c --- TiMidity++-2.11.1/interface/vt100_c.c Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/vt100_c.c Wed Jan 9 19:06:37 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA vt_100_c.c - written by Masanao Izumo */ diff -ruN TiMidity++-2.11.1/interface/w32g.h TiMidity++-2.11.2/interface/w32g.h --- TiMidity++-2.11.1/interface/w32g.h Sat Dec 29 08:07:07 2001 +++ TiMidity++-2.11.2/interface/w32g.h Wed Jan 9 19:06:34 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef ___W32G_H_ diff -ruN TiMidity++-2.11.1/interface/w32g_c.c TiMidity++-2.11.2/interface/w32g_c.c --- TiMidity++-2.11.1/interface/w32g_c.c Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/w32g_c.c Wed Jan 9 19:06:29 2002 @@ -1,6 +1,6 @@ /* TiMidity -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA w32g_c.c: written by Daisuke Aoki Masanao Izumo diff -ruN TiMidity++-2.11.1/interface/w32g_i.c TiMidity++-2.11.2/interface/w32g_i.c --- TiMidity++-2.11.1/interface/w32g_i.c Sat Dec 29 07:48:57 2001 +++ TiMidity++-2.11.2/interface/w32g_i.c Sat Jan 12 16:38:07 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA w32g_main.c: Written by Daisuke Aoki Modified by Masanao Izumo @@ -2962,8 +2962,8 @@ { char TiMidityText[2024]; sprintf(TiMidityText, -" TiMidity++ version %s -- Experimental MIDI to WAVE converter" NLS -" Copyright (C) 1999 Masanao Izumo " NLS +" TiMidity++ version %s -- MIDI to WAVE converter and player" NLS +" Copyright (C) 1999-2002 Masanao Izumo " NLS " Copyright (C) 1995 Tuukka Toivonen " NLS NLS " Win32 version by Davide Moretti " NLS @@ -2982,7 +2982,7 @@ NLS " You should have received a copy of the GNU General Public License" NLS " along with this program; if not, write to the Free Software" NLS -" Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." NLS +" Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA" NLS , timidity_version ); diff -ruN TiMidity++-2.11.1/interface/w32g_ini.c TiMidity++-2.11.2/interface/w32g_ini.c --- TiMidity++-2.11.1/interface/w32g_ini.c Sat Dec 29 08:07:45 2001 +++ TiMidity++-2.11.2/interface/w32g_ini.c Wed Jan 9 19:06:16 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA w32g_ini.c: written by Daisuke Aoki Masanao Izumo diff -ruN TiMidity++-2.11.1/interface/w32g_playlist.c TiMidity++-2.11.2/interface/w32g_playlist.c --- TiMidity++-2.11.1/interface/w32g_playlist.c Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/w32g_playlist.c Wed Jan 9 19:06:13 2002 @@ -1,6 +1,6 @@ /* TiMidity -- Experimental MIDI to WAVE converter - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef HAVE_CONFIG_H diff -ruN TiMidity++-2.11.1/interface/w32g_pref.c TiMidity++-2.11.2/interface/w32g_pref.c --- TiMidity++-2.11.1/interface/w32g_pref.c Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/w32g_pref.c Sat Jan 12 16:37:01 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA w32g2_pref.c: Written by Daisuke Aoki */ @@ -977,7 +977,7 @@ "next output file",(char *)0, "auto filename",(char *)1, "auto filename and output in next dir",(char *)2, - "auto filename and output in next dir",(char *)3, + "auto filename and output in next dir (with folder name)",(char *)3, NULL }; static char **cb_info_IDC_COMBO_OUTPUT_MODE; diff -ruN TiMidity++-2.11.1/interface/w32g_pref.h TiMidity++-2.11.2/interface/w32g_pref.h --- TiMidity++-2.11.1/interface/w32g_pref.h Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/w32g_pref.h Wed Jan 9 19:06:04 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef __W32G2_PREF_H__ diff -ruN TiMidity++-2.11.1/interface/w32g_rec.h TiMidity++-2.11.2/interface/w32g_rec.h --- TiMidity++-2.11.1/interface/w32g_rec.h Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/w32g_rec.h Wed Jan 9 19:05:58 2002 @@ -1,3 +1,21 @@ +// TiMidity++ -- MIDI to WAVE converter and player +// Copyright (C) 1999-2002 Masanao Izumo +// Copyright (C) 1995 Tuukka Toivonen +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + //{{NO_DEPENDENCIES}} // Microsoft Developer Studio generated include file. // Used by w32g_res.rc diff -ruN TiMidity++-2.11.1/interface/w32g_res.h TiMidity++-2.11.2/interface/w32g_res.h --- TiMidity++-2.11.1/interface/w32g_res.h Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/w32g_res.h Wed Jan 9 19:05:51 2002 @@ -1,3 +1,21 @@ +// TiMidity++ -- MIDI to WAVE converter and player +// Copyright (C) 1999-2002 Masanao Izumo +// Copyright (C) 1995 Tuukka Toivonen +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + //{{NO_DEPENDENCIES}} // Microsoft Developer Studio generated include file. // Used by w32g_res.rc diff -ruN TiMidity++-2.11.1/interface/w32g_res.rc TiMidity++-2.11.2/interface/w32g_res.rc --- TiMidity++-2.11.1/interface/w32g_res.rc Sat Dec 29 07:26:09 2001 +++ TiMidity++-2.11.2/interface/w32g_res.rc Wed Jan 9 19:05:45 2002 @@ -1,3 +1,22 @@ +// TiMidity++ -- MIDI to WAVE converter and player +// Copyright (C) 1999-2002 Masanao Izumo +// Copyright (C) 1995 Tuukka Toivonen +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + //Microsoft Developer Studio generated resource script. // #include "w32g_res.h" @@ -1307,7 +1326,7 @@ VALUE "FileDescription", "timw32g\0" VALUE "FileVersion", "2, 11, 0, 0\0" VALUE "InternalName", "timw32g\0" - VALUE "LegalCopyright", "Copyright (C) 1999,2001 Masanao Izumo \r\nCopyright (C) 1995 Tuukka Toivonen \0" + VALUE "LegalCopyright", "Copyright (C) 1999-2002 Masanao Izumo \r\nCopyright (C) 1995 Tuukka Toivonen \0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "timw32g.exe\0" VALUE "PrivateBuild", "\0" diff -ruN TiMidity++-2.11.1/interface/w32g_subwin.c TiMidity++-2.11.2/interface/w32g_subwin.c --- TiMidity++-2.11.1/interface/w32g_subwin.c Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/w32g_subwin.c Wed Jan 9 19:05:25 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA w32g2_subwin.c: Written by Daisuke Aoki */ diff -ruN TiMidity++-2.11.1/interface/w32g_subwin.h TiMidity++-2.11.2/interface/w32g_subwin.h --- TiMidity++-2.11.1/interface/w32g_subwin.h Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/w32g_subwin.h Wed Jan 9 19:05:23 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef ___W32G_SUBWIN_H_ diff -ruN TiMidity++-2.11.1/interface/w32g_ut2.c TiMidity++-2.11.2/interface/w32g_ut2.c --- TiMidity++-2.11.1/interface/w32g_ut2.c Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/w32g_ut2.c Wed Jan 9 19:05:20 2002 @@ -1,3 +1,23 @@ +/* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999-2002 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + #ifdef HAVE_CONFIG_H #include "config.h" #endif /* HAVE_CONFIG_H */ diff -ruN TiMidity++-2.11.1/interface/w32g_ut2.h TiMidity++-2.11.2/interface/w32g_ut2.h --- TiMidity++-2.11.1/interface/w32g_ut2.h Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/w32g_ut2.h Wed Jan 9 19:05:10 2002 @@ -1,3 +1,22 @@ +/* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999-2002 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ #ifndef __W32G_UT2_H__ #define __W32G_UT2_H__ diff -ruN TiMidity++-2.11.1/interface/w32g_utl.c TiMidity++-2.11.2/interface/w32g_utl.c --- TiMidity++-2.11.1/interface/w32g_utl.c Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/w32g_utl.c Wed Jan 9 19:05:08 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA w32g_utl.c: written by Daisuke Aoki Masanao Izumo diff -ruN TiMidity++-2.11.1/interface/w32g_utl.h TiMidity++-2.11.2/interface/w32g_utl.h --- TiMidity++-2.11.1/interface/w32g_utl.h Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/w32g_utl.h Wed Jan 9 19:05:05 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef ___W32G_UTL_H_ diff -ruN TiMidity++-2.11.1/interface/wrdt_dumb.c TiMidity++-2.11.2/interface/wrdt_dumb.c --- TiMidity++-2.11.1/interface/wrdt_dumb.c Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/wrdt_dumb.c Wed Jan 9 19:05:02 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff -ruN TiMidity++-2.11.1/interface/wrdt_mac.c TiMidity++-2.11.2/interface/wrdt_mac.c --- TiMidity++-2.11.1/interface/wrdt_mac.c Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/wrdt_mac.c Wed Jan 9 19:05:00 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA wrdt_mac.c diff -ruN TiMidity++-2.11.1/interface/wrdt_tty.c TiMidity++-2.11.2/interface/wrdt_tty.c --- TiMidity++-2.11.1/interface/wrdt_tty.c Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/wrdt_tty.c Wed Jan 9 19:04:56 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff -ruN TiMidity++-2.11.1/interface/wrdt_wcon.c TiMidity++-2.11.2/interface/wrdt_wcon.c --- TiMidity++-2.11.1/interface/wrdt_wcon.c Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/wrdt_wcon.c Wed Jan 9 19:04:53 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff -ruN TiMidity++-2.11.1/interface/wrdt_x.c TiMidity++-2.11.2/interface/wrdt_x.c --- TiMidity++-2.11.1/interface/wrdt_x.c Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/wrdt_x.c Wed Jan 9 19:04:50 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA wrdt_x.c - WRD Tracer for X Window diff -ruN TiMidity++-2.11.1/interface/x_mag.c TiMidity++-2.11.2/interface/x_mag.c --- TiMidity++-2.11.1/interface/x_mag.c Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/x_mag.c Wed Jan 9 19:04:48 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Macintosh interface for TiMidity by T.Nogami diff -ruN TiMidity++-2.11.1/interface/x_mag.h TiMidity++-2.11.2/interface/x_mag.h --- TiMidity++-2.11.1/interface/x_mag.h Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/x_mag.h Wed Jan 9 19:04:44 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff -ruN TiMidity++-2.11.1/interface/x_sherry.c TiMidity++-2.11.2/interface/x_sherry.c --- TiMidity++-2.11.1/interface/x_sherry.c Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/x_sherry.c Wed Jan 9 19:04:42 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA x_sherry.c - Sherry WRD for X Window written by Masanao Izumo */ diff -ruN TiMidity++-2.11.1/interface/x_sherry.h TiMidity++-2.11.2/interface/x_sherry.h --- TiMidity++-2.11.1/interface/x_sherry.h Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/x_sherry.h Wed Jan 9 19:04:39 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef ___X_SRY_H_ diff -ruN TiMidity++-2.11.1/interface/x_wrdwindow.c TiMidity++-2.11.2/interface/x_wrdwindow.c --- TiMidity++-2.11.1/interface/x_wrdwindow.c Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/x_wrdwindow.c Wed Jan 9 19:04:37 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA x_wrdwindow.c - MIMPI WRD for X Window written by Takanori Watanabe. - Modified by Masanao Izumo. diff -ruN TiMidity++-2.11.1/interface/x_wrdwindow.h TiMidity++-2.11.2/interface/x_wrdwindow.h --- TiMidity++-2.11.1/interface/x_wrdwindow.h Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/x_wrdwindow.h Wed Jan 9 19:04:34 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff -ruN TiMidity++-2.11.1/interface/xaw.h TiMidity++-2.11.2/interface/xaw.h --- TiMidity++-2.11.1/interface/xaw.h Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/xaw.h Wed Jan 9 19:04:31 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA xaw.h: written by Yoshishige Arai (ryo2@on.rim.or.jp) 12/8/98 diff -ruN TiMidity++-2.11.1/interface/xaw_c.c TiMidity++-2.11.2/interface/xaw_c.c --- TiMidity++-2.11.1/interface/xaw_c.c Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/xaw_c.c Wed Jan 9 19:04:25 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA xaw_c.c - XAW Interface from Tomokazu Harada diff -ruN TiMidity++-2.11.1/interface/xaw_i.c TiMidity++-2.11.2/interface/xaw_i.c --- TiMidity++-2.11.1/interface/xaw_i.c Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/xaw_i.c Wed Jan 9 19:04:22 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA xaw_i.c - XAW Interface from Tomokazu Harada diff -ruN TiMidity++-2.11.1/interface/xskin.h TiMidity++-2.11.2/interface/xskin.h --- TiMidity++-2.11.1/interface/xskin.h Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/xskin.h Wed Jan 9 19:03:56 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA xskin.h diff -ruN TiMidity++-2.11.1/interface/xskin_c.c TiMidity++-2.11.2/interface/xskin_c.c --- TiMidity++-2.11.1/interface/xskin_c.c Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/xskin_c.c Wed Jan 9 19:03:52 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA xskin interface by Daisuke nagano */ diff -ruN TiMidity++-2.11.1/interface/xskin_i.c TiMidity++-2.11.2/interface/xskin_i.c --- TiMidity++-2.11.1/interface/xskin_i.c Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/xskin_i.c Wed Jan 9 19:03:48 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA xskin_i.c diff -ruN TiMidity++-2.11.1/interface/xskin_loadBMP.c TiMidity++-2.11.2/interface/xskin_loadBMP.c --- TiMidity++-2.11.1/interface/xskin_loadBMP.c Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/xskin_loadBMP.c Wed Jan 9 19:03:44 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA tskin_loadBMP.c diff -ruN TiMidity++-2.11.1/interface/xskin_spectrum.c TiMidity++-2.11.2/interface/xskin_spectrum.c --- TiMidity++-2.11.1/interface/xskin_spectrum.c Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/interface/xskin_spectrum.c Wed Jan 9 19:03:38 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA xskin_spectrum.c diff -ruN TiMidity++-2.11.1/libarc/Makefile.am TiMidity++-2.11.2/libarc/Makefile.am --- TiMidity++-2.11.1/libarc/Makefile.am Fri Dec 21 16:50:26 2001 +++ TiMidity++-2.11.2/libarc/Makefile.am Wed Jan 9 17:07:51 2002 @@ -1,5 +1,5 @@ # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999-2001 Masanao Izumo +# Copyright (C) 1999-2002 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA include $(top_builddir)/common.makefile diff -ruN TiMidity++-2.11.1/libarc/Makefile.in TiMidity++-2.11.2/libarc/Makefile.in --- TiMidity++-2.11.1/libarc/Makefile.in Sat Dec 29 07:27:59 2001 +++ TiMidity++-2.11.2/libarc/Makefile.in Wed Jan 9 17:09:43 2002 @@ -14,7 +14,7 @@ @SET_MAKE@ # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999-2001 Masanao Izumo +# Copyright (C) 1999-2002 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify @@ -29,7 +29,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA SHELL = @SHELL@ diff -ruN TiMidity++-2.11.1/libarc/arc.c TiMidity++-2.11.2/libarc/arc.c --- TiMidity++-2.11.1/libarc/arc.c Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/libarc/arc.c Wed Jan 9 17:20:39 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef HAVE_CONFIG_H diff -ruN TiMidity++-2.11.1/libarc/arc.h TiMidity++-2.11.2/libarc/arc.h --- TiMidity++-2.11.1/libarc/arc.h Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/libarc/arc.h Wed Jan 9 17:20:34 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef ___LIBARC_H_ diff -ruN TiMidity++-2.11.1/libarc/arc_lzh.c TiMidity++-2.11.2/libarc/arc_lzh.c --- TiMidity++-2.11.1/libarc/arc_lzh.c Sun Jun 17 15:31:10 2001 +++ TiMidity++-2.11.2/libarc/arc_lzh.c Wed Jan 9 17:20:30 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef HAVE_CONFIG_H diff -ruN TiMidity++-2.11.1/libarc/arc_mime.c TiMidity++-2.11.2/libarc/arc_mime.c --- TiMidity++-2.11.1/libarc/arc_mime.c Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/libarc/arc_mime.c Wed Jan 9 17:20:26 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef HAVE_CONFIG_H diff -ruN TiMidity++-2.11.1/libarc/arc_tar.c TiMidity++-2.11.2/libarc/arc_tar.c --- TiMidity++-2.11.1/libarc/arc_tar.c Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/libarc/arc_tar.c Wed Jan 9 17:20:20 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef HAVE_CONFIG_H diff -ruN TiMidity++-2.11.1/libarc/arc_zip.c TiMidity++-2.11.2/libarc/arc_zip.c --- TiMidity++-2.11.1/libarc/arc_zip.c Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/libarc/arc_zip.c Wed Jan 9 17:20:14 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef HAVE_CONFIG_H diff -ruN TiMidity++-2.11.1/libarc/deflate.c TiMidity++-2.11.2/libarc/deflate.c --- TiMidity++-2.11.1/libarc/deflate.c Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/libarc/deflate.c Wed Jan 9 17:20:10 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef HAVE_CONFIG_H diff -ruN TiMidity++-2.11.1/libarc/explode.c TiMidity++-2.11.2/libarc/explode.c --- TiMidity++-2.11.1/libarc/explode.c Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/libarc/explode.c Wed Jan 9 17:20:06 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef HAVE_CONFIG_H diff -ruN TiMidity++-2.11.1/libarc/explode.h TiMidity++-2.11.2/libarc/explode.h --- TiMidity++-2.11.1/libarc/explode.h Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/libarc/explode.h Wed Jan 9 17:20:02 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef ___EXPLODE_H_ diff -ruN TiMidity++-2.11.1/libarc/inflate.c TiMidity++-2.11.2/libarc/inflate.c --- TiMidity++-2.11.1/libarc/inflate.c Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/libarc/inflate.c Wed Jan 9 17:19:58 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef HAVE_CONFIG_H diff -ruN TiMidity++-2.11.1/libarc/unlzh.c TiMidity++-2.11.2/libarc/unlzh.c --- TiMidity++-2.11.1/libarc/unlzh.c Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/libarc/unlzh.c Wed Jan 9 17:19:53 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef HAVE_CONFIG_H diff -ruN TiMidity++-2.11.1/libarc/unlzh.h TiMidity++-2.11.2/libarc/unlzh.h --- TiMidity++-2.11.1/libarc/unlzh.h Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/libarc/unlzh.h Wed Jan 9 17:19:48 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef ___LZH_H_ diff -ruN TiMidity++-2.11.1/libarc/url.c TiMidity++-2.11.2/libarc/url.c --- TiMidity++-2.11.1/libarc/url.c Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/libarc/url.c Wed Jan 9 17:19:43 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef HAVE_CONFIG_H diff -ruN TiMidity++-2.11.1/libarc/url.h TiMidity++-2.11.2/libarc/url.h --- TiMidity++-2.11.1/libarc/url.h Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/libarc/url.h Wed Jan 9 17:19:38 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef ___URL_H_ diff -ruN TiMidity++-2.11.1/libarc/url_b64decode.c TiMidity++-2.11.2/libarc/url_b64decode.c --- TiMidity++-2.11.1/libarc/url_b64decode.c Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/libarc/url_b64decode.c Wed Jan 9 17:19:33 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef HAVE_CONFIG_H diff -ruN TiMidity++-2.11.1/libarc/url_buff.c TiMidity++-2.11.2/libarc/url_buff.c --- TiMidity++-2.11.1/libarc/url_buff.c Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/libarc/url_buff.c Wed Jan 9 17:19:28 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef HAVE_CONFIG_H diff -ruN TiMidity++-2.11.1/libarc/url_cache.c TiMidity++-2.11.2/libarc/url_cache.c --- TiMidity++-2.11.1/libarc/url_cache.c Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/libarc/url_cache.c Wed Jan 9 17:19:20 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef HAVE_CONFIG_H diff -ruN TiMidity++-2.11.1/libarc/url_dir.c TiMidity++-2.11.2/libarc/url_dir.c --- TiMidity++-2.11.1/libarc/url_dir.c Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/libarc/url_dir.c Wed Jan 9 17:19:15 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef HAVE_CONFIG_H diff -ruN TiMidity++-2.11.1/libarc/url_file.c TiMidity++-2.11.2/libarc/url_file.c --- TiMidity++-2.11.1/libarc/url_file.c Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/libarc/url_file.c Wed Jan 9 17:19:09 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef HAVE_CONFIG_H diff -ruN TiMidity++-2.11.1/libarc/url_ftp.c TiMidity++-2.11.2/libarc/url_ftp.c --- TiMidity++-2.11.1/libarc/url_ftp.c Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/libarc/url_ftp.c Wed Jan 9 17:19:05 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef HAVE_CONFIG_H diff -ruN TiMidity++-2.11.1/libarc/url_hqxdecode.c TiMidity++-2.11.2/libarc/url_hqxdecode.c --- TiMidity++-2.11.1/libarc/url_hqxdecode.c Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/libarc/url_hqxdecode.c Wed Jan 9 17:19:00 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef HAVE_CONFIG_H diff -ruN TiMidity++-2.11.1/libarc/url_http.c TiMidity++-2.11.2/libarc/url_http.c --- TiMidity++-2.11.1/libarc/url_http.c Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/libarc/url_http.c Wed Jan 9 17:18:55 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef HAVE_CONFIG_H diff -ruN TiMidity++-2.11.1/libarc/url_inflate.c TiMidity++-2.11.2/libarc/url_inflate.c --- TiMidity++-2.11.1/libarc/url_inflate.c Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/libarc/url_inflate.c Wed Jan 9 17:18:50 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef HAVE_CONFIG_H diff -ruN TiMidity++-2.11.1/libarc/url_mem.c TiMidity++-2.11.2/libarc/url_mem.c --- TiMidity++-2.11.1/libarc/url_mem.c Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/libarc/url_mem.c Wed Jan 9 17:18:45 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef HAVE_CONFIG_H diff -ruN TiMidity++-2.11.1/libarc/url_news.c TiMidity++-2.11.2/libarc/url_news.c --- TiMidity++-2.11.1/libarc/url_news.c Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/libarc/url_news.c Wed Jan 9 17:18:40 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef HAVE_CONFIG_H diff -ruN TiMidity++-2.11.1/libarc/url_newsgroup.c TiMidity++-2.11.2/libarc/url_newsgroup.c --- TiMidity++-2.11.1/libarc/url_newsgroup.c Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/libarc/url_newsgroup.c Wed Jan 9 17:18:34 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef HAVE_CONFIG_H diff -ruN TiMidity++-2.11.1/libarc/url_pipe.c TiMidity++-2.11.2/libarc/url_pipe.c --- TiMidity++-2.11.1/libarc/url_pipe.c Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/libarc/url_pipe.c Wed Jan 9 17:18:29 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef HAVE_CONFIG_H diff -ruN TiMidity++-2.11.1/libarc/url_qsdecode.c TiMidity++-2.11.2/libarc/url_qsdecode.c --- TiMidity++-2.11.1/libarc/url_qsdecode.c Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/libarc/url_qsdecode.c Wed Jan 9 17:18:24 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef HAVE_CONFIG_H diff -ruN TiMidity++-2.11.1/libarc/url_uudecode.c TiMidity++-2.11.2/libarc/url_uudecode.c --- TiMidity++-2.11.1/libarc/url_uudecode.c Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/libarc/url_uudecode.c Wed Jan 9 17:18:19 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef HAVE_CONFIG_H diff -ruN TiMidity++-2.11.1/libarc/zip.h TiMidity++-2.11.2/libarc/zip.h --- TiMidity++-2.11.1/libarc/zip.h Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/libarc/zip.h Wed Jan 9 17:18:12 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef ___ZIP_H_ diff -ruN TiMidity++-2.11.1/libunimod/Makefile.am TiMidity++-2.11.2/libunimod/Makefile.am --- TiMidity++-2.11.1/libunimod/Makefile.am Tue Mar 13 10:07:39 2001 +++ TiMidity++-2.11.2/libunimod/Makefile.am Wed Jan 9 17:07:14 2002 @@ -1,5 +1,5 @@ # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999-2001 Masanao Izumo +# Copyright (C) 1999-2002 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA include $(top_builddir)/common.makefile diff -ruN TiMidity++-2.11.1/libunimod/Makefile.in TiMidity++-2.11.2/libunimod/Makefile.in --- TiMidity++-2.11.1/libunimod/Makefile.in Sat Dec 29 07:28:03 2001 +++ TiMidity++-2.11.2/libunimod/Makefile.in Wed Jan 9 17:09:40 2002 @@ -14,7 +14,7 @@ @SET_MAKE@ # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999-2001 Masanao Izumo +# Copyright (C) 1999-2002 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify @@ -29,7 +29,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA SHELL = @SHELL@ diff -ruN TiMidity++-2.11.1/timidity/Makefile.am TiMidity++-2.11.2/timidity/Makefile.am --- TiMidity++-2.11.1/timidity/Makefile.am Thu Dec 27 19:45:52 2001 +++ TiMidity++-2.11.2/timidity/Makefile.am Wed Jan 9 17:07:09 2002 @@ -1,5 +1,5 @@ # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999-2001 Masanao Izumo +# Copyright (C) 1999-2002 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA include $(top_builddir)/common.makefile diff -ruN TiMidity++-2.11.1/timidity/Makefile.in TiMidity++-2.11.2/timidity/Makefile.in --- TiMidity++-2.11.1/timidity/Makefile.in Sat Dec 29 07:28:04 2001 +++ TiMidity++-2.11.2/timidity/Makefile.in Wed Jan 9 17:09:39 2002 @@ -14,7 +14,7 @@ @SET_MAKE@ # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999-2001 Masanao Izumo +# Copyright (C) 1999-2002 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify @@ -29,7 +29,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA SHELL = @SHELL@ diff -ruN TiMidity++-2.11.1/timidity/aenc.h TiMidity++-2.11.2/timidity/aenc.h --- TiMidity++-2.11.1/timidity/aenc.h Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/aenc.h Wed Jan 9 19:19:20 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef ___AENC_H_ diff -ruN TiMidity++-2.11.1/timidity/aiff_a.c TiMidity++-2.11.2/timidity/aiff_a.c --- TiMidity++-2.11.1/timidity/aiff_a.c Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/aiff_a.c Wed Jan 9 19:19:17 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA aiff_a.c - Functions to output AIFF audio file (*.aiff). Written by Masanao Izumo diff -ruN TiMidity++-2.11.1/timidity/alsa_a.c TiMidity++-2.11.2/timidity/alsa_a.c --- TiMidity++-2.11.1/timidity/alsa_a.c Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/alsa_a.c Wed Jan 9 19:19:14 2002 @@ -1,6 +1,6 @@ /* -*- c-file-style: "gnu" -*- TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen ALSA 0.[56] support by Katsuhiro Ueno @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA alsa_a.c diff -ruN TiMidity++-2.11.1/timidity/aq.c TiMidity++-2.11.2/timidity/aq.c --- TiMidity++-2.11.1/timidity/aq.c Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/aq.c Wed Jan 9 19:19:11 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA aq.c - Audio queue. Written by Masanao Izumo diff -ruN TiMidity++-2.11.1/timidity/aq.h TiMidity++-2.11.2/timidity/aq.h --- TiMidity++-2.11.1/timidity/aq.h Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/aq.h Wed Jan 9 19:19:09 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA aq.h - Audio queue. Written by Masanao Izumo diff -ruN TiMidity++-2.11.1/timidity/au_a.c TiMidity++-2.11.2/timidity/au_a.c --- TiMidity++-2.11.1/timidity/au_a.c Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/au_a.c Wed Jan 9 19:19:06 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA au_a.c diff -ruN TiMidity++-2.11.1/timidity/audio_cnv.c TiMidity++-2.11.2/timidity/audio_cnv.c --- TiMidity++-2.11.1/timidity/audio_cnv.c Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/audio_cnv.c Wed Jan 9 19:19:03 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA audio_cnv.c diff -ruN TiMidity++-2.11.1/timidity/audio_cnv.h TiMidity++-2.11.2/timidity/audio_cnv.h --- TiMidity++-2.11.1/timidity/audio_cnv.h Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/audio_cnv.h Wed Jan 9 19:18:59 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA audio_cnv.h diff -ruN TiMidity++-2.11.1/timidity/audriv.h TiMidity++-2.11.2/timidity/audriv.h --- TiMidity++-2.11.1/timidity/audriv.h Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/audriv.h Wed Jan 9 19:18:57 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef ___AUDRIV_H_ diff -ruN TiMidity++-2.11.1/timidity/audriv_a.c TiMidity++-2.11.2/timidity/audriv_a.c --- TiMidity++-2.11.1/timidity/audriv_a.c Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/audriv_a.c Wed Jan 9 19:18:54 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA audriv_audio.c diff -ruN TiMidity++-2.11.1/timidity/audriv_al.c TiMidity++-2.11.2/timidity/audriv_al.c --- TiMidity++-2.11.1/timidity/audriv_al.c Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/audriv_al.c Wed Jan 9 19:18:52 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef HAVE_CONFIG_H diff -ruN TiMidity++-2.11.1/timidity/audriv_mme.c TiMidity++-2.11.2/timidity/audriv_mme.c --- TiMidity++-2.11.1/timidity/audriv_mme.c Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/audriv_mme.c Wed Jan 9 19:18:49 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef HAVE_CONFIG_H diff -ruN TiMidity++-2.11.1/timidity/audriv_none.c TiMidity++-2.11.2/timidity/audriv_none.c --- TiMidity++-2.11.1/timidity/audriv_none.c Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/audriv_none.c Wed Jan 9 19:18:46 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef HAVE_CONFIG_H diff -ruN TiMidity++-2.11.1/timidity/bsd20_a.c TiMidity++-2.11.2/timidity/bsd20_a.c --- TiMidity++-2.11.1/timidity/bsd20_a.c Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/bsd20_a.c Wed Jan 9 19:18:43 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA bsd20_a.c Written by Yamate Keiichiro diff -ruN TiMidity++-2.11.1/timidity/common.c TiMidity++-2.11.2/timidity/common.c --- TiMidity++-2.11.1/timidity/common.c Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/common.c Wed Jan 9 19:18:40 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA common.c @@ -677,6 +677,31 @@ plp->next = pathlist; pathlist = plp; +} + +void clean_up_pathlist(void) +{ + PathList *cur, *next; + + cur = pathlist; + while (cur) { + next = cur->next; +#ifdef DEFAULT_PATH + if (cur == &defaultpathlist) { + cur = next; + continue; + } +#endif + free(cur->path); + free(cur); + cur = next; + } + +#ifdef DEFAULT_PATH + pathlist = &defaultpathlist; +#else + pathlist = NULL; +#endif } #ifndef HAVE_VOLATILE diff -ruN TiMidity++-2.11.1/timidity/common.h TiMidity++-2.11.2/timidity/common.h --- TiMidity++-2.11.1/timidity/common.h Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/common.h Wed Jan 9 19:18:38 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA common.h @@ -48,6 +48,7 @@ extern void add_to_pathlist(char *s); +extern void clean_up_pathlist(void); extern struct timidity_file *open_file(char *name, int decompress, int noise_mode); extern struct timidity_file *open_with_mem(char *mem, int32 memlen, diff -ruN TiMidity++-2.11.1/timidity/controls.c TiMidity++-2.11.2/timidity/controls.c --- TiMidity++-2.11.1/timidity/controls.c Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/controls.c Wed Jan 9 19:18:33 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA controls.c diff -ruN TiMidity++-2.11.1/timidity/controls.h TiMidity++-2.11.2/timidity/controls.h --- TiMidity++-2.11.1/timidity/controls.h Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/controls.h Wed Jan 9 19:18:30 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA controls.h */ diff -ruN TiMidity++-2.11.1/timidity/dl_dld.c TiMidity++-2.11.2/timidity/dl_dld.c --- TiMidity++-2.11.1/timidity/dl_dld.c Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/dl_dld.c Wed Jan 9 19:18:28 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef HAVE_CONFIG_H diff -ruN TiMidity++-2.11.1/timidity/dl_dlopen.c TiMidity++-2.11.2/timidity/dl_dlopen.c --- TiMidity++-2.11.1/timidity/dl_dlopen.c Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/dl_dlopen.c Wed Jan 9 19:18:24 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef HAVE_CONFIG_H diff -ruN TiMidity++-2.11.1/timidity/dl_hpux.c TiMidity++-2.11.2/timidity/dl_hpux.c --- TiMidity++-2.11.1/timidity/dl_hpux.c Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/dl_hpux.c Wed Jan 9 19:18:21 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef HAVE_CONFIG_H diff -ruN TiMidity++-2.11.1/timidity/dl_w32.c TiMidity++-2.11.2/timidity/dl_w32.c --- TiMidity++-2.11.1/timidity/dl_w32.c Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/dl_w32.c Wed Jan 9 19:18:18 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef HAVE_CONFIG_H diff -ruN TiMidity++-2.11.1/timidity/dlutils.h TiMidity++-2.11.2/timidity/dlutils.h --- TiMidity++-2.11.1/timidity/dlutils.h Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/dlutils.h Wed Jan 9 19:18:15 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef ___DLUTILS_H_ diff -ruN TiMidity++-2.11.1/timidity/effect.c TiMidity++-2.11.2/timidity/effect.c --- TiMidity++-2.11.1/timidity/effect.c Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/effect.c Wed Jan 9 19:18:11 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA effect.c - To apply sound effects. Mainly written by Masanao Izumo diff -ruN TiMidity++-2.11.1/timidity/esd_a.c TiMidity++-2.11.2/timidity/esd_a.c --- TiMidity++-2.11.1/timidity/esd_a.c Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/esd_a.c Wed Jan 9 19:18:09 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA esd_a.c by Avatar based on linux_a.c diff -ruN TiMidity++-2.11.1/timidity/filter.c TiMidity++-2.11.2/timidity/filter.c --- TiMidity++-2.11.1/timidity/filter.c Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/filter.c Wed Jan 9 19:18:04 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA filter.c: written by Vincent Pagel ( pagel@loria.fr ) diff -ruN TiMidity++-2.11.1/timidity/filter.h TiMidity++-2.11.2/timidity/filter.h --- TiMidity++-2.11.1/timidity/filter.h Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/filter.h Wed Jan 9 19:18:02 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA filter.h : written by Vincent Pagel ( pagel@loria.fr ) diff -ruN TiMidity++-2.11.1/timidity/freq.c TiMidity++-2.11.2/timidity/freq.c --- TiMidity++-2.11.1/timidity/freq.c Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/freq.c Wed Jan 9 19:17:59 2002 @@ -1,3 +1,23 @@ +/* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999-2002 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + #define NUM_WIDE_PEAKS_TO_KEEP 99999 /* keep only the first n humps */ #ifdef HAVE_CONFIG_H diff -ruN TiMidity++-2.11.1/timidity/freq.h TiMidity++-2.11.2/timidity/freq.h --- TiMidity++-2.11.1/timidity/freq.h Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/freq.h Wed Jan 9 19:17:57 2002 @@ -1,3 +1,23 @@ +/* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999-2002 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + extern float pitch_freq_table[129]; extern float pitch_freq_ub_table[129]; extern float pitch_freq_lb_table[129]; diff -ruN TiMidity++-2.11.1/timidity/gogo_a.c TiMidity++-2.11.2/timidity/gogo_a.c --- TiMidity++-2.11.1/timidity/gogo_a.c Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/gogo_a.c Wed Jan 9 19:17:54 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA gogo_a.c @@ -593,14 +593,14 @@ int quot = 0; while(isspace(*p1)) p1++; - if(*p1=='\"') + if(*p1=='"') quot = 1; else if(*p1=='\'') quot = 2; if(*p1=='\0') return 0; p2 = p1+1; - while((quot==1&&*p2=='\"') || (quot==2&&*p2=='\'') || *p2=='\0') + while((quot==1&&*p2=='"') || (quot==2&&*p2=='\'') || *p2=='\0') p2++; while(!isspace(*p2) || *p2=='\0') p2++; diff -ruN TiMidity++-2.11.1/timidity/gogo_a.h TiMidity++-2.11.2/timidity/gogo_a.h --- TiMidity++-2.11.1/timidity/gogo_a.h Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/gogo_a.h Wed Jan 9 19:17:51 2002 @@ -1,3 +1,23 @@ +/* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999-2002 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + #ifndef __GOGO_A_H__ #define __GOGO_A_H__ diff -ruN TiMidity++-2.11.1/timidity/hpux_a.c TiMidity++-2.11.2/timidity/hpux_a.c --- TiMidity++-2.11.1/timidity/hpux_a.c Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/hpux_a.c Wed Jan 9 19:17:49 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA hpux_audio.c written by Vincent Pagel pagel@loria.fr diff -ruN TiMidity++-2.11.1/timidity/hpux_d_a.c TiMidity++-2.11.2/timidity/hpux_d_a.c --- TiMidity++-2.11.1/timidity/hpux_d_a.c Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/hpux_d_a.c Wed Jan 9 19:17:46 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Functions to play sound on a HP's audio device diff -ruN TiMidity++-2.11.1/timidity/instrum.c TiMidity++-2.11.2/timidity/instrum.c --- TiMidity++-2.11.1/timidity/instrum.c Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/instrum.c Wed Jan 9 19:17:43 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA instrum.c @@ -1125,6 +1125,21 @@ p[elem_from].elem = elem_to; } +void free_instrument_map(void) +{ + int i, j, k; + + for (i = 0; i < NUM_INST_MAP; i++) { + for (j = 0; j < 128; j++) { + struct inst_map_elem *map; + map = inst_map_table[i][j]; + if (map) { + free(map); + inst_map_table[i][j] = NULL; + } + } + } +} /* Alternate assign - Written by Masanao Izumo */ diff -ruN TiMidity++-2.11.1/timidity/instrum.h TiMidity++-2.11.2/timidity/instrum.h --- TiMidity++-2.11.1/timidity/instrum.h Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/instrum.h Wed Jan 9 19:17:41 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA instrum.h @@ -164,6 +164,7 @@ extern void set_instrument_map(int mapID, int set_from, int elem_from, int set_to, int elem_to); +extern void free_instrument_map(void); extern AlternateAssign *add_altassign_string(AlternateAssign *old, char **params, int n); extern AlternateAssign *find_altassign(AlternateAssign *altassign, int note); diff -ruN TiMidity++-2.11.1/timidity/list_a.c TiMidity++-2.11.2/timidity/list_a.c --- TiMidity++-2.11.1/timidity/list_a.c Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/list_a.c Wed Jan 9 19:17:38 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA list_a.c - list MIDI programs */ diff -ruN TiMidity++-2.11.1/timidity/loadtab.c TiMidity++-2.11.2/timidity/loadtab.c --- TiMidity++-2.11.1/timidity/loadtab.c Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/loadtab.c Wed Jan 9 19:17:35 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA loadtab.c - written by Nando Santagata */ diff -ruN TiMidity++-2.11.1/timidity/m2m.c TiMidity++-2.11.2/timidity/m2m.c --- TiMidity++-2.11.1/timidity/m2m.c Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/m2m.c Wed Jan 9 19:17:33 2002 @@ -1,4 +1,24 @@ /* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999-2002 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +/* * EAW -- Quick and dirty hack to convert the TiMidity events generated from * a MOD file into events suitable for writing to a midi file, then write * the midi file. diff -ruN TiMidity++-2.11.1/timidity/mac_a.c TiMidity++-2.11.2/timidity/mac_a.c --- TiMidity++-2.11.1/timidity/mac_a.c Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/mac_a.c Wed Jan 9 19:17:30 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Macintosh interface for TiMidity by T.Nogami diff -ruN TiMidity++-2.11.1/timidity/mac_com.h TiMidity++-2.11.2/timidity/mac_com.h --- TiMidity++-2.11.1/timidity/mac_com.h Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/mac_com.h Wed Jan 9 19:17:28 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Macintosh interface for TiMidity by T.Nogami diff -ruN TiMidity++-2.11.1/timidity/mac_dlog.c TiMidity++-2.11.2/timidity/mac_dlog.c --- TiMidity++-2.11.1/timidity/mac_dlog.c Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/mac_dlog.c Wed Jan 9 19:17:25 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Macintosh interface for TiMidity by T.Nogami diff -ruN TiMidity++-2.11.1/timidity/mac_main.c TiMidity++-2.11.2/timidity/mac_main.c --- TiMidity++-2.11.1/timidity/mac_main.c Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/mac_main.c Wed Jan 9 19:17:23 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Macintosh interface for TiMidity by T.Nogami diff -ruN TiMidity++-2.11.1/timidity/mac_main.h TiMidity++-2.11.2/timidity/mac_main.h --- TiMidity++-2.11.1/timidity/mac_main.h Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/mac_main.h Wed Jan 9 19:17:20 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Macintosh interface for TiMidity by T.Nogami diff -ruN TiMidity++-2.11.1/timidity/mac_qt_a.c TiMidity++-2.11.2/timidity/mac_qt_a.c --- TiMidity++-2.11.1/timidity/mac_qt_a.c Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/mac_qt_a.c Wed Jan 9 19:17:18 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Macintosh interface for TiMidity by T.Nogami diff -ruN TiMidity++-2.11.1/timidity/mac_soundspec.c TiMidity++-2.11.2/timidity/mac_soundspec.c --- TiMidity++-2.11.1/timidity/mac_soundspec.c Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/mac_soundspec.c Wed Jan 9 19:17:15 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA mac_soundspec.c diff -ruN TiMidity++-2.11.1/timidity/mfnode.c TiMidity++-2.11.2/timidity/mfnode.c --- TiMidity++-2.11.1/timidity/mfnode.c Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/mfnode.c Wed Jan 9 19:17:13 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA mfnode.c diff -ruN TiMidity++-2.11.1/timidity/mfnode.h TiMidity++-2.11.2/timidity/mfnode.h --- TiMidity++-2.11.1/timidity/mfnode.h Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/mfnode.h Wed Jan 9 19:17:10 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA mfnode.h diff -ruN TiMidity++-2.11.1/timidity/mid-j.defs TiMidity++-2.11.2/timidity/mid-j.defs --- TiMidity++-2.11.1/timidity/mid-j.defs Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/timidity/mid-j.defs Wed Jan 9 19:22:02 2002 @@ -1,7 +1,7 @@ /* -*- c -*- */ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -16,8 +16,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef ___MID_DEFS_ diff -ruN TiMidity++-2.11.1/timidity/mid.defs TiMidity++-2.11.2/timidity/mid.defs --- TiMidity++-2.11.1/timidity/mid.defs Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/timidity/mid.defs Wed Jan 9 19:21:55 2002 @@ -1,7 +1,7 @@ /* -*- c -*- */ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef ___MID_DEFS_ diff -ruN TiMidity++-2.11.1/timidity/miditrace.c TiMidity++-2.11.2/timidity/miditrace.c --- TiMidity++-2.11.1/timidity/miditrace.c Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/miditrace.c Wed Jan 9 19:17:07 2002 @@ -1,25 +1,25 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo - Copyright (C) 1995 Tuukka Toivonen + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999-2002 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - miditrace.c - Midi audio synchronized tracer - Written by Masanao Izumo + miditrace.c - Midi audio synchronized tracer + Written by Masanao Izumo */ diff -ruN TiMidity++-2.11.1/timidity/miditrace.h TiMidity++-2.11.2/timidity/miditrace.h --- TiMidity++-2.11.1/timidity/miditrace.h Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/miditrace.h Wed Jan 9 19:16:53 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef ___MIDITRACE_H_ diff -ruN TiMidity++-2.11.1/timidity/mix.c TiMidity++-2.11.2/timidity/mix.c --- TiMidity++-2.11.1/timidity/mix.c Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/mix.c Wed Jan 9 19:16:49 2002 @@ -1,25 +1,24 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen - Suddenly, you realize that this program is free software; you get - an overwhelming urge to redistribute it and/or modify it under the - terms of the GNU General Public License as published by the Free - Software Foundation; either version 2 of the License, or (at your - option) any later version. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received another copy of the GNU General Public - License along with this program; if not, write to the Free - Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - I bet they'll be amazed. + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - mix.c */ + mix.c +*/ #ifdef HAVE_CONFIG_H #include "config.h" @@ -41,14 +40,26 @@ int min_sustain_time = 0; #ifdef SMOOTH_MIXING +#ifdef LOOKUP_HACK +/* u2l: 0..255 -> -32256..32256 + * shift 3 bit: -> within MAX_AMP_VALUE + */ +#define FROM_FINAL_VOLUME(a) (_u2l[(uint8)~(a)]>>3) +#else +#define FROM_FINAL_VOLUME(a) (a) +#endif +#endif + + +#ifdef SMOOTH_MIXING void compute_mix_smoothing(Voice *vp) { - final_volume_t max_win, delta; + int32 max_win, delta; /* reduce popping -- ramp the amp over a <= 0.5 msec window */ - max_win = play_mode->rate * 0.0005; + max_win = (int32)(play_mode->rate * 0.0005); + delta = FROM_FINAL_VOLUME(vp->left_mix) - vp->old_left_mix; - delta = vp->left_mix - vp->old_left_mix; if (labs(delta) > max_win) { vp->left_mix_inc = delta / max_win; @@ -63,7 +74,7 @@ vp->left_mix_offset = -delta + vp->left_mix_inc; } - delta = vp->right_mix - vp->old_right_mix; + delta = FROM_FINAL_VOLUME(vp->right_mix) - vp->old_right_mix; if (labs(delta) > max_win) { vp->right_mix_inc = delta / max_win; @@ -316,9 +327,9 @@ } #ifdef LOOKUP_HACK -# define MIXATION(a) *lp++ += mixup[(a<<8) | (uint8)s]; +# define MIXATION(a) *lp++ += mixup[(a<<8) | (uint8)s] #else -# define MIXATION(a) *lp++ += (a) * s; +# define MIXATION(a) *lp++ += (a) * s #endif static void mix_mystery_signal(sample_t *sp, int32 *lp, int v, int count) @@ -329,6 +340,9 @@ right=vp->right_mix; int cc, i; sample_t s; +#ifdef SMOOTH_MIXING + int32 linear_left, linear_right; +#endif if (!(cc = vp->control_counter)) { @@ -348,9 +362,28 @@ { count -= cc; #ifdef SMOOTH_MIXING - for (i = 0, left += vp->left_mix_offset, - right += vp->right_mix_offset; - (vp->left_mix_offset | vp->right_mix_offset) && i < cc; i++) + linear_left = FROM_FINAL_VOLUME(left); + if (vp->left_mix_offset) { + linear_left += vp->left_mix_offset; + if (linear_left > MAX_AMP_VALUE) { + linear_left = MAX_AMP_VALUE; + vp->left_mix_offset = 0; + } + left = FINAL_VOLUME(linear_left); + } + + linear_right = FROM_FINAL_VOLUME(right); + if (vp->right_mix_offset) { + linear_right += vp->right_mix_offset; + if (linear_right > MAX_AMP_VALUE) { + linear_right = MAX_AMP_VALUE; + vp->right_mix_offset = 0; + } + right = FINAL_VOLUME(linear_right); + } + + for (i = 0; + (vp->left_mix_offset | vp->right_mix_offset) && i < cc; i++) { s = *sp++; MIXATION(left); @@ -359,16 +392,26 @@ if (vp->left_mix_offset) { vp->left_mix_offset += vp->left_mix_inc; - left += vp->left_mix_inc; + linear_left += vp->left_mix_inc; + if (linear_left > MAX_AMP_VALUE) { + linear_left = MAX_AMP_VALUE; + vp->left_mix_offset = 0; + } + left = FINAL_VOLUME(linear_left); } if (vp->right_mix_offset) { vp->right_mix_offset += vp->right_mix_inc; - right += vp->right_mix_inc; + linear_right += vp->right_mix_inc; + if (linear_right > MAX_AMP_VALUE) { + linear_right = MAX_AMP_VALUE; + vp->right_mix_offset = 0; + } + right = FINAL_VOLUME(linear_right); } } - vp->old_left_mix = left; - vp->old_right_mix = right; + vp->old_left_mix = linear_left; + vp->old_right_mix = linear_right; cc -= i; #endif for(i = 0; i < cc; i++) @@ -390,8 +433,27 @@ { vp->control_counter = cc - count; #ifdef SMOOTH_MIXING - for (i = 0, left += vp->left_mix_offset, - right += vp->right_mix_offset; + linear_left = FROM_FINAL_VOLUME(left); + if (vp->left_mix_offset) { + linear_left += vp->left_mix_offset; + if (linear_left > MAX_AMP_VALUE) { + linear_left = MAX_AMP_VALUE; + vp->left_mix_offset = 0; + } + left = FINAL_VOLUME(linear_left); + } + + linear_right = FROM_FINAL_VOLUME(right); + if (vp->right_mix_offset) { + linear_right += vp->right_mix_offset; + if (linear_right > MAX_AMP_VALUE) { + linear_right = MAX_AMP_VALUE; + vp->right_mix_offset = 0; + } + right = FINAL_VOLUME(linear_right); + } + + for (i = 0; (vp->left_mix_offset | vp->right_mix_offset) && i < count; i++) { s = *sp++; @@ -401,16 +463,26 @@ if (vp->left_mix_offset) { vp->left_mix_offset += vp->left_mix_inc; - left += vp->left_mix_inc; + linear_left += vp->left_mix_inc; + if (linear_left > MAX_AMP_VALUE) { + linear_left = MAX_AMP_VALUE; + vp->left_mix_offset = 0; + } + left = FINAL_VOLUME(linear_left); } if (vp->right_mix_offset) { vp->right_mix_offset += vp->right_mix_inc; - right += vp->right_mix_inc; + linear_right += vp->right_mix_inc; + if (linear_right > MAX_AMP_VALUE) { + linear_right = MAX_AMP_VALUE; + vp->right_mix_offset = 0; + } + right = FINAL_VOLUME(linear_right); } } - vp->old_left_mix = left; - vp->old_right_mix = right; + vp->old_left_mix = linear_left; + vp->old_right_mix = linear_right; count -= i; #endif for(i = 0; i < count; i++) @@ -430,6 +502,9 @@ left=vp->left_mix; int cc, i; sample_t s; +#ifdef SMOOTH_MIXING + int32 linear_left; +#endif if (!(cc = vp->control_counter)) { @@ -448,17 +523,31 @@ { count -= cc; #ifdef SMOOTH_MIXING - for (i = 0, left += vp->left_mix_offset; - vp->left_mix_offset && i < cc; i++) + linear_left = FROM_FINAL_VOLUME(left); + if (vp->left_mix_offset) { + linear_left += vp->left_mix_offset; + if (linear_left > MAX_AMP_VALUE) { + linear_left = MAX_AMP_VALUE; + vp->left_mix_offset = 0; + } + left = FINAL_VOLUME(linear_left); + } + + for (i = 0; vp->left_mix_offset && i < cc; i++) { s = *sp++; MIXATION(left); MIXATION(left); vp->left_mix_offset += vp->left_mix_inc; - left += vp->left_mix_inc; + linear_left += vp->left_mix_inc; + if (linear_left > MAX_AMP_VALUE) { + linear_left = MAX_AMP_VALUE; + vp->left_mix_offset = 0; + } + left = FINAL_VOLUME(linear_left); } - vp->old_left_mix = left; + vp->old_left_mix = linear_left; cc -= i; #endif for(i = 0; i < cc; i++) @@ -479,17 +568,31 @@ { vp->control_counter = cc - count; #ifdef SMOOTH_MIXING - for (i = 0, left += vp->left_mix_offset; - vp->left_mix_offset && i < count; i++) + linear_left = FROM_FINAL_VOLUME(left); + if (vp->left_mix_offset) { + linear_left += vp->left_mix_offset; + if (linear_left > MAX_AMP_VALUE) { + linear_left = MAX_AMP_VALUE; + vp->left_mix_offset = 0; + } + left = FINAL_VOLUME(linear_left); + } + + for (i = 0; vp->left_mix_offset && i < count; i++) { s = *sp++; MIXATION(left); MIXATION(left); vp->left_mix_offset += vp->left_mix_inc; - left += vp->left_mix_inc; + linear_left += vp->left_mix_inc; + if (linear_left > MAX_AMP_VALUE) { + linear_left = MAX_AMP_VALUE; + vp->left_mix_offset = 0; + } + left = FINAL_VOLUME(linear_left); } - vp->old_left_mix = left; + vp->old_left_mix = linear_left; count -= i; #endif for(i = 0; i < count; i++) @@ -509,6 +612,9 @@ left=vp->left_mix; int cc, i; sample_t s; +#ifdef SMOOTH_MIXING + int32 linear_left; +#endif if (!(cc = vp->control_counter)) { @@ -527,17 +633,31 @@ { count -= cc; #ifdef SMOOTH_MIXING - for (i = 0, left += vp->left_mix_offset; - vp->left_mix_offset && i < cc; i++) + linear_left = FROM_FINAL_VOLUME(left); + if (vp->left_mix_offset) { + linear_left += vp->left_mix_offset; + if (linear_left > MAX_AMP_VALUE) { + linear_left = MAX_AMP_VALUE; + vp->left_mix_offset = 0; + } + left = FINAL_VOLUME(linear_left); + } + + for (i = 0; vp->left_mix_offset && i < cc; i++) { s = *sp++; MIXATION(left); lp++; vp->left_mix_offset += vp->left_mix_inc; - left += vp->left_mix_inc; + linear_left += vp->left_mix_inc; + if (linear_left > MAX_AMP_VALUE) { + linear_left = MAX_AMP_VALUE; + vp->left_mix_offset = 0; + } + left = FINAL_VOLUME(linear_left); } - vp->old_left_mix = left; + vp->old_left_mix = linear_left; cc -= i; #endif for(i = 0; i < cc; i++) @@ -558,17 +678,31 @@ { vp->control_counter = cc - count; #ifdef SMOOTH_MIXING - for (i = 0, left += vp->left_mix_offset; - vp->left_mix_offset && i < count; i++) + linear_left = FROM_FINAL_VOLUME(left); + if (vp->left_mix_offset) { + linear_left += vp->left_mix_offset; + if (linear_left > MAX_AMP_VALUE) { + linear_left = MAX_AMP_VALUE; + vp->left_mix_offset = 0; + } + left = FINAL_VOLUME(linear_left); + } + + for (i = 0; vp->left_mix_offset && i < count; i++) { s = *sp++; MIXATION(left); lp++; vp->left_mix_offset += vp->left_mix_inc; - left += vp->left_mix_inc; + linear_left += vp->left_mix_inc; + if (linear_left > MAX_AMP_VALUE) { + linear_left = MAX_AMP_VALUE; + vp->left_mix_offset = 0; + } + left = FINAL_VOLUME(linear_left); } - vp->old_left_mix = left; + vp->old_left_mix = linear_left; count -= i; #endif for(i = 0; i < count; i++) @@ -588,6 +722,9 @@ left=vp->left_mix; int cc, i; sample_t s; +#ifdef SMOOTH_MIXING + int32 linear_left; +#endif if (!(cc = vp->control_counter)) { @@ -606,16 +743,30 @@ { count -= cc; #ifdef SMOOTH_MIXING - for (i = 0, left += vp->left_mix_offset; - vp->left_mix_offset && i < cc; i++) + linear_left = FROM_FINAL_VOLUME(left); + if (vp->left_mix_offset) { + linear_left += vp->left_mix_offset; + if (linear_left > MAX_AMP_VALUE) { + linear_left = MAX_AMP_VALUE; + vp->left_mix_offset = 0; + } + left = FINAL_VOLUME(linear_left); + } + + for (i = 0; vp->left_mix_offset && i < cc; i++) { s = *sp++; MIXATION(left); vp->left_mix_offset += vp->left_mix_inc; - left += vp->left_mix_inc; + linear_left += vp->left_mix_inc; + if (linear_left > MAX_AMP_VALUE) { + linear_left = MAX_AMP_VALUE; + vp->left_mix_offset = 0; + } + left = FINAL_VOLUME(linear_left); } - vp->old_left_mix = left; + vp->old_left_mix = linear_left; cc -= i; #endif for(i = 0; i < cc; i++) @@ -635,16 +786,30 @@ { vp->control_counter = cc - count; #ifdef SMOOTH_MIXING - for (i = 0, left += vp->left_mix_offset; - vp->left_mix_offset && i < count; i++) + linear_left = FROM_FINAL_VOLUME(left); + if (vp->left_mix_offset) { + linear_left += vp->left_mix_offset; + if (linear_left > MAX_AMP_VALUE) { + linear_left = MAX_AMP_VALUE; + vp->left_mix_offset = 0; + } + left = FINAL_VOLUME(linear_left); + } + + for (i = 0; vp->left_mix_offset && i < count; i++) { s = *sp++; MIXATION(left); vp->left_mix_offset += vp->left_mix_inc; - left += vp->left_mix_inc; + linear_left += vp->left_mix_inc; + if (linear_left > MAX_AMP_VALUE) { + linear_left = MAX_AMP_VALUE; + vp->left_mix_offset = 0; + } + left = FINAL_VOLUME(linear_left); } - vp->old_left_mix = left; + vp->old_left_mix = linear_left; count -= i; #endif for(i = 0; i < count; i++) @@ -666,11 +831,31 @@ #ifdef SMOOTH_MIXING Voice *vp = voice + v; + int32 linear_left, linear_right; compute_mix_smoothing(vp); - for (i = 0, left += vp->left_mix_offset, - right += vp->right_mix_offset; - (vp->left_mix_offset | vp->right_mix_offset) && i < count; i++) + + linear_left = FROM_FINAL_VOLUME(left); + if (vp->left_mix_offset) { + linear_left += vp->left_mix_offset; + if (linear_left > MAX_AMP_VALUE) { + linear_left = MAX_AMP_VALUE; + vp->left_mix_offset = 0; + } + left = FINAL_VOLUME(linear_left); + } + + linear_right = FROM_FINAL_VOLUME(right); + if (vp->right_mix_offset) { + linear_right += vp->right_mix_offset; + if (linear_right > MAX_AMP_VALUE) { + linear_right = MAX_AMP_VALUE; + vp->right_mix_offset = 0; + } + right = FINAL_VOLUME(linear_right); + } + + for (i = 0; (vp->left_mix_offset | vp->right_mix_offset) && i < count; i++) { s = *sp++; MIXATION(left); @@ -679,16 +864,26 @@ if (vp->left_mix_offset) { vp->left_mix_offset += vp->left_mix_inc; - left += vp->left_mix_inc; + linear_left += vp->left_mix_inc; + if (linear_left > MAX_AMP_VALUE) { + linear_left = MAX_AMP_VALUE; + vp->left_mix_offset = 0; + } + left = FINAL_VOLUME(linear_left); } if (vp->right_mix_offset) { vp->right_mix_offset += vp->right_mix_inc; - right += vp->right_mix_inc; + linear_right += vp->right_mix_inc; + if (linear_right > MAX_AMP_VALUE) { + linear_right = MAX_AMP_VALUE; + vp->right_mix_offset = 0; + } + right = FINAL_VOLUME(linear_right); } } - vp->old_left_mix = left; - vp->old_right_mix = right; + vp->old_left_mix = linear_left; + vp->old_right_mix = linear_right; count -= i; #endif @@ -709,19 +904,35 @@ #ifdef SMOOTH_MIXING Voice *vp = voice + v; + int32 linear_left; compute_mix_smoothing(vp); - for (i = 0, left += vp->left_mix_offset; - vp->left_mix_offset && i < count; i++) + + linear_left = FROM_FINAL_VOLUME(left); + if (vp->left_mix_offset) { + linear_left += vp->left_mix_offset; + if (linear_left > MAX_AMP_VALUE) { + linear_left = MAX_AMP_VALUE; + vp->left_mix_offset = 0; + } + left = FINAL_VOLUME(linear_left); + } + + for (i = 0; vp->left_mix_offset && i < count; i++) { s = *sp++; MIXATION(left); MIXATION(left); vp->left_mix_offset += vp->left_mix_inc; - left += vp->left_mix_inc; + linear_left += vp->left_mix_inc; + if (linear_left > MAX_AMP_VALUE) { + linear_left = MAX_AMP_VALUE; + vp->left_mix_offset = 0; + } + left = FINAL_VOLUME(linear_left); } - vp->old_left_mix = left; + vp->old_left_mix = linear_left; count -= i; #endif @@ -742,19 +953,35 @@ #ifdef SMOOTH_MIXING Voice *vp = voice + v; + int32 linear_left; compute_mix_smoothing(vp); - for (i = 0, left += vp->left_mix_offset; - vp->left_mix_offset && i < count; i++) + + linear_left = FROM_FINAL_VOLUME(left); + if (vp->left_mix_offset) { + linear_left += vp->left_mix_offset; + if (linear_left > MAX_AMP_VALUE) { + linear_left = MAX_AMP_VALUE; + vp->left_mix_offset = 0; + } + left = FINAL_VOLUME(linear_left); + } + + for (i = 0; vp->left_mix_offset && i < count; i++) { s = *sp++; MIXATION(left); lp++; vp->left_mix_offset += vp->left_mix_inc; - left += vp->left_mix_inc; + linear_left += vp->left_mix_inc; + if (linear_left > MAX_AMP_VALUE) { + linear_left = MAX_AMP_VALUE; + vp->left_mix_offset = 0; + } + left = FINAL_VOLUME(linear_left); } - vp->old_left_mix = left; + vp->old_left_mix = linear_left; count -= i; #endif @@ -775,19 +1002,35 @@ #ifdef SMOOTH_MIXING Voice *vp = voice + v; + int32 linear_left; compute_mix_smoothing(vp); - for (i = 0, left += vp->left_mix_offset; - vp->left_mix_offset && i < count; i++) + + linear_left = FROM_FINAL_VOLUME(left); + if (vp->left_mix_offset) { + linear_left += vp->left_mix_offset; + if (linear_left > MAX_AMP_VALUE) { + linear_left = MAX_AMP_VALUE; + vp->left_mix_offset = 0; + } + left = FINAL_VOLUME(linear_left); + } + + for (i = 0; vp->left_mix_offset && i < count; i++) { s = *sp++; MIXATION(left); MIXATION(left); vp->left_mix_offset += vp->left_mix_inc; - left += vp->left_mix_inc; + linear_left += vp->left_mix_inc; + if (linear_left > MAX_AMP_VALUE) { + linear_left = MAX_AMP_VALUE; + vp->left_mix_offset = 0; + } + left = FINAL_VOLUME(linear_left); } - vp->old_left_mix = left; + vp->old_left_mix = linear_left; count -= i; #endif diff -ruN TiMidity++-2.11.1/timidity/mix.h TiMidity++-2.11.2/timidity/mix.h --- TiMidity++-2.11.1/timidity/mix.h Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/mix.h Wed Jan 9 19:15:52 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen In case you haven't heard, this program is free software; @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA mix.h diff -ruN TiMidity++-2.11.1/timidity/mod.c TiMidity++-2.11.2/timidity/mod.c --- TiMidity++-2.11.1/timidity/mod.c Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/mod.c Wed Jan 9 19:15:48 2002 @@ -1,27 +1,26 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo - Copyright (C) 1995 Tuukka Toivonen + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999-2002 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen - Most of this file is taken from the MikMod sound library, which is - (c) 1998, 1999 Miodrag Vallat and others - see file libunimod/AUTHORS - for complete list. + Most of this file is taken from the MikMod sound library, which is + (c) 1998, 1999 Miodrag Vallat and others - see file libunimod/AUTHORS + for complete list. - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - */ + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ /* Interface to libunimod + module player */ diff -ruN TiMidity++-2.11.1/timidity/mod.h TiMidity++-2.11.2/timidity/mod.h --- TiMidity++-2.11.1/timidity/mod.h Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/mod.h Wed Jan 9 19:15:34 2002 @@ -1,23 +1,22 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo - Copyright (C) 1995 Tuukka Toivonen + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999-2002 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - */ + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ #ifndef ___MOD_H_ #define ___MOD_H_ diff -ruN TiMidity++-2.11.1/timidity/mod2midi.c TiMidity++-2.11.2/timidity/mod2midi.c --- TiMidity++-2.11.1/timidity/mod2midi.c Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/mod2midi.c Wed Jan 9 19:15:17 2002 @@ -1,27 +1,26 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo - Copyright (C) 1995 Tuukka Toivonen + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999-2002 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. + mod2midi.c - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - mod2midi.c - - Mixer event -> MIDI event conversion - - */ + Mixer event -> MIDI event conversion +*/ #ifdef HAVE_CONFIG_H #include "config.h" diff -ruN TiMidity++-2.11.1/timidity/mod2midi.h TiMidity++-2.11.2/timidity/mod2midi.h --- TiMidity++-2.11.1/timidity/mod2midi.h Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/mod2midi.h Wed Jan 9 19:15:02 2002 @@ -1,25 +1,25 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo - Copyright (C) 1995 Tuukka Toivonen + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999-2002 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - mod2midi.h + mod2midi.h - Header file for sample info -> MIDI event conversion + Header file for sample info -> MIDI event conversion */ diff -ruN TiMidity++-2.11.1/timidity/modmid_a.c TiMidity++-2.11.2/timidity/modmid_a.c --- TiMidity++-2.11.1/timidity/modmid_a.c Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/modmid_a.c Wed Jan 9 19:14:43 2002 @@ -1,3 +1,23 @@ +/* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999-2002 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + #ifdef HAVE_CONFIG_H #include "config.h" #endif /* HAVE_CONFIG_H */ diff -ruN TiMidity++-2.11.1/timidity/nas_a.c TiMidity++-2.11.2/timidity/nas_a.c --- TiMidity++-2.11.1/timidity/nas_a.c Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/nas_a.c Wed Jan 9 19:14:40 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen nas_a.c - Copyright (C) 1999 Michael Haardt @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA nas_a.c diff -ruN TiMidity++-2.11.1/timidity/oss_a.c TiMidity++-2.11.2/timidity/oss_a.c --- TiMidity++-2.11.1/timidity/oss_a.c Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/oss_a.c Wed Jan 9 19:14:37 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA oss_a.c (linux_a.c) diff -ruN TiMidity++-2.11.1/timidity/output.c TiMidity++-2.11.2/timidity/output.c --- TiMidity++-2.11.1/timidity/output.c Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/output.c Wed Jan 9 19:14:35 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA output.c diff -ruN TiMidity++-2.11.1/timidity/output.h TiMidity++-2.11.2/timidity/output.h --- TiMidity++-2.11.1/timidity/output.h Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/output.h Wed Jan 9 19:14:32 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA output.h diff -ruN TiMidity++-2.11.1/timidity/playmidi.c TiMidity++-2.11.2/timidity/playmidi.c --- TiMidity++-2.11.1/timidity/playmidi.c Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/playmidi.c Sat Jan 12 18:57:44 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA playmidi.c -- random stuff in need of rearrangement @@ -1787,8 +1787,6 @@ uint8 vol; struct chorus_status_t *status = get_chorus_status(); - printf("## level %d\n", level); - if((v2 = find_free_voice()) == -1) return; ch = voice[v1].channel; @@ -4680,8 +4678,6 @@ if(RC_IS_SKIP_FILE(rc)) return rc; - //aq_flush(1);/* ###### TODO CHECK */ - skip_to(midi_restart_time); if(midi_restart_time > 0) { /* Need to update interface display */ @@ -5185,7 +5181,7 @@ /* Fill in current_file_info */ current_file_info->readflag = 1; - current_file_info->seq_name = "TiMidity server"; + current_file_info->seq_name = safe_strdup("TiMidity server"); current_file_info->karaoke_title = current_file_info->first_text = NULL; current_file_info->mid = 0x7f; current_file_info->hdrsiz = 0; @@ -5199,7 +5195,7 @@ current_file_info->samples = 0; current_file_info->max_channel = MAX_CHANNELS; current_file_info->compressed = 0; - current_file_info->midi_data = ""; + current_file_info->midi_data = NULL; current_file_info->midi_data_size = 0; current_file_info->file_type = IS_OTHER_FILE; diff -ruN TiMidity++-2.11.1/timidity/playmidi.h TiMidity++-2.11.2/timidity/playmidi.h --- TiMidity++-2.11.1/timidity/playmidi.h Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/playmidi.h Wed Jan 9 19:14:27 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA playmidi.h @@ -263,7 +263,7 @@ final_volume_t left_mix, right_mix; #ifdef SMOOTH_MIXING - final_volume_t old_left_mix, old_right_mix, + int32 old_left_mix, old_right_mix, left_mix_offset, right_mix_offset, left_mix_inc, right_mix_inc; #endif diff -ruN TiMidity++-2.11.1/timidity/raw_a.c TiMidity++-2.11.2/timidity/raw_a.c --- TiMidity++-2.11.1/timidity/raw_a.c Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/raw_a.c Wed Jan 9 19:14:24 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA raw_audio.c diff -ruN TiMidity++-2.11.1/timidity/rcp.c TiMidity++-2.11.2/timidity/rcp.c --- TiMidity++-2.11.1/timidity/rcp.c Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/rcp.c Wed Jan 9 19:14:22 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef HAVE_CONFIG_H diff -ruN TiMidity++-2.11.1/timidity/readmidi.c TiMidity++-2.11.2/timidity/readmidi.c --- TiMidity++-2.11.1/timidity/readmidi.c Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/readmidi.c Sat Jan 12 18:48:06 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef HAVE_CONFIG_H @@ -1559,10 +1558,11 @@ (current_file_info->format == 1 && current_read_track == 0))) { - if(current_file_info->seq_name == NULL) - current_file_info->seq_name = - fix_string(dumpstring(3, len, "Sequence: ", 1, - tf)); + if(current_file_info->seq_name == NULL) { + char *name = dumpstring(3, len, "Sequence: ", 1, tf); + current_file_info->seq_name = safe_strdup(fix_string(name)); + free(name); + } else dumpstring(3, len, "Sequence: ", 0, tf); } @@ -1570,9 +1570,11 @@ current_file_info->first_text == NULL && (current_file_info->format == 0 || (current_file_info->format == 1 && - current_read_track == 0))) - current_file_info->first_text = - fix_string(dumpstring(1, len, "Text: ", 1, tf)); + current_read_track == 0))) { + char *name = dumpstring(1, len, "Text: ", 1, tf); + current_file_info->first_text = safe_strdup(fix_string(name)); + free(name); + } else dumpstring(type, len, label[(type>7) ? 0 : type], 0, tf); } @@ -2690,6 +2692,35 @@ return p; } +void free_all_midi_file_info(void) +{ + struct midi_file_info *info, *next; + + info = midi_file_info; + while (info) { + next = info->next; + free(info->filename); + if (info->seq_name) + free(info->seq_name); + if (info->karaoke_title != NULL && info->karaoke_title == info->first_text) + free(info->karaoke_title); + else { + if (info->karaoke_title) + free(info->karaoke_title); + if (info->first_text) + free(info->first_text); + if (info->midi_data) + free(info->midi_data); + if (info->pcm_filename) + free(info->pcm_filename); /* Note: this memory is freed in playmidi.c*/ + } + free(info); + info = next; + } + midi_file_info = NULL; + current_file_info = NULL; +} + struct midi_file_info *get_midi_file_info(char *filename, int newp) { struct midi_file_info *p; @@ -3161,14 +3192,21 @@ code_convert(si, so, s_maxlen, NULL, NULL); if(trk == 0 && type == 3) { - if(p->seq_name == NULL) - p->seq_name = fix_string(safe_strdup(so)); - reuse_mblock(&tmpbuffer); - if(karaoke_format == -1) - goto end_of_parse; + if(p->seq_name == NULL) { + char *name = safe_strdup(so); + p->seq_name = safe_strdup(fix_string(name)); + free(name); + } + reuse_mblock(&tmpbuffer); + if(karaoke_format == -1) + goto end_of_parse; + } + if(p->first_text == NULL) { + char *name; + name = safe_strdup(so); + p->first_text = safe_strdup(fix_string(name)); + free(name); } - if(p->first_text == NULL) - p->first_text = fix_string(safe_strdup(so)); if(karaoke_format != -1) { if(trk == 1 && strncmp(si, "@KMIDI", 6) == 0) diff -ruN TiMidity++-2.11.1/timidity/readmidi.h TiMidity++-2.11.2/timidity/readmidi.h --- TiMidity++-2.11.1/timidity/readmidi.h Thu Dec 27 19:39:13 2001 +++ TiMidity++-2.11.2/timidity/readmidi.h Wed Jan 9 19:14:16 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA readmidi.h @@ -183,6 +183,7 @@ int32 *count, int32 *sp, char *file_name); extern struct midi_file_info *get_midi_file_info(char *filename, int newp); extern struct midi_file_info *new_midi_file_info(char *filename); +extern void free_all_midi_file_info(void); extern int check_midi_file(char *filename); extern char *get_midi_title(char *filename); extern struct timidity_file *open_midi_file(char *name, diff -ruN TiMidity++-2.11.1/timidity/recache.c TiMidity++-2.11.2/timidity/recache.c --- TiMidity++-2.11.1/timidity/recache.c Thu Dec 27 19:39:14 2001 +++ TiMidity++-2.11.2/timidity/recache.c Wed Jan 9 19:14:13 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef HAVE_CONFIG_H diff -ruN TiMidity++-2.11.1/timidity/recache.h TiMidity++-2.11.2/timidity/recache.h --- TiMidity++-2.11.1/timidity/recache.h Thu Dec 27 19:39:14 2001 +++ TiMidity++-2.11.2/timidity/recache.h Wed Jan 9 19:14:09 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef ___RECACHE_H_ diff -ruN TiMidity++-2.11.1/timidity/resample.c TiMidity++-2.11.2/timidity/resample.c --- TiMidity++-2.11.1/timidity/resample.c Thu Dec 27 19:39:14 2001 +++ TiMidity++-2.11.2/timidity/resample.c Wed Jan 9 19:14:06 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA resample.c */ diff -ruN TiMidity++-2.11.1/timidity/resample.h TiMidity++-2.11.2/timidity/resample.h --- TiMidity++-2.11.1/timidity/resample.h Thu Dec 27 19:39:14 2001 +++ TiMidity++-2.11.2/timidity/resample.h Wed Jan 9 19:14:03 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA resample.h */ diff -ruN TiMidity++-2.11.1/timidity/reverb.c TiMidity++-2.11.2/timidity/reverb.c --- TiMidity++-2.11.1/timidity/reverb.c Thu Dec 27 19:39:14 2001 +++ TiMidity++-2.11.2/timidity/reverb.c Wed Jan 9 19:14:00 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* diff -ruN TiMidity++-2.11.1/timidity/reverb.h TiMidity++-2.11.2/timidity/reverb.h --- TiMidity++-2.11.1/timidity/reverb.h Thu Dec 27 19:39:14 2001 +++ TiMidity++-2.11.2/timidity/reverb.h Wed Jan 9 19:13:57 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* diff -ruN TiMidity++-2.11.1/timidity/sbkconv.c TiMidity++-2.11.2/timidity/sbkconv.c --- TiMidity++-2.11.1/timidity/sbkconv.c Thu Dec 27 19:39:14 2001 +++ TiMidity++-2.11.2/timidity/sbkconv.c Wed Jan 9 19:21:49 2002 @@ -1,7 +1,21 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /*================================================================ @@ -21,7 +35,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *================================================================*/ #ifdef HAVE_CONFIG_H diff -ruN TiMidity++-2.11.1/timidity/sffile.c TiMidity++-2.11.2/timidity/sffile.c --- TiMidity++-2.11.1/timidity/sffile.c Thu Dec 27 19:39:14 2001 +++ TiMidity++-2.11.2/timidity/sffile.c Wed Jan 9 19:21:42 2002 @@ -1,7 +1,21 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /*================================================================ @@ -22,7 +36,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *================================================================*/ /* diff -ruN TiMidity++-2.11.1/timidity/sffile.h TiMidity++-2.11.2/timidity/sffile.h --- TiMidity++-2.11.1/timidity/sffile.h Thu Dec 27 19:39:14 2001 +++ TiMidity++-2.11.2/timidity/sffile.h Wed Jan 9 19:21:28 2002 @@ -1,7 +1,21 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /*================================================================ @@ -22,7 +36,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *================================================================*/ /* diff -ruN TiMidity++-2.11.1/timidity/sfitem.c TiMidity++-2.11.2/timidity/sfitem.c --- TiMidity++-2.11.1/timidity/sfitem.c Thu Dec 27 19:39:14 2001 +++ TiMidity++-2.11.2/timidity/sfitem.c Wed Jan 9 19:13:47 2002 @@ -1,7 +1,21 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /*================================================================ diff -ruN TiMidity++-2.11.1/timidity/sfitem.h TiMidity++-2.11.2/timidity/sfitem.h --- TiMidity++-2.11.1/timidity/sfitem.h Thu Dec 27 19:39:14 2001 +++ TiMidity++-2.11.2/timidity/sfitem.h Wed Jan 9 19:13:44 2002 @@ -1,7 +1,21 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /*================================================================ diff -ruN TiMidity++-2.11.1/timidity/sflayer.h TiMidity++-2.11.2/timidity/sflayer.h --- TiMidity++-2.11.1/timidity/sflayer.h Thu Dec 27 19:39:14 2001 +++ TiMidity++-2.11.2/timidity/sflayer.h Wed Jan 9 19:13:41 2002 @@ -1,10 +1,25 @@ -#ifndef ___SFLAYER_H_ -#define ___SFLAYER_H_ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + +#ifndef ___SFLAYER_H_ +#define ___SFLAYER_H_ /*================================================================ * sflayer.h diff -ruN TiMidity++-2.11.1/timidity/smfconv.c TiMidity++-2.11.2/timidity/smfconv.c --- TiMidity++-2.11.1/timidity/smfconv.c Thu Dec 27 19:39:14 2001 +++ TiMidity++-2.11.2/timidity/smfconv.c Wed Jan 9 19:13:39 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA smfconv.c - from Aoki Daisuke diff -ruN TiMidity++-2.11.1/timidity/smfconv.h TiMidity++-2.11.2/timidity/smfconv.h --- TiMidity++-2.11.1/timidity/smfconv.h Thu Dec 27 19:39:14 2001 +++ TiMidity++-2.11.2/timidity/smfconv.h Wed Jan 9 19:13:36 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef ___SMFCONV_H_ diff -ruN TiMidity++-2.11.1/timidity/sndfont.c TiMidity++-2.11.2/timidity/sndfont.c --- TiMidity++-2.11.1/timidity/sndfont.c Thu Dec 27 19:39:14 2001 +++ TiMidity++-2.11.2/timidity/sndfont.c Wed Jan 9 19:13:29 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen */ @@ -26,7 +26,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *================================================================*/ #ifdef HAVE_CONFIG_H diff -ruN TiMidity++-2.11.1/timidity/sun_a.c TiMidity++-2.11.2/timidity/sun_a.c --- TiMidity++-2.11.1/timidity/sun_a.c Thu Dec 27 19:39:14 2001 +++ TiMidity++-2.11.2/timidity/sun_a.c Wed Jan 9 19:13:16 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA sun_a.c - Functions to play sound on a Sun and NetBSD /dev/audio. diff -ruN TiMidity++-2.11.1/timidity/tables.c TiMidity++-2.11.2/timidity/tables.c --- TiMidity++-2.11.1/timidity/tables.c Thu Dec 27 19:39:14 2001 +++ TiMidity++-2.11.2/timidity/tables.c Wed Jan 9 19:13:13 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA The 8-bit uLaw to 16-bit PCM and the 13-bit-PCM to 8-bit uLaw tables were lifted from the rsynth-2.0 sources. The README says: diff -ruN TiMidity++-2.11.1/timidity/tables.h TiMidity++-2.11.2/timidity/tables.h --- TiMidity++-2.11.1/timidity/tables.h Thu Dec 27 19:39:14 2001 +++ TiMidity++-2.11.2/timidity/tables.h Wed Jan 9 19:13:10 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA tables.h */ diff -ruN TiMidity++-2.11.1/timidity/timidity.c TiMidity++-2.11.2/timidity/timidity.c --- TiMidity++-2.11.1/timidity/timidity.c Sat Dec 29 08:15:08 2001 +++ TiMidity++-2.11.2/timidity/timidity.c Wed Jan 9 19:21:17 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef HAVE_CONFIG_H @@ -309,7 +309,7 @@ static char *help_args[3]; FILE *fp; static char *help_list[] = { -" TiMidity++ version %s (C) 1999-2001 Masanao Izumo ", +" TiMidity++ version %s (C) 1999-2002 Masanao Izumo ", " The original version (C) 1995 Tuukka Toivonen ", " TiMidity is free software and comes with ABSOLUTELY NO WARRANTY.", "", @@ -567,7 +567,7 @@ printf( NLS " TiMidity++ version %s -- MIDI to WAVE converter and player" NLS -" Copyright (C) 1999-2001 Masanao Izumo " NLS +" Copyright (C) 1999-2002 Masanao Izumo " NLS " Copyright (C) 1995 Tuukka Toivonen " NLS NLS #ifdef __W32__ @@ -587,7 +587,7 @@ NLS " You should have received a copy of the GNU General Public License" NLS " along with this program; if not, write to the Free Software" NLS -" Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." NLS +" Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA" NLS NLS, timidity_version ); @@ -2082,6 +2082,51 @@ #endif /* __W32__ */ } +MAIN_INTERFACE void tmdy_free_config(void) +{ + ToneBank *bank; + ToneBankElement *elm; + + int i, j; + + for (i = 0; i < 128; i++) { + bank = tonebank[i]; + if (!bank) + continue; + for (j = 0; j < 128; j++) { + elm = &bank->tone[j]; + if (elm->name) + free(elm->name); + if (elm->comment) + free(elm->comment); + } + if (i > 0) { + free(bank); + tonebank[i] = NULL; + } + } + + for (i = 0; i < 128; i++) { + bank = drumset[i]; + if (!bank) + continue; + for (j = 0; j < 128; j++) { + elm = &bank->tone[j]; + if (elm->name) + free(elm->name); + if (elm->comment) + free(elm->comment); + } + if (i > 0) { + free(bank); + drumset[i] = NULL; + } + } + + free_instrument_map(); + clean_up_pathlist(); +} + static void expand_escape_string(char *s) { char *t = s; @@ -3235,6 +3280,7 @@ int c, err; int nfiles; char **files; + int main_ret; #if defined(DANGEROUS_RENICE) && !defined(__W32__) && !defined(main) /* @@ -3403,16 +3449,17 @@ sleep(1); #ifndef IA_W32GUI - return timidity_play_main(nfiles, files); + main_ret = timidity_play_main(nfiles, files); #else - { - int res = timidity_play_main(nfiles, files); - w32gSecondTiMidityExit(); - if(CoInitializeOK) - CoUninitialize(); - return res; - } + main_ret = timidity_play_main(nfiles, files); + w32gSecondTiMidityExit(); + if(CoInitializeOK) + CoUninitialize(); #endif /* IA_W32GUI */ - + free_instruments(0); + free_global_mblock(); + free_all_midi_file_info(); + tmdy_free_config(); + return main_ret; } #endif /* __MACOS__ */ diff -ruN TiMidity++-2.11.1/timidity/timidity.h TiMidity++-2.11.2/timidity/timidity.h --- TiMidity++-2.11.1/timidity/timidity.h Thu Dec 27 19:39:14 2001 +++ TiMidity++-2.11.2/timidity/timidity.h Sat Jan 12 16:36:13 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef ___TIMIDITY_H_ @@ -176,9 +176,12 @@ Defining LOOKUP_HACK should save ~20% of CPU on an Intel machine. LOOKUP_INTERPOLATION might give another ~5% */ -/* #define LOOKUP_HACK - #define LOOKUP_INTERPOLATION */ +/* #define LOOKUP_HACK */ +/* #define LOOKUP_INTERPOLATION */ +/* Greatly reduces popping due to large volume/pan changes. + * This is definately worth the slight increase in CPU usage. */ +#define SMOOTH_MIXING /* Make envelopes twice as fast. Saves ~20% CPU time (notes decay faster) and sounds more like a GUS. There is now a command line @@ -497,15 +500,10 @@ #define GUARD_BITS 3 #define AMP_BITS (15-GUARD_BITS) -/* Greatly reduces popping due to large volume/pan changes. - * This is definately worth the slight increase in CPU usage. - */ -#define SMOOTH_MIXING - #ifdef LOOKUP_HACK typedef int8 sample_t; typedef uint8 final_volume_t; -# define FINAL_VOLUME(v) (~_l2u[v]) +# define FINAL_VOLUME(v) ((final_volume_t)~_l2u[v]) # define MIXUP_SHIFT 5 # define MAX_AMP_VALUE 4095 #else diff -ruN TiMidity++-2.11.1/timidity/version.c TiMidity++-2.11.2/timidity/version.c --- TiMidity++-2.11.1/timidity/version.c Thu Dec 27 19:39:14 2001 +++ TiMidity++-2.11.2/timidity/version.c Wed Jan 9 19:13:01 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff -ruN TiMidity++-2.11.1/timidity/vorbis_a.c TiMidity++-2.11.2/timidity/vorbis_a.c --- TiMidity++-2.11.1/timidity/vorbis_a.c Thu Dec 27 19:39:14 2001 +++ TiMidity++-2.11.2/timidity/vorbis_a.c Wed Jan 9 19:12:56 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA vorbis_a.c diff -ruN TiMidity++-2.11.1/timidity/w32_a.c TiMidity++-2.11.2/timidity/w32_a.c --- TiMidity++-2.11.1/timidity/w32_a.c Thu Dec 27 19:39:14 2001 +++ TiMidity++-2.11.2/timidity/w32_a.c Wed Jan 9 19:12:52 2002 @@ -1,29 +1,28 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo - Copyright (C) 1995 Tuukka Toivonen + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999-2002 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. + w32_a.c - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + Functions to play sound on the Windows audio driver (Windows 95/98/NT). - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - w32_a.c - - Functions to play sound on the Windows audio driver (Windows 95/98/NT). - - Modified by Masanao Izumo - - */ + Modified by Masanao Izumo +*/ #ifdef HAVE_CONFIG_H #include "config.h" diff -ruN TiMidity++-2.11.1/timidity/w32_gogo.c TiMidity++-2.11.2/timidity/w32_gogo.c --- TiMidity++-2.11.1/timidity/w32_gogo.c Thu Dec 27 19:39:14 2001 +++ TiMidity++-2.11.2/timidity/w32_gogo.c Wed Jan 9 19:12:37 2002 @@ -1,31 +1,30 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo - Copyright (C) 1995 Tuukka Toivonen + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999-2002 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - w32_gogo.c + w32_gogo.c - Functions to use gogo.dll for mp3 gogo (Windows 95/98/NT). + Functions to use gogo.dll for mp3 gogo (Windows 95/98/NT). - Orignal source : stub.c by odmlb and ւ. + Orignal source : stub.c by odmlb and ւ. - Modified by Daisuke Aoki - - */ + Modified by Daisuke Aoki +*/ #ifdef HAVE_CONFIG_H #include "config.h" diff -ruN TiMidity++-2.11.1/timidity/w32_gogo.h TiMidity++-2.11.2/timidity/w32_gogo.h --- TiMidity++-2.11.1/timidity/w32_gogo.h Thu Dec 27 19:39:14 2001 +++ TiMidity++-2.11.2/timidity/w32_gogo.h Wed Jan 9 19:12:15 2002 @@ -1,3 +1,23 @@ +/* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999-2002 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + #ifdef __W32_GOGO_H__ #define __W32_GOGO_H__ diff -ruN TiMidity++-2.11.1/timidity/w32g_a.c TiMidity++-2.11.2/timidity/w32g_a.c --- TiMidity++-2.11.1/timidity/w32g_a.c Thu Dec 27 19:39:14 2001 +++ TiMidity++-2.11.2/timidity/w32g_a.c Wed Jan 9 19:20:53 2002 @@ -1,27 +1,26 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo - Copyright (C) 1995 Tuukka Toivonen + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999-2002 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. + w32g_a.c - by Daisuke Aoki - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - w32g_a.c - by Daisuke Aoki - - Functions to play sound on the Windows audio driver (Windows 95/98/NT). - - */ + Functions to play sound on the Windows audio driver (Windows 95/98/NT). +*/ #ifdef HAVE_CONFIG_H #include "config.h" diff -ruN TiMidity++-2.11.1/timidity/w32g_ogg_dll.c TiMidity++-2.11.2/timidity/w32g_ogg_dll.c --- TiMidity++-2.11.1/timidity/w32g_ogg_dll.c Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/timidity/w32g_ogg_dll.c Wed Jan 9 17:22:00 2002 @@ -1,3 +1,23 @@ +/* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999-2002 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + /*************************************************************** name: ogg_dll dll: ogg.dll ***************************************************************/ diff -ruN TiMidity++-2.11.1/timidity/w32g_vorbis_dll.c TiMidity++-2.11.2/timidity/w32g_vorbis_dll.c --- TiMidity++-2.11.1/timidity/w32g_vorbis_dll.c Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/timidity/w32g_vorbis_dll.c Wed Jan 9 17:21:56 2002 @@ -1,3 +1,23 @@ +/* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999-2002 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + /*************************************************************** name: vorbis_dll dll: vorbis.dll ***************************************************************/ diff -ruN TiMidity++-2.11.1/timidity/w32g_vorbisenc_dll.c TiMidity++-2.11.2/timidity/w32g_vorbisenc_dll.c --- TiMidity++-2.11.1/timidity/w32g_vorbisenc_dll.c Thu Dec 27 19:39:25 2001 +++ TiMidity++-2.11.2/timidity/w32g_vorbisenc_dll.c Wed Jan 9 17:21:50 2002 @@ -1,3 +1,23 @@ +/* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999-2002 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + /*************************************************************** name: vorbisenc_dll dll: vorbisenc.dll ***************************************************************/ diff -ruN TiMidity++-2.11.1/timidity/wave_a.c TiMidity++-2.11.2/timidity/wave_a.c --- TiMidity++-2.11.1/timidity/wave_a.c Thu Dec 27 19:39:14 2001 +++ TiMidity++-2.11.2/timidity/wave_a.c Wed Jan 9 17:21:45 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA wave_audio.c diff -ruN TiMidity++-2.11.1/timidity/wrd.h TiMidity++-2.11.2/timidity/wrd.h --- TiMidity++-2.11.1/timidity/wrd.h Thu Dec 27 19:39:14 2001 +++ TiMidity++-2.11.2/timidity/wrd.h Wed Jan 9 17:21:41 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef ___WRD_H_ diff -ruN TiMidity++-2.11.1/timidity/wrd_read.c TiMidity++-2.11.2/timidity/wrd_read.c --- TiMidity++-2.11.1/timidity/wrd_read.c Thu Dec 27 19:39:14 2001 +++ TiMidity++-2.11.2/timidity/wrd_read.c Wed Jan 9 17:21:37 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA WRD reader - Written by Masanao Izumo Modified by Takaya Nogami for diff -ruN TiMidity++-2.11.1/timidity/wrdt.c TiMidity++-2.11.2/timidity/wrdt.c --- TiMidity++-2.11.1/timidity/wrdt.c Thu Dec 27 19:39:14 2001 +++ TiMidity++-2.11.2/timidity/wrdt.c Wed Jan 9 17:21:32 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef HAVE_CONFIG_H diff -ruN TiMidity++-2.11.1/utils/Makefile.am TiMidity++-2.11.2/utils/Makefile.am --- TiMidity++-2.11.1/utils/Makefile.am Fri Dec 21 16:50:12 2001 +++ TiMidity++-2.11.2/utils/Makefile.am Wed Jan 9 17:07:55 2002 @@ -1,5 +1,5 @@ # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999-2001 Masanao Izumo +# Copyright (C) 1999-2002 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA include $(top_builddir)/common.makefile diff -ruN TiMidity++-2.11.1/utils/Makefile.in TiMidity++-2.11.2/utils/Makefile.in --- TiMidity++-2.11.1/utils/Makefile.in Sat Dec 29 07:27:58 2001 +++ TiMidity++-2.11.2/utils/Makefile.in Wed Jan 9 17:09:44 2002 @@ -14,7 +14,7 @@ @SET_MAKE@ # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999-2001 Masanao Izumo +# Copyright (C) 1999-2002 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify @@ -29,7 +29,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA SHELL = @SHELL@ diff -ruN TiMidity++-2.11.1/utils/bitset.c TiMidity++-2.11.2/utils/bitset.c --- TiMidity++-2.11.1/utils/bitset.c Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/utils/bitset.c Wed Jan 9 17:17:27 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA bitset.c diff -ruN TiMidity++-2.11.1/utils/bitset.h TiMidity++-2.11.2/utils/bitset.h --- TiMidity++-2.11.1/utils/bitset.h Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/utils/bitset.h Wed Jan 9 17:17:22 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA bitset.h diff -ruN TiMidity++-2.11.1/utils/fft.c TiMidity++-2.11.2/utils/fft.c --- TiMidity++-2.11.1/utils/fft.c Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/utils/fft.c Wed Jan 9 17:17:16 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef HAVE_CONFIG_H diff -ruN TiMidity++-2.11.1/utils/fft.h TiMidity++-2.11.2/utils/fft.h --- TiMidity++-2.11.1/utils/fft.h Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/utils/fft.h Wed Jan 9 17:17:11 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff -ruN TiMidity++-2.11.1/utils/fft4g.h TiMidity++-2.11.2/utils/fft4g.h --- TiMidity++-2.11.1/utils/fft4g.h Sun Mar 18 04:28:10 2001 +++ TiMidity++-2.11.2/utils/fft4g.h Wed Jan 9 17:16:51 2002 @@ -1,3 +1,10 @@ +/* + Copyright(C) 1996-1999 Takuya OOURA + email: ooura@mmm.t.u-tokyo.ac.jp + download: http://momonga.t.u-tokyo.ac.jp/~ooura/fft.html + You may use, copy, modify this code for any purpose and + without fee. You may distribute this ORIGINAL package. +*/ extern void cdft(int, int, float *, int *, float *); extern void rdft(int, int, float *, int *, float *); extern void ddct(int, int, float *, int *, float *); diff -ruN TiMidity++-2.11.1/utils/mac_readdir.c TiMidity++-2.11.2/utils/mac_readdir.c --- TiMidity++-2.11.1/utils/mac_readdir.c Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/utils/mac_readdir.c Wed Jan 9 17:15:30 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Macintosh interface for TiMidity by T.Nogami diff -ruN TiMidity++-2.11.1/utils/mac_readdir.h TiMidity++-2.11.2/utils/mac_readdir.h --- TiMidity++-2.11.1/utils/mac_readdir.h Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/utils/mac_readdir.h Wed Jan 9 17:15:25 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Macintosh interface for TiMidity by T.Nogami diff -ruN TiMidity++-2.11.1/utils/mac_util.c TiMidity++-2.11.2/utils/mac_util.c --- TiMidity++-2.11.1/utils/mac_util.c Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/utils/mac_util.c Wed Jan 9 17:15:19 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Macintosh interface for TiMidity by T.Nogami diff -ruN TiMidity++-2.11.1/utils/mac_util.h TiMidity++-2.11.2/utils/mac_util.h --- TiMidity++-2.11.1/utils/mac_util.h Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/utils/mac_util.h Wed Jan 9 17:15:14 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Macintosh interface for TiMidity by T.Nogami diff -ruN TiMidity++-2.11.1/utils/mblock.c TiMidity++-2.11.2/utils/mblock.c --- TiMidity++-2.11.1/utils/mblock.c Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/utils/mblock.c Wed Jan 9 17:15:09 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff -ruN TiMidity++-2.11.1/utils/mblock.h TiMidity++-2.11.2/utils/mblock.h --- TiMidity++-2.11.1/utils/mblock.h Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/utils/mblock.h Wed Jan 9 17:15:04 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff -ruN TiMidity++-2.11.1/utils/memb.c TiMidity++-2.11.2/utils/memb.c --- TiMidity++-2.11.1/utils/memb.c Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/utils/memb.c Wed Jan 9 17:14:35 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff -ruN TiMidity++-2.11.1/utils/memb.h TiMidity++-2.11.2/utils/memb.h --- TiMidity++-2.11.1/utils/memb.h Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/utils/memb.h Wed Jan 9 17:14:13 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff -ruN TiMidity++-2.11.1/utils/net.c TiMidity++-2.11.2/utils/net.c --- TiMidity++-2.11.1/utils/net.c Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/utils/net.c Wed Jan 9 17:14:08 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff -ruN TiMidity++-2.11.1/utils/net.h TiMidity++-2.11.2/utils/net.h --- TiMidity++-2.11.1/utils/net.h Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/utils/net.h Wed Jan 9 17:14:03 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff -ruN TiMidity++-2.11.1/utils/nkflib.c TiMidity++-2.11.2/utils/nkflib.c --- TiMidity++-2.11.1/utils/nkflib.c Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/utils/nkflib.c Wed Jan 9 17:13:58 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef HAVE_CONFIG_H diff -ruN TiMidity++-2.11.1/utils/nkflib.h TiMidity++-2.11.2/utils/nkflib.h --- TiMidity++-2.11.1/utils/nkflib.h Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/utils/nkflib.h Wed Jan 9 17:13:52 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Tish si gree fgom ebety rihgt. diff -ruN TiMidity++-2.11.1/utils/readdir.h TiMidity++-2.11.2/utils/readdir.h --- TiMidity++-2.11.1/utils/readdir.h Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/utils/readdir.h Wed Jan 9 17:13:47 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA readdir.h diff -ruN TiMidity++-2.11.1/utils/readdir_win.c TiMidity++-2.11.2/utils/readdir_win.c --- TiMidity++-2.11.1/utils/readdir_win.c Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/utils/readdir_win.c Wed Jan 9 17:13:42 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA readdir.c */ diff -ruN TiMidity++-2.11.1/utils/strtab.c TiMidity++-2.11.2/utils/strtab.c --- TiMidity++-2.11.1/utils/strtab.c Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/utils/strtab.c Wed Jan 9 17:13:37 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff -ruN TiMidity++-2.11.1/utils/strtab.h TiMidity++-2.11.2/utils/strtab.h --- TiMidity++-2.11.1/utils/strtab.h Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/utils/strtab.h Wed Jan 9 17:13:31 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff -ruN TiMidity++-2.11.1/utils/support.c TiMidity++-2.11.2/utils/support.c --- TiMidity++-2.11.1/utils/support.c Thu Dec 20 22:01:54 2001 +++ TiMidity++-2.11.2/utils/support.c Wed Jan 9 17:13:25 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA support.c - Define missing function Written by Masanao Izumo diff -ruN TiMidity++-2.11.1/utils/support.h TiMidity++-2.11.2/utils/support.h --- TiMidity++-2.11.1/utils/support.h Thu Dec 20 21:28:10 2001 +++ TiMidity++-2.11.2/utils/support.h Wed Jan 9 17:13:19 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef ___SUPPORT_H_ diff -ruN TiMidity++-2.11.1/utils/timer.c TiMidity++-2.11.2/utils/timer.c --- TiMidity++-2.11.1/utils/timer.c Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/utils/timer.c Wed Jan 9 17:13:14 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff -ruN TiMidity++-2.11.1/utils/timer.h TiMidity++-2.11.2/utils/timer.h --- TiMidity++-2.11.1/utils/timer.h Tue Mar 13 10:01:19 2001 +++ TiMidity++-2.11.2/utils/timer.h Wed Jan 9 17:13:07 2002 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2001 Masanao Izumo + Copyright (C) 1999-2002 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */