diff -ruN TiMidity++-2.8.1/ChangeLog TiMidity++-2.8.2/ChangeLog --- TiMidity++-2.8.1/ChangeLog Mon Nov 29 11:59:52 1999 +++ TiMidity++-2.8.2/ChangeLog Mon Feb 7 15:33:27 2000 @@ -1,3 +1,57 @@ +2000-02-07 Masanao Izumo + + * Version 2.8.2 released. + +2000-02-07 Katsuhiro Ueno + + * timidity/alsa_a.c: Improved. + +2000-02-07 Masanao Izumo + + * timidity/alsa_a.c: Fixed for ALSA 0.4 + * configure.in: + Add a test of -lpdcurses for the curses library. + Use *-*-cygwin* for matching $target to CYGWIN. + * all files: Update copyright line. + +2000-02-02 Katsuhiro Ueno + + * timidity/{aq.c,aq.h,output.h,timidity.c,alsa_a.c}: + Support for ALSA 0.5 + +2000-01-10 Peter Stuer + + * timidity/w32_a.c: Fixed dead-lock probrem on NT (for console version). + +2000-01-09 Eric A. Welsh + + * timidity/{recache.c,resample.c}: Optimized. + +2000-01-06 Eric A. Welsh + + * timidity/playmici.c: Fixed a bug of random pan. + +2000-01-13 Masanao Izumo + + * timidity/sndfont.c (def_drum_inst): Removed. + +2000-01-09 Masanao Izumo + + * config.sub config.guss install-sh: Update new version from autoconf 2.13 + * configure.in: Fixed variable substitution rules. + +1999-12-24 Masanao Izumo + + * timidity/configure.in: Fixed typo. + +1999-12-20 Masanao Izumo + + * timidity/instrum.c: Bug fix. + +1999-12-02 Piotr Auksztulewicz + + * timidity/output.c: Fixed missing of semicolon. + 1999-11-29 Masanao Izumo * Version 2.8.1 released. @@ -469,9 +523,9 @@ 1999-08-20 Eric A. Welsh * timidity/{playmidi.c,playmidi.h,resample.h,timidity.c} - (cspline and langrange interpolation): + (cspline and lagrange interpolation): reduce_quality_flag: New variable to reduce CPU load for - cspline and langrange interpolation. TiMidity turns + cspline and lagrange interpolation. TiMidity turns reduce_quality_flag on when the CPU is heavily loaded. -4: New command line option to toggle whether ignore reduce_quality_flag. By default, TiMidity uses reduce_quality_flag. diff -ruN TiMidity++-2.8.1/Makefile.am TiMidity++-2.8.2/Makefile.am --- TiMidity++-2.8.1/Makefile.am Wed Sep 1 02:01:11 1999 +++ TiMidity++-2.8.2/Makefile.am Mon Feb 7 07:28:54 2000 @@ -1,5 +1,5 @@ # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999 Masanao Izumo +# Copyright (C) 1999,2000 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/Makefile.in TiMidity++-2.8.2/Makefile.in --- TiMidity++-2.8.1/Makefile.in Fri Nov 26 18:04:13 1999 +++ TiMidity++-2.8.2/Makefile.in Mon Feb 7 21:39:12 2000 @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999 Masanao Izumo +# Copyright (C) 1999,2000 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify @@ -350,6 +350,7 @@ fi; \ done $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook + info-am: info: info-recursive dvi-am: diff -ruN TiMidity++-2.8.1/NEWS TiMidity++-2.8.2/NEWS --- TiMidity++-2.8.1/NEWS Mon Nov 29 11:34:43 1999 +++ TiMidity++-2.8.2/NEWS Mon Feb 7 14:11:40 2000 @@ -1,3 +1,7 @@ +02/07, 2000 + * Version 2.8.2 released. + * Support ALSA 0.5 + 11/29, 1999 * Version 2.8.1 released. diff -ruN TiMidity++-2.8.1/common.makefile.in TiMidity++-2.8.2/common.makefile.in --- TiMidity++-2.8.1/common.makefile.in Tue Sep 7 00:44:11 1999 +++ TiMidity++-2.8.2/common.makefile.in Mon Feb 7 07:28:48 2000 @@ -1,5 +1,5 @@ # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999 Masanao Izumo +# Copyright (C) 1999,2000 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify @@ -30,6 +30,10 @@ # For pentium gcc ##CFLAGS = -O3 -mpentium -march=pentium -fomit-frame-pointer \ ## -funroll-all-loops -malign-double -ffast-math +# For PGCC +##CFLAGS = -O6 -mpentium -fomit-frame-pointer -funroll-all-loops -ffast-math \ +## -fno-peep-spills \ +## -fno-exceptions -malign-jumps=0 -malign-loops=0 -malign-functions=0 #CPPFLAGS = @CPPFLAGS@ #DEFS = @DEFS@ diff -ruN TiMidity++-2.8.1/config.guess TiMidity++-2.8.2/config.guess --- TiMidity++-2.8.1/config.guess Wed Jan 20 18:17:12 1999 +++ TiMidity++-2.8.2/config.guess Sun Jan 9 18:15:59 2000 @@ -1,6 +1,6 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 93, 94, 95, 1996 Free Software Foundation, Inc. +# Copyright (C) 1992, 93, 94, 95, 96, 97, 1998 Free Software Foundation, Inc. # # 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 @@ -52,11 +52,53 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in alpha:OSF1:*:*) + if test $UNAME_RELEASE = "V4.0"; then + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + fi # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo alpha-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//'` + cat <dummy.s + .globl main + .ent main +main: + .frame \$30,0,\$26,0 + .prologue 0 + .long 0x47e03d80 # implver $0 + lda \$2,259 + .long 0x47e20c21 # amask $2,$1 + srl \$1,8,\$2 + sll \$2,2,\$2 + sll \$0,3,\$0 + addl \$1,\$0,\$0 + addl \$2,\$0,\$0 + ret \$31,(\$26),1 + .end main +EOF + ${CC-cc} dummy.s -o dummy 2>/dev/null + if test "$?" = 0 ; then + ./dummy + case "$?" in + 7) + UNAME_MACHINE="alpha" + ;; + 15) + UNAME_MACHINE="alphaev5" + ;; + 14) + UNAME_MACHINE="alphaev56" + ;; + 10) + UNAME_MACHINE="alphapca56" + ;; + 16) + UNAME_MACHINE="alphaev6" + ;; + esac + fi + rm -f dummy.s dummy + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr [[A-Z]] [[a-z]]` exit 0 ;; 21064:Windows_NT:50:3) echo alpha-dec-winnt3.5 @@ -68,12 +110,39 @@ echo m68k-cbm-netbsd${UNAME_RELEASE} exit 0 ;; amiga:OpenBSD:*:*) - echo m68k-cbm-openbsd${UNAME_RELEASE} - exit 0 ;; + 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} + exit 0 ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit 0;; - Pyramid*:OSx*:*:*|MIS*:OSx*:*:*) + arm32:NetBSD:*:*) + echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + exit 0 ;; + SR2?01:HI-UX/MPP:*:*) + echo hppa1.1-hitachi-hiuxmpp + exit 0;; + Pyramid*:OSx*:*:*|MIS*:OSx*:*:*|MIS*:SMP_DC-OSx*:*:*) # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. if test "`(/bin/universe) 2>/dev/null`" = att ; then echo pyramid-pyramid-sysv3 @@ -84,6 +153,9 @@ NILE:*:*:dcosx) echo pyramid-pyramid-svr4 exit 0 ;; + sun4H:SunOS:5.*:*) + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit 0 ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit 0 ;; @@ -108,6 +180,18 @@ sun3*:SunOS:*:*) echo m68k-sun-sunos${UNAME_RELEASE} exit 0 ;; + sun*:*:4.2BSD:*) + UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 + case "`/bin/arch`" in + sun3) + echo m68k-sun-sunos${UNAME_RELEASE} + ;; + sun4) + echo sparc-sun-sunos${UNAME_RELEASE} + ;; + esac + exit 0 ;; aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} exit 0 ;; @@ -115,23 +199,32 @@ echo m68k-atari-netbsd${UNAME_RELEASE} exit 0 ;; atari*:OpenBSD:*:*) - echo m68k-atari-openbsd${UNAME_RELEASE} + echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; sun3*:NetBSD:*:*) echo m68k-sun-netbsd${UNAME_RELEASE} exit 0 ;; sun3*:OpenBSD:*:*) - echo m68k-sun-openbsd${UNAME_RELEASE} + echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; mac68k:NetBSD:*:*) echo m68k-apple-netbsd${UNAME_RELEASE} exit 0 ;; mac68k:OpenBSD:*:*) - echo m68k-apple-openbsd${UNAME_RELEASE} + 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 ;; + macppc:NetBSD:*:*) + echo powerpc-apple-netbsd${UNAME_RELEASE} + exit 0 ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 exit 0 ;; @@ -141,6 +234,9 @@ VAX*:ULTRIX*:*:*) echo vax-dec-ultrix${UNAME_RELEASE} exit 0 ;; + 2020:CLIX:*:*) + echo clipper-intergraph-clix${UNAME_RELEASE} + exit 0 ;; mips:*:*:UMIPS | mips:*:*:RISCos) sed 's/^ //' << EOF >dummy.c int main (argc, argv) int argc; char **argv; { @@ -234,7 +330,8 @@ fi exit 0 ;; *:AIX:*:4) - if /usr/sbin/lsattr -EHl proc0 | grep POWER >/dev/null 2>&1; then + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'` + if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then IBM_ARCH=rs6000 else IBM_ARCH=powerpc @@ -267,12 +364,44 @@ hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) echo m68k-hp-bsd4.4 exit 0 ;; - 9000/[3478]??:HP-UX:*:*) + 9000/[34678]??:HP-UX:*:*) case "${UNAME_MACHINE}" in 9000/31? ) HP_ARCH=m68000 ;; 9000/[34]?? ) HP_ARCH=m68k ;; - 9000/7?? | 9000/8?[1679] ) HP_ARCH=hppa1.1 ;; - 9000/8?? ) HP_ARCH=hppa1.0 ;; + 9000/6?? | 9000/7?? | 9000/80[24] | 9000/8?[13679] | 9000/892 ) + sed 's/^ //' << EOF >dummy.c + #include + #include + + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); + + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } +EOF + (${CC-cc} dummy.c -o dummy 2>/dev/null ) && HP_ARCH=`./dummy` + rm -f dummy.c dummy esac HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` echo ${HP_ARCH}-hp-hpux${HPUX_REV} @@ -375,8 +504,11 @@ hp3[0-9][05]:NetBSD:*:*) echo m68k-hp-netbsd${UNAME_RELEASE} exit 0 ;; - hp3[0-9][05]:OpenBSD:*:*) - echo m68k-hp-openbsd${UNAME_RELEASE} + hp300:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + sparc*:BSD/OS:*:*) + echo sparc-unknown-bsdi${UNAME_RELEASE} exit 0 ;; i?86:BSD/386:*:* | *:BSD/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} @@ -391,52 +523,146 @@ echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` exit 0 ;; i*:CYGWIN*:*) - echo i386-pc-cygwin32 + echo ${UNAME_MACHINE}-pc-cygwin + exit 0 ;; + i*:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 exit 0 ;; p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin32 + echo powerpcle-unknown-cygwin exit 0 ;; prep*:SunOS:5.*:*) echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit 0 ;; *:GNU:*:*) - echo `echo ${UNAME_MACHINE}|sed -e 's,/.*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit 0 ;; *:Linux:*:*) + # uname on the ARM produces all sorts of strangeness, and we need to + # filter it out. + case "$UNAME_MACHINE" in + arm* | sa110*) UNAME_MACHINE="arm" ;; + esac + # The BFD linker knows what the default object file format is, so # first see if it will tell us. ld_help_string=`ld --help 2>&1` - if echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf_i.86"; then - echo "${UNAME_MACHINE}-pc-linux-gnu" ; exit 0 - elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i.86linux"; then - echo "${UNAME_MACHINE}-pc-linux-gnuaout" ; exit 0 - elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i.86coff"; then - echo "${UNAME_MACHINE}-pc-linux-gnucoff" ; exit 0 - elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: m68kelf"; then - echo "${UNAME_MACHINE}-unknown-linux-gnu" ; exit 0 - elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: m68klinux"; then - echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 - elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf32ppc"; then - echo "powerpc-unknown-linux-gnu" ; exit 0 - elif test "${UNAME_MACHINE}" = "alpha" ; then - echo alpha-unknown-linux-gnu ; exit 0 - elif test "${UNAME_MACHINE}" = "sparc" ; then - echo sparc-unknown-linux-gnu ; exit 0 - else - # Either a pre-BFD a.out linker (linux-gnuoldld) or one that does not give us - # useful --help. Gcc wants to distinguish between linux-gnuoldld and linux-gnuaout. - test ! -d /usr/lib/ldscripts/. \ - && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0 + ld_supported_emulations=`echo $ld_help_string \ + | sed -ne '/supported emulations:/!d + s/[ ][ ]*/ /g + s/.*supported emulations: *// + s/ .*// + p'` + case "$ld_supported_emulations" in + i?86linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" ; exit 0 ;; + i?86coff) echo "${UNAME_MACHINE}-pc-linux-gnucoff" ; exit 0 ;; + sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; + armlinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; + m68klinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; + elf32ppc) echo "powerpc-unknown-linux-gnu" ; exit 0 ;; + esac + + if test "${UNAME_MACHINE}" = "alpha" ; then + sed 's/^ //' <dummy.s + .globl main + .ent main + main: + .frame \$30,0,\$26,0 + .prologue 0 + .long 0x47e03d80 # implver $0 + lda \$2,259 + .long 0x47e20c21 # amask $2,$1 + srl \$1,8,\$2 + sll \$2,2,\$2 + sll \$0,3,\$0 + addl \$1,\$0,\$0 + addl \$2,\$0,\$0 + ret \$31,(\$26),1 + .end main +EOF + LIBC="" + ${CC-cc} dummy.s -o dummy 2>/dev/null + if test "$?" = 0 ; then + ./dummy + case "$?" in + 7) + UNAME_MACHINE="alpha" + ;; + 15) + UNAME_MACHINE="alphaev5" + ;; + 14) + UNAME_MACHINE="alphaev56" + ;; + 10) + UNAME_MACHINE="alphapca56" + ;; + 16) + UNAME_MACHINE="alphaev6" + ;; + esac + + objdump --private-headers dummy | \ + grep ld.so.1 > /dev/null + if test "$?" = 0 ; then + LIBC="libc1" + fi + fi + rm -f dummy.s dummy + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0 + elif test "${UNAME_MACHINE}" = "mips" ; then + cat >dummy.c </dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0 + rm -f dummy.c dummy + else + # Either a pre-BFD a.out linker (linux-gnuoldld) + # or one that does not give us useful --help. + # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout. + # If ld does not provide *any* "supported emulations:" + # that means it is gnuoldld. + echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:" + test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0 + + case "${UNAME_MACHINE}" in + i?86) + VENDOR=pc; + ;; + *) + VENDOR=unknown; + ;; + esac # Determine whether the default compiler is a.out or elf cat >dummy.c < main(argc, argv) -int argc; -char *argv[]; + int argc; + char *argv[]; { #ifdef __ELF__ - printf ("%s-pc-linux-gnu\n", argv[1]); +# ifdef __GLIBC__ +# if __GLIBC__ >= 2 + printf ("%s-${VENDOR}-linux-gnu\n", argv[1]); +# else + printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]); +# endif +# else + printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]); +# endif #else - printf ("%s-pc-linux-gnuaout\n", argv[1]); + printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]); #endif return 0; } @@ -449,6 +675,14 @@ i?86:DYNIX/ptx:4*:*) echo i386-sequent-sysv4 exit 0 ;; + i?86:UNIX_SV:4.2MP:2.*) + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, + # I just have to hope. -- rms. + # Use sysv4.2uw... so that sysv4* matches it. + echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + exit 0 ;; i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*) if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE} @@ -470,6 +704,18 @@ echo ${UNAME_MACHINE}-pc-sysv32 fi exit 0 ;; + i?86:UnixWare:*:*) + if /bin/uname -X 2>/dev/null >/dev/null ; then + (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ + && UNAME_MACHINE=i586 + fi + echo ${UNAME_MACHINE}-unixware-${UNAME_RELEASE}-${UNAME_VERSION} + exit 0 ;; + pc:*:*:*) + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i386. + echo i386-pc-msdosdjgpp + exit 0 ;; Intel:Mach:3*:*) echo i386-pc-mach3 exit 0 ;; @@ -529,6 +775,10 @@ echo ns32k-sni-sysv fi exit 0 ;; + PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit 0 ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm @@ -541,17 +791,25 @@ mc68*:A/UX:*:*) echo m68k-apple-aux${UNAME_RELEASE} exit 0 ;; - R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:*) + news*:NEWS-OS:*:6*) + echo mips-sony-newsos6 + exit 0 ;; + R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R4000:UNIX_SV:*:*) if [ -d /usr/nec ]; then echo mips-nec-sysv${UNAME_RELEASE} else echo mips-unknown-sysv${UNAME_RELEASE} fi exit 0 ;; - PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit 0 ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. + echo powerpc-be-beos + exit 0 ;; + BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. + echo powerpc-apple-beos + exit 0 ;; + BePC:BeOS:*:*) # BeOS running on Intel PC compatible. + echo i586-pc-beos + exit 0 ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 diff -ruN TiMidity++-2.8.1/config.sub TiMidity++-2.8.2/config.sub --- TiMidity++-2.8.1/config.sub Wed Jan 20 18:17:12 1999 +++ TiMidity++-2.8.2/config.sub Sun Jan 9 18:15:21 2000 @@ -1,6 +1,6 @@ #! /bin/sh # Configuration validation subroutine script, version 1.1. -# Copyright (C) 1991, 92, 93, 94, 95, 1996 Free Software Foundation, Inc. +# Copyright (C) 1991, 92-97, 1998 Free Software Foundation, Inc. # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software # can handle that machine. It does not imply ALL GNU software can. @@ -149,19 +149,20 @@ case $basic_machine in # Recognize the basic CPU types without company name. # Some are omitted here because they have special meanings below. - tahoe | i860 | m68k | m68000 | m88k | ns32k | arm \ - | arme[lb] | pyramid \ - | tron | a29k | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 \ - | alpha | we32k | ns16k | clipper | i370 | sh \ - | powerpc | powerpcle | 1750a | dsp16xx | mips64 | mipsel \ - | pdp11 | mips64el | mips64orion | mips64orionel \ - | sparc | sparclet | sparclite | sparc64) + tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \ + | arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \ + | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 | hppa2.0 \ + | alpha | alphaev5 | alphaev56 | we32k | ns16k | clipper \ + | i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \ + | mips64 | mipsel | mips64el | mips64orion | mips64orionel \ + | mipstx39 | mipstx39el \ + | sparc | sparclet | sparclite | sparc64 | v850) basic_machine=$basic_machine-unknown ;; # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. - i[3456]86) + i[34567]86) basic_machine=$basic_machine-pc ;; # Object if more than one company name word. @@ -170,14 +171,18 @@ exit 1 ;; # Recognize the basic CPU types with company name. - vax-* | tahoe-* | i[3456]86-* | i860-* | m68k-* | m68000-* | m88k-* \ - | sparc-* | ns32k-* | fx80-* | arm-* | c[123]* \ - | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* | power-* \ - | none-* | 580-* | cray2-* | h8300-* | i960-* | xmp-* | ymp-* \ - | hppa-* | hppa1.0-* | hppa1.1-* | alpha-* | we32k-* | cydra-* | ns16k-* \ - | pn-* | np1-* | xps100-* | clipper-* | orion-* | sparclite-* \ - | pdp11-* | sh-* | powerpc-* | powerpcle-* | sparc64-* | mips64-* | mipsel-* \ - | mips64el-* | mips64orion-* | mips64orionel-* | f301-*) + vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \ + | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \ + | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \ + | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \ + | xmp-* | ymp-* | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* \ + | alpha-* | alphaev5-* | alphaev56-* | we32k-* | cydra-* \ + | ns16k-* | pn-* | np1-* | xps100-* | clipper-* | orion-* \ + | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \ + | sparc64-* | mips64-* | mipsel-* \ + | mips64el-* | mips64orion-* | mips64orionel-* \ + | mipstx39-* | mipstx39el-* \ + | f301-*) ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. @@ -204,9 +209,9 @@ amiga | amiga-*) basic_machine=m68k-cbm ;; - amigados) + amigaos | amigados) basic_machine=m68k-cbm - os=-amigados + os=-amigaos ;; amigaunix | amix) basic_machine=m68k-cbm @@ -345,19 +350,19 @@ os=-mvs ;; # I'm not sure what "Sysv32" means. Should this be sysv3.2? - i[3456]86v32) + i[34567]86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 ;; - i[3456]86v4*) + i[34567]86v4*) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv4 ;; - i[3456]86v) + i[34567]86v) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv ;; - i[3456]86sol2) + i[34567]86sol2) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-solaris2 ;; @@ -389,6 +394,14 @@ miniframe) basic_machine=m68000-convergent ;; + mipsel*-linux*) + basic_machine=mipsel-unknown + os=-linux-gnu + ;; + mips*-linux*) + basic_machine=mips-unknown + os=-linux-gnu + ;; mips3*-*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` ;; @@ -456,25 +469,23 @@ pc532 | pc532-*) basic_machine=ns32k-pc532 ;; - pentium | p5) - basic_machine=i586-intel + pentium | p5 | k5 | nexen) + basic_machine=i586-pc + ;; + pentiumpro | p6 | k6 | 6x86) + basic_machine=i686-pc ;; - pentiumpro | p6) - basic_machine=i686-intel + pentiumii | pentium2) + basic_machine=i786-pc ;; - pentium-* | p5-*) + pentium-* | p5-* | k5-* | nexen-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - pentiumpro-* | p6-*) + pentiumpro-* | p6-* | k6-* | 6x86-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - k5) - # We don't have specific support for AMD's K5 yet, so just call it a Pentium - basic_machine=i586-amd - ;; - nexen) - # We don't have specific support for Nexgen yet, so just call it a Pentium - basic_machine=i586-nexgen + pentiumii-* | pentium2-*) + basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pn) basic_machine=pn-gould @@ -558,6 +569,12 @@ basic_machine=i386-sequent os=-dynix ;; + tx39) + basic_machine=mipstx39-unknown + ;; + tx39el) + basic_machine=mipstx39el-unknown + ;; tower | tower-32) basic_machine=m68k-ncr ;; @@ -577,7 +594,7 @@ basic_machine=vax-dec os=-vms ;; - vpp*|vx|vx-*) + vpp*|vx|vx-*) basic_machine=f301-fujitsu ;; vxworks960) @@ -607,7 +624,11 @@ # Here we handle the default manufacturer of certain CPU types. It is in # some cases the only manufacturer, in others, it is the most popular. mips) - basic_machine=mips-mips + if [ x$os = x-linux-gnu ]; then + basic_machine=mips-unknown + else + basic_machine=mips-mips + fi ;; romp) basic_machine=romp-ibm @@ -668,9 +689,12 @@ -solaris) os=-solaris2 ;; - -unixware* | svr4*) + -svr4*) os=-sysv4 ;; + -unixware*) + os=-sysv4.2uw + ;; -gnu/linux*) os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` ;; @@ -681,15 +705,16 @@ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ - | -amigados* | -msdos* | -newsos* | -unicos* | -aof* | -aos* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ + | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -cygwin32* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -linux-gnu* | -uxpv*) + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -uxpv* | -beos*) # Remember, each alternative MUST END IN *, to match a version number. ;; -linux*) @@ -802,6 +827,9 @@ sparc-* | *-sun) os=-sunos4.1.1 ;; + *-be) + os=-beos + ;; *-ibm) os=-aix ;; @@ -815,7 +843,7 @@ os=-sysv ;; *-cbm) - os=-amigados + os=-amigaos ;; *-dg) os=-dgux diff -ruN TiMidity++-2.8.1/configs/msc-config.h TiMidity++-2.8.2/configs/msc-config.h --- TiMidity++-2.8.1/configs/msc-config.h Mon Nov 29 11:59:44 1999 +++ TiMidity++-2.8.2/configs/msc-config.h Mon Feb 7 21:39:43 2000 @@ -217,7 +217,7 @@ #define HAVE_MMSYSTEM_H /* In VDS Macro AAA=BBB is not available. */ -#define TIMID_VERSION "2.8.1" +#define TIMID_VERSION "2.8.2" #define DEFAULT_PATH ".\\" #define AU_W32 #define WINSOCK diff -ruN TiMidity++-2.8.1/configure TiMidity++-2.8.2/configure --- TiMidity++-2.8.1/configure Fri Nov 26 18:04:15 1999 +++ TiMidity++-2.8.2/configure Mon Feb 7 08:20:57 2000 @@ -884,7 +884,7 @@ PACKAGE=TiMidity++ -VERSION=2.8.1 +VERSION=2.8.2 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -1065,7 +1065,7 @@ CFLAGS="$CFLAGS -g" fi else - CFLAGS=${CFLAGS:--O2} + CFLAGS=${CFLAGS--O2} fi @@ -1090,7 +1090,7 @@ lib_user32_opt= lib_user32_test= -WISH=${WISH:-wish} +WISH=${WISH-wish} tcltk_dep= if test "x$with_x" = x; then @@ -1106,9 +1106,9 @@ CPPFLAGS="$CPPFLAGS -I${i}" done -LDFLAGS="$LDFLAGS -L${PREFIX:-/usr/local}/lib" -CPPFLAGS="$CPPFLAGS -I${PREFIX:-/usr/local}/include" -SHLDFLAGS=${SHLDFLAGS:-$LDFLAGS} +LDFLAGS="$LDFLAGS -L${PREFIX-/usr/local}/lib" +CPPFLAGS="$CPPFLAGS -I${PREFIX-/usr/local}/include" +SHLDFLAGS=${SHLDFLAGS-$LDFLAGS} if test "x$prefix" != xNONE -a "x$prefix" != "x$ac_default_prefix" -a "x$prefix" != "x/usr"; then LDFLAGS="-L$prefix/lib $LDFLAGS" @@ -1532,7 +1532,7 @@ # so="so" # ;; - *-*-cygwin32*) + *-*-cygwin*) EXTRADEFS="-D__W32__" # ?? case "x${CC} " in @@ -4957,7 +4957,7 @@ # Check whether --enable-alsa or --disable-alsa was given. if test "${enable_alsa+set}" = set; then enableval="$enable_alsa" - au_enable_nas=$enableval + au_enable_alsa=$enableval fi @@ -4990,7 +4990,7 @@ *-*-netbsd*) au_enable_sun=yes ;; - *-*-cygwin32*) + *-*-cygwin*) au_enable_w32=yes ;; *) @@ -5114,7 +5114,7 @@ echo "configure:5115: checking enable_audio=w32" >&5 if test "x$au_enable_w32" = xyes; then case "$target" in - *-*-cygwin32*) + *-*-cygwin*) if test "x$enable_w32gui" = xyes; then SYSEXTRAS="$SYSEXTRAS w32g_a.c" else @@ -6271,8 +6271,52 @@ else echo "$ac_t""no" 1>&6 + echo $ac_n "checking for PDC_set_ctrl_break in -lpdcurses""... $ac_c" 1>&6 +echo "configure:6276: checking for PDC_set_ctrl_break in -lpdcurses" >&5 +ac_lib_var=`echo pdcurses'_'PDC_set_ctrl_break | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lpdcurses $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + lib_curses_opt=-lpdcurses + CPPFLAGS="$CPPFLAGS -DUSE_PDCURSES=1" + lib_user32_opt="$lib_user32_test" + +else + echo "$ac_t""no" 1>&6 echo "configure: warning: ncurses interface is not enabled" 1>&2 - enable_ncurses=no + enable_ncurses=no + +fi + fi @@ -6337,7 +6381,7 @@ if test "${enable_slang+set}" = set; then enableval="$enable_slang" case "x$enable_slang" in xyes|xdynamic) echo $ac_n "checking for SLang_init_tty in -lslang""... $ac_c" 1>&6 -echo "configure:6341: checking for SLang_init_tty in -lslang" >&5 +echo "configure:6385: checking for SLang_init_tty in -lslang" >&5 ac_lib_var=`echo slang'_'SLang_init_tty | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6345,7 +6389,7 @@ ac_save_LIBS="$LIBS" LIBS="-lslang $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6382,17 +6426,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6386: checking for $ac_hdr" >&5 +echo "configure:6430: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6396: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6440: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6444,7 +6488,7 @@ dynamic_targets="$dynamic_targets interface_s.\$(so)" s_so_libs="-lslang" echo $ac_n "checking for initscr in -ltermcap""... $ac_c" 1>&6 -echo "configure:6448: checking for initscr in -ltermcap" >&5 +echo "configure:6492: checking for initscr in -ltermcap" >&5 ac_lib_var=`echo termcap'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6452,7 +6496,7 @@ ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6583,7 +6627,7 @@ tk_lib= for l in tcl tcl8.0jp tcl7.6jp tcl80jp tcl76jp tcl8.0 tcl7.6 tcl80 tcl76; do case "x$tcl_lib" in x) echo $ac_n "checking for Tcl_Init in -l$l""... $ac_c" 1>&6 -echo "configure:6587: checking for Tcl_Init in -l$l" >&5 +echo "configure:6631: checking for Tcl_Init in -l$l" >&5 ac_lib_var=`echo $l'_'Tcl_Init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6591,7 +6635,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$l $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6626,7 +6670,7 @@ LIBS="$LIBS $tcl_lib" for l in tk tk8.0jp tk4.2jp tk80jp tk42jp tk8.0 tk4.2 tk80 tk42; do case "x$tk_lib" in x) echo $ac_n "checking for Tk_Init in -l$l""... $ac_c" 1>&6 -echo "configure:6630: checking for Tk_Init in -l$l" >&5 +echo "configure:6674: checking for Tk_Init in -l$l" >&5 ac_lib_var=`echo $l'_'Tk_Init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6634,7 +6678,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$l $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7009,7 +7053,7 @@ # Extract the first word of "gtk-config", so it can be a program name with args. set dummy gtk-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7013: checking for $ac_word" >&5 +echo "configure:7057: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7044,7 +7088,7 @@ min_gtk_version=1.1.3 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:7048: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:7092: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" = "no" ; then no_gtk=yes @@ -7067,7 +7111,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -7133,7 +7177,7 @@ } EOF -if { (eval echo configure:7137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -7167,7 +7211,7 @@ CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat > conftest.$ac_ext < @@ -7177,7 +7221,7 @@ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ; return 0; } EOF -if { (eval echo configure:7181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GTK or finding the wrong" @@ -7327,17 +7371,17 @@ fi ac_safe=`echo "X11/xpm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/xpm.h""... $ac_c" 1>&6 -echo "configure:7331: checking for X11/xpm.h" >&5 +echo "configure:7375: checking for X11/xpm.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7341: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7385: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7360,7 +7404,7 @@ fi echo $ac_n "checking for XpmCreatePixmapFromData in -lXpm""... $ac_c" 1>&6 -echo "configure:7364: checking for XpmCreatePixmapFromData in -lXpm" >&5 +echo "configure:7408: checking for XpmCreatePixmapFromData in -lXpm" >&5 ac_lib_var=`echo Xpm'_'XpmCreatePixmapFromData | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7368,7 +7412,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXpm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7475,17 +7519,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7479: checking for $ac_hdr" >&5 +echo "configure:7523: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7489: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7533: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7536,7 +7580,7 @@ LDFLAGS="$LDFLAGS $offix_lib_dir" LIBS="$LIBS $lib_xmu_opt $lib_xt_opt $lib_xprelibs_opt $lib_xext_opt -lX11" echo $ac_n "checking for DndInitialize in -lDnd""... $ac_c" 1>&6 -echo "configure:7540: checking for DndInitialize in -lDnd" >&5 +echo "configure:7584: checking for DndInitialize in -lDnd" >&5 ac_lib_var=`echo Dnd'_'DndInitialize | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7544,7 +7588,7 @@ ac_save_LIBS="$LIBS" LIBS="-lDnd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7662,7 +7706,7 @@ EXTRADEFS="$EXTRADEFS -DWRDT_X" enable_sherry_wrd=yes echo $ac_n "checking for zlibVersion in -lz""... $ac_c" 1>&6 -echo "configure:7666: checking for zlibVersion in -lz" >&5 +echo "configure:7710: checking for zlibVersion in -lz" >&5 ac_lib_var=`echo z'_'zlibVersion | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7670,7 +7714,7 @@ ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7704,17 +7748,17 @@ ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for png.h""... $ac_c" 1>&6 -echo "configure:7708: checking for png.h" >&5 +echo "configure:7752: checking for png.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7718: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7762: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7737,7 +7781,7 @@ fi echo $ac_n "checking for png_init_io in -lpng""... $ac_c" 1>&6 -echo "configure:7741: checking for png_init_io in -lpng" >&5 +echo "configure:7785: checking for png_init_io in -lpng" >&5 ac_lib_var=`echo png'_'png_init_io | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7745,7 +7789,7 @@ ac_save_LIBS="$LIBS" LIBS="-lpng -lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else diff -ruN TiMidity++-2.8.1/configure.in TiMidity++-2.8.2/configure.in --- TiMidity++-2.8.1/configure.in Fri Nov 26 18:04:09 1999 +++ TiMidity++-2.8.2/configure.in Mon Feb 7 07:28:05 2000 @@ -1,5 +1,5 @@ dnl TiMidity++ -- MIDI to WAVE converter and player -dnl Copyright (C) 1999 Masanao Izumo +dnl Copyright (C) 1999,2000 Masanao Izumo dnl Copyright (C) 1995 Tuukka Toivonen dnl dnl This program is free software; you can redistribute it and/or modify @@ -55,7 +55,7 @@ AC_INIT(timidity/timidity.c) SHELL=${CONFIG_SHELL-/bin/sh} AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(TiMidity++, 2.8.1, no-define) +AM_INIT_AUTOMAKE(TiMidity++, 2.8.2, no-define) dnl To use CONTAINS() macro (See acinclude.m4) CONTAINS_INIT @@ -71,7 +71,7 @@ [ --enable-debug Build a debugging version.], [ if test "$enableval" = "yes"; then CFLAGS="$CFLAGS -g" - fi ], [ CFLAGS=${CFLAGS:--O2} ]) + fi ], [ CFLAGS=${CFLAGS--O2} ]) EXTRACFLAGS= EXTRADEFS= @@ -95,7 +95,7 @@ lib_user32_opt= lib_user32_test= -WISH=${WISH:-wish} +WISH=${WISH-wish} tcltk_dep= dnl --with-x turns on if `--with-x' is not specified. @@ -114,9 +114,9 @@ done dnl add prefix /usr/local by default -LDFLAGS="$LDFLAGS -L${PREFIX:-/usr/local}/lib" -CPPFLAGS="$CPPFLAGS -I${PREFIX:-/usr/local}/include" -SHLDFLAGS=${SHLDFLAGS:-$LDFLAGS} +LDFLAGS="$LDFLAGS -L${PREFIX-/usr/local}/lib" +CPPFLAGS="$CPPFLAGS -I${PREFIX-/usr/local}/include" +SHLDFLAGS=${SHLDFLAGS-$LDFLAGS} dnl add $prefix if specified. if test "x$prefix" != xNONE -a "x$prefix" != "x$ac_default_prefix" -a "x$prefix" != "x/usr"; then @@ -177,7 +177,7 @@ # so="so" # ;; - *-*-cygwin32*) + *-*-cygwin*) EXTRADEFS="-D__W32__" # ?? case "x${CC} " in @@ -470,7 +470,7 @@ [ au_enable_nas=$enableval ]) AC_ARG_ENABLE(alsa, [ --enable-alsa ALSA (Obsoleted. Use --enable-audio=alsa)], - [ au_enable_nas=$enableval ]) + [ au_enable_alsa=$enableval ]) if test "x$au_enable_default" = xyes; then case "$target" in @@ -501,7 +501,7 @@ *-*-netbsd*) au_enable_sun=yes ;; - *-*-cygwin32*) + *-*-cygwin*) au_enable_w32=yes ;; *) @@ -622,7 +622,7 @@ AC_MSG_CHECKING(enable_audio=w32) if test "x$au_enable_w32" = xyes; then case "$target" in - *-*-cygwin32*) + *-*-cygwin*) if test "x$enable_w32gui" = xyes; then SYSEXTRAS="$SYSEXTRAS w32g_a.c" else @@ -914,8 +914,15 @@ CPPFLAGS="$CPPFLAGS -DUSE_PDCURSES=1" lib_user32_opt="$lib_user32_test" ], - [ AC_MSG_WARN(ncurses interface is not enabled) - enable_ncurses=no + [ dnl checking libpdcurses + AC_CHECK_LIB(pdcurses,PDC_set_ctrl_break, + [ lib_curses_opt=-lpdcurses + CPPFLAGS="$CPPFLAGS -DUSE_PDCURSES=1" + lib_user32_opt="$lib_user32_test" + ], + [ AC_MSG_WARN(ncurses interface is not enabled) + enable_ncurses=no + ]) ], $lib_user32_test) ]) diff -ruN TiMidity++-2.8.1/doc/C/Makefile.am TiMidity++-2.8.2/doc/C/Makefile.am --- TiMidity++-2.8.1/doc/C/Makefile.am Mon Mar 8 09:07:18 1999 +++ TiMidity++-2.8.2/doc/C/Makefile.am Mon Feb 7 08:29:09 2000 @@ -1,5 +1,5 @@ # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999 Masanao Izumo +# Copyright (C) 1999,2000 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/doc/C/Makefile.in TiMidity++-2.8.2/doc/C/Makefile.in --- TiMidity++-2.8.1/doc/C/Makefile.in Mon Nov 29 11:59:40 1999 +++ TiMidity++-2.8.2/doc/C/Makefile.in Mon Feb 7 21:39:40 2000 @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999 Masanao Izumo +# Copyright (C) 1999,2000 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/doc/Makefile.am TiMidity++-2.8.2/doc/Makefile.am --- TiMidity++-2.8.1/doc/Makefile.am Sun Apr 18 15:55:22 1999 +++ TiMidity++-2.8.2/doc/Makefile.am Mon Feb 7 08:29:16 2000 @@ -1,5 +1,5 @@ # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999 Masanao Izumo +# Copyright (C) 1999,2000 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/doc/Makefile.in TiMidity++-2.8.2/doc/Makefile.in --- TiMidity++-2.8.1/doc/Makefile.in Mon Nov 29 11:59:38 1999 +++ TiMidity++-2.8.2/doc/Makefile.in Mon Feb 7 21:39:39 2000 @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999 Masanao Izumo +# Copyright (C) 1999,2000 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/doc/ja_JP.ujis/Makefile.am TiMidity++-2.8.2/doc/ja_JP.ujis/Makefile.am --- TiMidity++-2.8.1/doc/ja_JP.ujis/Makefile.am Mon Mar 8 09:07:34 1999 +++ TiMidity++-2.8.2/doc/ja_JP.ujis/Makefile.am Mon Feb 7 08:29:12 2000 @@ -1,5 +1,5 @@ # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999 Masanao Izumo +# Copyright (C) 1999,2000 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/doc/ja_JP.ujis/Makefile.in TiMidity++-2.8.2/doc/ja_JP.ujis/Makefile.in --- TiMidity++-2.8.1/doc/ja_JP.ujis/Makefile.in Mon Nov 29 11:59:43 1999 +++ TiMidity++-2.8.2/doc/ja_JP.ujis/Makefile.in Mon Feb 7 21:39:42 2000 @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999 Masanao Izumo +# Copyright (C) 1999,2000 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/install-sh TiMidity++-2.8.2/install-sh --- TiMidity++-2.8.1/install-sh Wed Jan 20 18:17:12 1999 +++ TiMidity++-2.8.2/install-sh Sun Jan 9 18:17:25 2000 @@ -118,6 +118,7 @@ if [ -d $dst ]; then instcmd=: + chmodcmd="" else instcmd=mkdir fi diff -ruN TiMidity++-2.8.1/interface/Makefile.am TiMidity++-2.8.2/interface/Makefile.am --- TiMidity++-2.8.1/interface/Makefile.am Fri Nov 12 16:42:29 1999 +++ TiMidity++-2.8.2/interface/Makefile.am Mon Feb 7 07:50:40 2000 @@ -1,5 +1,5 @@ # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999 Masanao Izumo +# Copyright (C) 1999,2000 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/Makefile.in TiMidity++-2.8.2/interface/Makefile.in --- TiMidity++-2.8.1/interface/Makefile.in Mon Nov 29 11:59:14 1999 +++ TiMidity++-2.8.2/interface/Makefile.in Mon Feb 7 21:39:21 2000 @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999 Masanao Izumo +# Copyright (C) 1999,2000 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/bitmaps/Makefile.am TiMidity++-2.8.2/interface/bitmaps/Makefile.am --- TiMidity++-2.8.1/interface/bitmaps/Makefile.am Sat Sep 4 07:47:26 1999 +++ TiMidity++-2.8.2/interface/bitmaps/Makefile.am Mon Feb 7 08:29:39 2000 @@ -1,5 +1,5 @@ # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999 Masanao Izumo +# Copyright (C) 1999,2000 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/bitmaps/Makefile.in TiMidity++-2.8.2/interface/bitmaps/Makefile.in --- TiMidity++-2.8.1/interface/bitmaps/Makefile.in Mon Nov 29 11:59:24 1999 +++ TiMidity++-2.8.2/interface/bitmaps/Makefile.in Mon Feb 7 21:39:29 2000 @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999 Masanao Izumo +# Copyright (C) 1999,2000 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/dumb_c.c TiMidity++-2.8.2/interface/dumb_c.c --- TiMidity++-2.8.1/interface/dumb_c.c Sat Aug 7 20:41:27 1999 +++ TiMidity++-2.8.2/interface/dumb_c.c Mon Feb 7 07:50:23 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/dynamic_c.c TiMidity++-2.8.2/interface/dynamic_c.c --- TiMidity++-2.8.1/interface/dynamic_c.c Fri Sep 3 00:46:23 1999 +++ TiMidity++-2.8.2/interface/dynamic_c.c Mon Feb 7 07:50:19 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/emacs_c.c TiMidity++-2.8.2/interface/emacs_c.c --- TiMidity++-2.8.1/interface/emacs_c.c Fri Mar 12 18:57:04 1999 +++ TiMidity++-2.8.2/interface/emacs_c.c Mon Feb 7 07:51:11 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/gtk_c.c TiMidity++-2.8.2/interface/gtk_c.c --- TiMidity++-2.8.1/interface/gtk_c.c Mon Nov 29 11:41:57 1999 +++ TiMidity++-2.8.2/interface/gtk_c.c Mon Feb 7 07:50:16 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/gtk_h.h TiMidity++-2.8.2/interface/gtk_h.h --- TiMidity++-2.8.1/interface/gtk_h.h Fri Nov 12 13:25:10 1999 +++ TiMidity++-2.8.2/interface/gtk_h.h Mon Feb 7 07:50:12 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/gtk_i.c TiMidity++-2.8.2/interface/gtk_i.c --- TiMidity++-2.8.1/interface/gtk_i.c Fri Nov 12 13:25:10 1999 +++ TiMidity++-2.8.2/interface/gtk_i.c Mon Feb 7 07:50:09 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/gtk_p.c TiMidity++-2.8.2/interface/gtk_p.c --- TiMidity++-2.8.1/interface/gtk_p.c Sun Apr 4 21:49:52 1999 +++ TiMidity++-2.8.2/interface/gtk_p.c Mon Feb 7 07:50:05 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/mac_c.c TiMidity++-2.8.2/interface/mac_c.c --- TiMidity++-2.8.1/interface/mac_c.c Sat Oct 30 12:23:11 1999 +++ TiMidity++-2.8.2/interface/mac_c.c Mon Feb 7 07:54:14 2000 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/mac_c.h TiMidity++-2.8.2/interface/mac_c.h --- TiMidity++-2.8.1/interface/mac_c.h Sat Oct 30 12:23:11 1999 +++ TiMidity++-2.8.2/interface/mac_c.h Mon Feb 7 07:53:07 2000 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/mac_mag.c TiMidity++-2.8.2/interface/mac_mag.c --- TiMidity++-2.8.1/interface/mac_mag.c Sat Oct 30 12:23:11 1999 +++ TiMidity++-2.8.2/interface/mac_mag.c Mon Feb 7 07:54:04 2000 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/mac_mag.h TiMidity++-2.8.2/interface/mac_mag.h --- TiMidity++-2.8.1/interface/mac_mag.h Sat Oct 30 12:23:12 1999 +++ TiMidity++-2.8.2/interface/mac_mag.h Mon Feb 7 07:52:59 2000 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/mac_trace.c TiMidity++-2.8.2/interface/mac_trace.c --- TiMidity++-2.8.1/interface/mac_trace.c Sat Oct 30 12:23:12 1999 +++ TiMidity++-2.8.2/interface/mac_trace.c Mon Feb 7 07:53:47 2000 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/mac_wrdwindow.c TiMidity++-2.8.2/interface/mac_wrdwindow.c --- TiMidity++-2.8.1/interface/mac_wrdwindow.c Sat Oct 30 12:23:12 1999 +++ TiMidity++-2.8.2/interface/mac_wrdwindow.c Mon Feb 7 07:53:32 2000 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/mac_wrdwindow.h TiMidity++-2.8.2/interface/mac_wrdwindow.h --- TiMidity++-2.8.1/interface/mac_wrdwindow.h Sat Oct 30 12:23:12 1999 +++ TiMidity++-2.8.2/interface/mac_wrdwindow.h Mon Feb 7 07:52:47 2000 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/motif.h TiMidity++-2.8.2/interface/motif.h --- TiMidity++-2.8.1/interface/motif.h Wed Dec 16 16:27:48 1998 +++ TiMidity++-2.8.2/interface/motif.h Mon Feb 7 07:50:01 2000 @@ -1,9 +1,8 @@ #ifndef ___MOTIF_H_ #define ___MOTIF_H_ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/motif_bitmaps/Makefile.am TiMidity++-2.8.2/interface/motif_bitmaps/Makefile.am --- TiMidity++-2.8.1/interface/motif_bitmaps/Makefile.am Tue Feb 9 13:09:14 1999 +++ TiMidity++-2.8.2/interface/motif_bitmaps/Makefile.am Mon Feb 7 08:29:32 2000 @@ -1,5 +1,5 @@ # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999 Masanao Izumo +# Copyright (C) 1999,2000 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/motif_bitmaps/Makefile.in TiMidity++-2.8.2/interface/motif_bitmaps/Makefile.in --- TiMidity++-2.8.1/interface/motif_bitmaps/Makefile.in Mon Nov 29 11:59:21 1999 +++ TiMidity++-2.8.2/interface/motif_bitmaps/Makefile.in Mon Feb 7 21:39:27 2000 @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999 Masanao Izumo +# Copyright (C) 1999,2000 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/motif_c.c TiMidity++-2.8.2/interface/motif_c.c --- TiMidity++-2.8.1/interface/motif_c.c Mon Nov 29 11:42:18 1999 +++ TiMidity++-2.8.2/interface/motif_c.c Mon Feb 7 07:49:57 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/motif_i.c TiMidity++-2.8.2/interface/motif_i.c --- TiMidity++-2.8.1/interface/motif_i.c Tue Apr 27 04:35:10 1999 +++ TiMidity++-2.8.2/interface/motif_i.c Mon Feb 7 07:49:53 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/motif_p.c TiMidity++-2.8.2/interface/motif_p.c --- TiMidity++-2.8.1/interface/motif_p.c Tue Mar 30 18:50:58 1999 +++ TiMidity++-2.8.2/interface/motif_p.c Mon Feb 7 07:49:49 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/ncurs_c.c TiMidity++-2.8.2/interface/ncurs_c.c --- TiMidity++-2.8.1/interface/ncurs_c.c Tue Oct 12 19:11:04 1999 +++ TiMidity++-2.8.2/interface/ncurs_c.c Mon Feb 7 07:49:46 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/pixmaps/Makefile.am TiMidity++-2.8.2/interface/pixmaps/Makefile.am --- TiMidity++-2.8.1/interface/pixmaps/Makefile.am Tue Mar 2 10:37:22 1999 +++ TiMidity++-2.8.2/interface/pixmaps/Makefile.am Mon Feb 7 08:29:35 2000 @@ -1,5 +1,5 @@ # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999 Masanao Izumo +# Copyright (C) 1999,2000 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/pixmaps/Makefile.in TiMidity++-2.8.2/interface/pixmaps/Makefile.in --- TiMidity++-2.8.1/interface/pixmaps/Makefile.in Mon Nov 29 11:59:27 1999 +++ TiMidity++-2.8.2/interface/pixmaps/Makefile.in Mon Feb 7 21:39:31 2000 @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999 Masanao Izumo +# Copyright (C) 1999,2000 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/server_c.c TiMidity++-2.8.2/interface/server_c.c --- TiMidity++-2.8.1/interface/server_c.c Fri Apr 23 21:36:42 1999 +++ TiMidity++-2.8.2/interface/server_c.c Mon Feb 7 07:49:42 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/server_defs.h TiMidity++-2.8.2/interface/server_defs.h --- TiMidity++-2.8.1/interface/server_defs.h Mon Apr 5 02:04:26 1999 +++ TiMidity++-2.8.2/interface/server_defs.h Mon Feb 7 07:49:38 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/slang_c.c TiMidity++-2.8.2/interface/slang_c.c --- TiMidity++-2.8.1/interface/slang_c.c Tue Mar 23 13:45:24 1999 +++ TiMidity++-2.8.2/interface/slang_c.c Mon Feb 7 07:49:33 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/soundspec.c TiMidity++-2.8.2/interface/soundspec.c --- TiMidity++-2.8.1/interface/soundspec.c Wed Aug 11 11:04:09 1999 +++ TiMidity++-2.8.2/interface/soundspec.c Mon Feb 7 07:44:01 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/soundspec.h TiMidity++-2.8.2/interface/soundspec.h --- TiMidity++-2.8.1/interface/soundspec.h Thu Feb 25 06:47:18 1999 +++ TiMidity++-2.8.2/interface/soundspec.h Mon Feb 7 07:43:58 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/tk_c.c TiMidity++-2.8.2/interface/tk_c.c --- TiMidity++-2.8.1/interface/tk_c.c Sat Sep 4 06:38:52 1999 +++ TiMidity++-2.8.2/interface/tk_c.c Mon Feb 7 07:43:53 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/vt100.c TiMidity++-2.8.2/interface/vt100.c --- TiMidity++-2.8.1/interface/vt100.c Mon Nov 30 18:01:34 1998 +++ TiMidity++-2.8.2/interface/vt100.c Mon Feb 7 07:43:48 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/vt100.h TiMidity++-2.8.2/interface/vt100.h --- TiMidity++-2.8.1/interface/vt100.h Mon Nov 30 18:01:38 1998 +++ TiMidity++-2.8.2/interface/vt100.h Mon Feb 7 07:43:44 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/vt100_c.c TiMidity++-2.8.2/interface/vt100_c.c --- TiMidity++-2.8.1/interface/vt100_c.c Tue Sep 21 10:54:58 1999 +++ TiMidity++-2.8.2/interface/vt100_c.c Mon Feb 7 07:43:39 2000 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/w32g.h TiMidity++-2.8.2/interface/w32g.h --- TiMidity++-2.8.1/interface/w32g.h Wed Aug 25 15:16:50 1999 +++ TiMidity++-2.8.2/interface/w32g.h Mon Feb 7 07:43:34 2000 @@ -1,5 +1,24 @@ #ifndef ___W32G_H_ #define ___W32G_H_ +/* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ #include diff -ruN TiMidity++-2.8.1/interface/w32g_c.c TiMidity++-2.8.2/interface/w32g_c.c --- TiMidity++-2.8.1/interface/w32g_c.c Wed Aug 25 15:31:28 1999 +++ TiMidity++-2.8.2/interface/w32g_c.c Mon Feb 7 07:43:28 2000 @@ -1,6 +1,6 @@ /* TiMidity -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/w32g_i.c TiMidity++-2.8.2/interface/w32g_i.c --- TiMidity++-2.8.1/interface/w32g_i.c Mon Nov 29 11:45:06 1999 +++ TiMidity++-2.8.2/interface/w32g_i.c Mon Feb 7 07:43:08 2000 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/w32g_ini.c TiMidity++-2.8.2/interface/w32g_ini.c --- TiMidity++-2.8.1/interface/w32g_ini.c Mon Nov 29 11:51:35 1999 +++ TiMidity++-2.8.2/interface/w32g_ini.c Mon Feb 7 07:43:01 2000 @@ -1,7 +1,6 @@ /* - - TiMidity -- Experimental MIDI to WAVE converter - Copyright (C) 1999 Masanao Izumo + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/w32g_playlist.c TiMidity++-2.8.2/interface/w32g_playlist.c --- TiMidity++-2.8.1/interface/w32g_playlist.c Tue Oct 5 15:56:47 1999 +++ TiMidity++-2.8.2/interface/w32g_playlist.c Mon Feb 7 07:42:35 2000 @@ -1,7 +1,6 @@ /* - TiMidity -- Experimental MIDI to WAVE converter - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/w32g_pref.c TiMidity++-2.8.2/interface/w32g_pref.c --- TiMidity++-2.8.1/interface/w32g_pref.c Wed Aug 25 13:34:20 1999 +++ TiMidity++-2.8.2/interface/w32g_pref.c Mon Feb 7 07:42:31 2000 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/w32g_pref.h TiMidity++-2.8.2/interface/w32g_pref.h --- TiMidity++-2.8.1/interface/w32g_pref.h Sat Aug 21 02:39:39 1999 +++ TiMidity++-2.8.2/interface/w32g_pref.h Mon Feb 7 07:42:15 2000 @@ -1,5 +1,24 @@ #ifndef __W32G2_PREF_H__ #define __W32G2_PREF_H__ +/* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ extern volatile int PrefWndDoing; void PrefWndCreate(HWND hwnd); diff -ruN TiMidity++-2.8.1/interface/w32g_subwin.c TiMidity++-2.8.2/interface/w32g_subwin.c --- TiMidity++-2.8.1/interface/w32g_subwin.c Wed Aug 25 13:09:12 1999 +++ TiMidity++-2.8.2/interface/w32g_subwin.c Mon Feb 7 07:41:44 2000 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/w32g_subwin.h TiMidity++-2.8.2/interface/w32g_subwin.h --- TiMidity++-2.8.1/interface/w32g_subwin.h Wed Aug 25 11:20:04 1999 +++ TiMidity++-2.8.2/interface/w32g_subwin.h Mon Feb 7 07:41:37 2000 @@ -1,5 +1,24 @@ #ifndef ___W32G_SUBWIN_H_ #define ___W32G_SUBWIN_H_ +/* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ // Console Window void InitConsoleWnd(HWND hParentWnd); diff -ruN TiMidity++-2.8.1/interface/w32g_utl.c TiMidity++-2.8.2/interface/w32g_utl.c --- TiMidity++-2.8.1/interface/w32g_utl.c Mon Nov 29 11:50:36 1999 +++ TiMidity++-2.8.2/interface/w32g_utl.c Mon Feb 7 07:41:31 2000 @@ -1,6 +1,6 @@ /* TiMidity -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/w32g_utl.h TiMidity++-2.8.2/interface/w32g_utl.h --- TiMidity++-2.8.1/interface/w32g_utl.h Wed Aug 25 13:21:38 1999 +++ TiMidity++-2.8.2/interface/w32g_utl.h Mon Feb 7 07:41:23 2000 @@ -1,5 +1,24 @@ #ifndef ___W32G_UTL_H_ #define ___W32G_UTL_H_ +/* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ // ini & config #define IniVersion "2.1" diff -ruN TiMidity++-2.8.1/interface/wrdt_dumb.c TiMidity++-2.8.2/interface/wrdt_dumb.c --- TiMidity++-2.8.1/interface/wrdt_dumb.c Thu Mar 11 14:56:54 1999 +++ TiMidity++-2.8.2/interface/wrdt_dumb.c Mon Feb 7 07:41:15 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/wrdt_mac.c TiMidity++-2.8.2/interface/wrdt_mac.c --- TiMidity++-2.8.1/interface/wrdt_mac.c Sat Oct 30 12:23:18 1999 +++ TiMidity++-2.8.2/interface/wrdt_mac.c Mon Feb 7 07:53:43 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/wrdt_tty.c TiMidity++-2.8.2/interface/wrdt_tty.c --- TiMidity++-2.8.1/interface/wrdt_tty.c Thu Mar 11 14:57:46 1999 +++ TiMidity++-2.8.2/interface/wrdt_tty.c Mon Feb 7 07:41:10 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/wrdt_wcon.c TiMidity++-2.8.2/interface/wrdt_wcon.c --- TiMidity++-2.8.1/interface/wrdt_wcon.c Mon Nov 29 11:52:34 1999 +++ TiMidity++-2.8.2/interface/wrdt_wcon.c Mon Feb 7 07:41:06 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/wrdt_x.c TiMidity++-2.8.2/interface/wrdt_x.c --- TiMidity++-2.8.1/interface/wrdt_x.c Sat Aug 28 00:27:38 1999 +++ TiMidity++-2.8.2/interface/wrdt_x.c Mon Feb 7 07:41:03 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/x_mag.c TiMidity++-2.8.2/interface/x_mag.c --- TiMidity++-2.8.1/interface/x_mag.c Mon Nov 30 18:01:56 1998 +++ TiMidity++-2.8.2/interface/x_mag.c Mon Feb 7 07:40:59 2000 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/x_mag.h TiMidity++-2.8.2/interface/x_mag.h --- TiMidity++-2.8.1/interface/x_mag.h Mon Nov 30 18:02:04 1998 +++ TiMidity++-2.8.2/interface/x_mag.h Mon Feb 7 07:40:56 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/x_sherry.c TiMidity++-2.8.2/interface/x_sherry.c --- TiMidity++-2.8.1/interface/x_sherry.c Thu Sep 9 00:27:37 1999 +++ TiMidity++-2.8.2/interface/x_sherry.c Mon Feb 7 07:40:51 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/x_sherry.h TiMidity++-2.8.2/interface/x_sherry.h --- TiMidity++-2.8.1/interface/x_sherry.h Thu Mar 11 14:55:14 1999 +++ TiMidity++-2.8.2/interface/x_sherry.h Mon Feb 7 07:40:44 2000 @@ -1,5 +1,24 @@ #ifndef ___X_SRY_H_ #define ___X_SRY_H_ +/* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ extern void x_sry_wrdt_apply(uint8 *data, int len); extern void CloseSryWindow(void); diff -ruN TiMidity++-2.8.1/interface/x_wrdwindow.c TiMidity++-2.8.2/interface/x_wrdwindow.c --- TiMidity++-2.8.1/interface/x_wrdwindow.c Tue Aug 24 20:53:25 1999 +++ TiMidity++-2.8.2/interface/x_wrdwindow.c Mon Feb 7 07:40:33 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/x_wrdwindow.h TiMidity++-2.8.2/interface/x_wrdwindow.h --- TiMidity++-2.8.1/interface/x_wrdwindow.h Wed Aug 18 02:08:56 1999 +++ TiMidity++-2.8.2/interface/x_wrdwindow.h Mon Feb 7 07:40:29 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/xaw.h TiMidity++-2.8.2/interface/xaw.h --- TiMidity++-2.8.1/interface/xaw.h Tue Aug 24 20:04:55 1999 +++ TiMidity++-2.8.2/interface/xaw.h Mon Feb 7 07:40:25 2000 @@ -1,9 +1,8 @@ #ifndef _XAW_H_ #define _XAW_H_ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/xaw_c.c TiMidity++-2.8.2/interface/xaw_c.c --- TiMidity++-2.8.1/interface/xaw_c.c Mon Nov 29 11:53:28 1999 +++ TiMidity++-2.8.2/interface/xaw_c.c Mon Feb 7 07:40:21 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/xaw_i.c TiMidity++-2.8.2/interface/xaw_i.c --- TiMidity++-2.8.1/interface/xaw_i.c Mon Nov 29 11:55:18 1999 +++ TiMidity++-2.8.2/interface/xaw_i.c Mon Feb 7 07:40:17 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/xskin.h TiMidity++-2.8.2/interface/xskin.h --- TiMidity++-2.8.1/interface/xskin.h Mon Aug 9 03:03:46 1999 +++ TiMidity++-2.8.2/interface/xskin.h Mon Feb 7 07:40:01 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/xskin_c.c TiMidity++-2.8.2/interface/xskin_c.c --- TiMidity++-2.8.1/interface/xskin_c.c Fri Mar 12 19:04:02 1999 +++ TiMidity++-2.8.2/interface/xskin_c.c Mon Feb 7 07:39:56 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/xskin_i.c TiMidity++-2.8.2/interface/xskin_i.c --- TiMidity++-2.8.1/interface/xskin_i.c Fri Jan 22 18:53:22 1999 +++ TiMidity++-2.8.2/interface/xskin_i.c Mon Feb 7 07:39:53 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/xskin_loadBMP.c TiMidity++-2.8.2/interface/xskin_loadBMP.c --- TiMidity++-2.8.1/interface/xskin_loadBMP.c Fri Jan 15 14:50:36 1999 +++ TiMidity++-2.8.2/interface/xskin_loadBMP.c Mon Feb 7 07:39:49 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/interface/xskin_spectrum.c TiMidity++-2.8.2/interface/xskin_spectrum.c --- TiMidity++-2.8.1/interface/xskin_spectrum.c Thu Jan 21 01:58:18 1999 +++ TiMidity++-2.8.2/interface/xskin_spectrum.c Mon Feb 7 07:39:44 2000 @@ -1,7 +1,7 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/libarc/Makefile.am TiMidity++-2.8.2/libarc/Makefile.am --- TiMidity++-2.8.1/libarc/Makefile.am Sat Aug 7 17:57:01 1999 +++ TiMidity++-2.8.2/libarc/Makefile.am Mon Feb 7 07:37:50 2000 @@ -1,5 +1,5 @@ # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999 Masanao Izumo +# Copyright (C) 1999,2000 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/libarc/Makefile.in TiMidity++-2.8.2/libarc/Makefile.in --- TiMidity++-2.8.1/libarc/Makefile.in Mon Nov 29 11:59:08 1999 +++ TiMidity++-2.8.2/libarc/Makefile.in Mon Feb 7 21:39:18 2000 @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999 Masanao Izumo +# Copyright (C) 1999,2000 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/libarc/arc.c TiMidity++-2.8.2/libarc/arc.c --- TiMidity++-2.8.1/libarc/arc.c Wed Aug 18 02:08:56 1999 +++ TiMidity++-2.8.2/libarc/arc.c Mon Feb 7 07:37:44 2000 @@ -1,3 +1,23 @@ +/* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + #ifdef HAVE_CONFIG_H #include "config.h" #endif /* HAVE_CONFIG_H */ diff -ruN TiMidity++-2.8.1/libarc/arc.h TiMidity++-2.8.2/libarc/arc.h --- TiMidity++-2.8.1/libarc/arc.h Wed Aug 18 02:08:56 1999 +++ TiMidity++-2.8.2/libarc/arc.h Mon Feb 7 07:37:42 2000 @@ -1,5 +1,24 @@ #ifndef ___LIBARC_H_ #define ___LIBARC_H_ +/* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ /* Archive library */ diff -ruN TiMidity++-2.8.1/libarc/arc_lzh.c TiMidity++-2.8.2/libarc/arc_lzh.c --- TiMidity++-2.8.1/libarc/arc_lzh.c Mon Aug 9 19:42:20 1999 +++ TiMidity++-2.8.2/libarc/arc_lzh.c Mon Feb 7 07:37:38 2000 @@ -1,3 +1,23 @@ +/* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + #ifdef HAVE_CONFIG_H #include "config.h" #endif /* HAVE_CONFIG_H */ diff -ruN TiMidity++-2.8.1/libarc/arc_mime.c TiMidity++-2.8.2/libarc/arc_mime.c --- TiMidity++-2.8.1/libarc/arc_mime.c Sun Aug 8 18:41:26 1999 +++ TiMidity++-2.8.2/libarc/arc_mime.c Mon Feb 7 07:37:36 2000 @@ -1,3 +1,23 @@ +/* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + #ifdef HAVE_CONFIG_H #include "config.h" #endif /* HAVE_CONFIG_H */ diff -ruN TiMidity++-2.8.1/libarc/arc_tar.c TiMidity++-2.8.2/libarc/arc_tar.c --- TiMidity++-2.8.1/libarc/arc_tar.c Sun Aug 8 01:49:46 1999 +++ TiMidity++-2.8.2/libarc/arc_tar.c Mon Feb 7 07:37:32 2000 @@ -1,3 +1,23 @@ +/* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + #ifdef HAVE_CONFIG_H #include "config.h" #endif /* HAVE_CONFIG_H */ diff -ruN TiMidity++-2.8.1/libarc/arc_zip.c TiMidity++-2.8.2/libarc/arc_zip.c --- TiMidity++-2.8.1/libarc/arc_zip.c Sat Aug 7 21:14:01 1999 +++ TiMidity++-2.8.2/libarc/arc_zip.c Mon Feb 7 07:37:31 2000 @@ -1,3 +1,23 @@ +/* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + #ifdef HAVE_CONFIG_H #include "config.h" #endif /* HAVE_CONFIG_H */ diff -ruN TiMidity++-2.8.1/libarc/deflate.c TiMidity++-2.8.2/libarc/deflate.c --- TiMidity++-2.8.1/libarc/deflate.c Sun Feb 21 20:03:00 1999 +++ TiMidity++-2.8.2/libarc/deflate.c Mon Feb 7 07:37:29 2000 @@ -1,3 +1,23 @@ +/* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + #ifdef HAVE_CONFIG_H #include "config.h" #endif /* HAVE_CONFIG_H */ diff -ruN TiMidity++-2.8.1/libarc/explode.c TiMidity++-2.8.2/libarc/explode.c --- TiMidity++-2.8.1/libarc/explode.c Mon Nov 2 12:29:06 1998 +++ TiMidity++-2.8.2/libarc/explode.c Mon Feb 7 07:37:27 2000 @@ -1,3 +1,23 @@ +/* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + #ifdef HAVE_CONFIG_H #include "config.h" #endif /* HAVE_CONFIG_H */ diff -ruN TiMidity++-2.8.1/libarc/explode.h TiMidity++-2.8.2/libarc/explode.h --- TiMidity++-2.8.1/libarc/explode.h Mon Nov 2 12:29:06 1998 +++ TiMidity++-2.8.2/libarc/explode.h Mon Feb 7 07:37:25 2000 @@ -1,5 +1,24 @@ #ifndef ___EXPLODE_H_ #define ___EXPLODE_H_ +/* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ typedef struct _ExplodeHandler *ExplodeHandler; diff -ruN TiMidity++-2.8.1/libarc/inflate.c TiMidity++-2.8.2/libarc/inflate.c --- TiMidity++-2.8.1/libarc/inflate.c Sun Feb 21 20:02:20 1999 +++ TiMidity++-2.8.2/libarc/inflate.c Mon Feb 7 07:37:23 2000 @@ -1,3 +1,23 @@ +/* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + #ifdef HAVE_CONFIG_H #include "config.h" #endif /* HAVE_CONFIG_H */ diff -ruN TiMidity++-2.8.1/libarc/unlzh.c TiMidity++-2.8.2/libarc/unlzh.c --- TiMidity++-2.8.1/libarc/unlzh.c Mon Nov 2 12:29:06 1998 +++ TiMidity++-2.8.2/libarc/unlzh.c Mon Feb 7 07:37:20 2000 @@ -1,3 +1,23 @@ +/* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + #ifdef HAVE_CONFIG_H #include "config.h" #endif /* HAVE_CONFIG_H */ diff -ruN TiMidity++-2.8.1/libarc/unlzh.h TiMidity++-2.8.2/libarc/unlzh.h --- TiMidity++-2.8.1/libarc/unlzh.h Mon Nov 2 12:29:06 1998 +++ TiMidity++-2.8.2/libarc/unlzh.h Mon Feb 7 07:37:18 2000 @@ -1,5 +1,24 @@ #ifndef ___LZH_H_ #define ___LZH_H_ +/* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ typedef struct _UNLZHHandler *UNLZHHandler; diff -ruN TiMidity++-2.8.1/libarc/url.c TiMidity++-2.8.2/libarc/url.c --- TiMidity++-2.8.1/libarc/url.c Wed Aug 18 02:08:56 1999 +++ TiMidity++-2.8.2/libarc/url.c Mon Feb 7 07:37:15 2000 @@ -1,3 +1,23 @@ +/* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + #ifdef HAVE_CONFIG_H #include "config.h" #endif /* HAVE_CONFIG_H */ diff -ruN TiMidity++-2.8.1/libarc/url.h TiMidity++-2.8.2/libarc/url.h --- TiMidity++-2.8.1/libarc/url.h Fri Sep 3 02:30:27 1999 +++ TiMidity++-2.8.2/libarc/url.h Mon Feb 7 07:37:13 2000 @@ -1,10 +1,30 @@ #ifndef ___URL_H_ #define ___URL_H_ +/* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ /* This header file from liburl-1.8.3. * You can get full source from: * http://www.goice.co.jp/member/mo/release/index.html#liburl */ + #define URL_LIB_VERSION "1.9.4" diff -ruN TiMidity++-2.8.1/libarc/url_b64decode.c TiMidity++-2.8.2/libarc/url_b64decode.c --- TiMidity++-2.8.1/libarc/url_b64decode.c Mon Nov 2 12:29:06 1998 +++ TiMidity++-2.8.2/libarc/url_b64decode.c Mon Feb 7 07:37:04 2000 @@ -1,3 +1,23 @@ +/* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + #ifdef HAVE_CONFIG_H #include "config.h" #endif /* HAVE_CONFIG_H */ diff -ruN TiMidity++-2.8.1/libarc/url_buff.c TiMidity++-2.8.2/libarc/url_buff.c --- TiMidity++-2.8.1/libarc/url_buff.c Mon Nov 2 12:29:06 1998 +++ TiMidity++-2.8.2/libarc/url_buff.c Mon Feb 7 07:37:02 2000 @@ -1,3 +1,23 @@ +/* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + #ifdef HAVE_CONFIG_H #include "config.h" #endif /* HAVE_CONFIG_H */ diff -ruN TiMidity++-2.8.1/libarc/url_cache.c TiMidity++-2.8.2/libarc/url_cache.c --- TiMidity++-2.8.1/libarc/url_cache.c Mon Nov 2 12:29:06 1998 +++ TiMidity++-2.8.2/libarc/url_cache.c Mon Feb 7 07:37:00 2000 @@ -1,3 +1,23 @@ +/* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + #ifdef HAVE_CONFIG_H #include "config.h" #endif /* HAVE_CONFIG_H */ diff -ruN TiMidity++-2.8.1/libarc/url_dir.c TiMidity++-2.8.2/libarc/url_dir.c --- TiMidity++-2.8.1/libarc/url_dir.c Wed Aug 25 10:52:36 1999 +++ TiMidity++-2.8.2/libarc/url_dir.c Mon Feb 7 07:36:58 2000 @@ -1,3 +1,23 @@ +/* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + #ifdef HAVE_CONFIG_H #include "config.h" #endif /* HAVE_CONFIG_H */ diff -ruN TiMidity++-2.8.1/libarc/url_file.c TiMidity++-2.8.2/libarc/url_file.c --- TiMidity++-2.8.1/libarc/url_file.c Fri Sep 3 02:31:39 1999 +++ TiMidity++-2.8.2/libarc/url_file.c Mon Feb 7 07:36:56 2000 @@ -1,3 +1,23 @@ +/* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + #ifdef HAVE_CONFIG_H #include "config.h" #endif /* HAVE_CONFIG_H */ diff -ruN TiMidity++-2.8.1/libarc/url_ftp.c TiMidity++-2.8.2/libarc/url_ftp.c --- TiMidity++-2.8.1/libarc/url_ftp.c Mon Mar 1 21:00:58 1999 +++ TiMidity++-2.8.2/libarc/url_ftp.c Mon Feb 7 07:36:55 2000 @@ -1,3 +1,23 @@ +/* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + #ifdef HAVE_CONFIG_H #include "config.h" #endif /* HAVE_CONFIG_H */ diff -ruN TiMidity++-2.8.1/libarc/url_hqxdecode.c TiMidity++-2.8.2/libarc/url_hqxdecode.c --- TiMidity++-2.8.1/libarc/url_hqxdecode.c Mon Nov 2 12:29:06 1998 +++ TiMidity++-2.8.2/libarc/url_hqxdecode.c Mon Feb 7 07:36:53 2000 @@ -1,3 +1,23 @@ +/* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + #ifdef HAVE_CONFIG_H #include "config.h" #endif /* HAVE_CONFIG_H */ diff -ruN TiMidity++-2.8.1/libarc/url_http.c TiMidity++-2.8.2/libarc/url_http.c --- TiMidity++-2.8.1/libarc/url_http.c Mon Mar 1 21:01:10 1999 +++ TiMidity++-2.8.2/libarc/url_http.c Mon Feb 7 07:36:52 2000 @@ -1,3 +1,23 @@ +/* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + #ifdef HAVE_CONFIG_H #include "config.h" #endif /* HAVE_CONFIG_H */ diff -ruN TiMidity++-2.8.1/libarc/url_inflate.c TiMidity++-2.8.2/libarc/url_inflate.c --- TiMidity++-2.8.1/libarc/url_inflate.c Sun Feb 21 20:04:14 1999 +++ TiMidity++-2.8.2/libarc/url_inflate.c Mon Feb 7 07:36:50 2000 @@ -1,3 +1,23 @@ +/* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + #ifdef HAVE_CONFIG_H #include "config.h" #endif /* HAVE_CONFIG_H */ diff -ruN TiMidity++-2.8.1/libarc/url_mem.c TiMidity++-2.8.2/libarc/url_mem.c --- TiMidity++-2.8.1/libarc/url_mem.c Mon Mar 1 20:57:28 1999 +++ TiMidity++-2.8.2/libarc/url_mem.c Mon Feb 7 07:36:49 2000 @@ -1,3 +1,23 @@ +/* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + #ifdef HAVE_CONFIG_H #include "config.h" #endif /* HAVE_CONFIG_H */ diff -ruN TiMidity++-2.8.1/libarc/url_news.c TiMidity++-2.8.2/libarc/url_news.c --- TiMidity++-2.8.1/libarc/url_news.c Mon Mar 1 21:01:18 1999 +++ TiMidity++-2.8.2/libarc/url_news.c Mon Feb 7 07:36:47 2000 @@ -1,3 +1,23 @@ +/* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + #ifdef HAVE_CONFIG_H #include "config.h" #endif /* HAVE_CONFIG_H */ diff -ruN TiMidity++-2.8.1/libarc/url_newsgroup.c TiMidity++-2.8.2/libarc/url_newsgroup.c --- TiMidity++-2.8.1/libarc/url_newsgroup.c Fri Aug 6 21:05:55 1999 +++ TiMidity++-2.8.2/libarc/url_newsgroup.c Mon Feb 7 07:36:45 2000 @@ -1,3 +1,23 @@ +/* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + #ifdef HAVE_CONFIG_H #include "config.h" #endif /* HAVE_CONFIG_H */ diff -ruN TiMidity++-2.8.1/libarc/url_pipe.c TiMidity++-2.8.2/libarc/url_pipe.c --- TiMidity++-2.8.1/libarc/url_pipe.c Fri Feb 26 11:43:04 1999 +++ TiMidity++-2.8.2/libarc/url_pipe.c Mon Feb 7 07:36:43 2000 @@ -1,3 +1,23 @@ +/* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + #ifdef HAVE_CONFIG_H #include "config.h" #endif /* HAVE_CONFIG_H */ diff -ruN TiMidity++-2.8.1/libarc/url_qsdecode.c TiMidity++-2.8.2/libarc/url_qsdecode.c --- TiMidity++-2.8.1/libarc/url_qsdecode.c Mon Nov 2 12:29:06 1998 +++ TiMidity++-2.8.2/libarc/url_qsdecode.c Mon Feb 7 07:36:40 2000 @@ -1,3 +1,23 @@ +/* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + #ifdef HAVE_CONFIG_H #include "config.h" #endif /* HAVE_CONFIG_H */ diff -ruN TiMidity++-2.8.1/libarc/url_uudecode.c TiMidity++-2.8.2/libarc/url_uudecode.c --- TiMidity++-2.8.1/libarc/url_uudecode.c Mon Nov 2 12:29:06 1998 +++ TiMidity++-2.8.2/libarc/url_uudecode.c Mon Feb 7 07:35:32 2000 @@ -1,3 +1,23 @@ +/* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + #ifdef HAVE_CONFIG_H #include "config.h" #endif /* HAVE_CONFIG_H */ diff -ruN TiMidity++-2.8.1/libarc/zip.h TiMidity++-2.8.2/libarc/zip.h --- TiMidity++-2.8.1/libarc/zip.h Sun Feb 21 20:02:44 1999 +++ TiMidity++-2.8.2/libarc/zip.h Mon Feb 7 07:36:22 2000 @@ -1,3 +1,23 @@ +/* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + #ifndef ___ZIP_H_ #define ___ZIP_H_ diff -ruN TiMidity++-2.8.1/timidity/Makefile.am TiMidity++-2.8.2/timidity/Makefile.am --- TiMidity++-2.8.1/timidity/Makefile.am Thu Sep 2 23:05:51 1999 +++ TiMidity++-2.8.2/timidity/Makefile.am Mon Feb 7 08:02:27 2000 @@ -1,5 +1,5 @@ # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999 Masanao Izumo +# Copyright (C) 1999,2000 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/Makefile.in TiMidity++-2.8.2/timidity/Makefile.in --- TiMidity++-2.8.1/timidity/Makefile.in Mon Nov 29 11:59:31 1999 +++ TiMidity++-2.8.2/timidity/Makefile.in Mon Feb 7 21:39:34 2000 @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999 Masanao Izumo +# Copyright (C) 1999,2000 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/aenc.h TiMidity++-2.8.2/timidity/aenc.h --- TiMidity++-2.8.1/timidity/aenc.h Mon Nov 30 17:49:52 1998 +++ TiMidity++-2.8.2/timidity/aenc.h Mon Feb 7 08:02:23 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/aiff_a.c TiMidity++-2.8.2/timidity/aiff_a.c --- TiMidity++-2.8.1/timidity/aiff_a.c Fri Jul 30 23:04:16 1999 +++ TiMidity++-2.8.2/timidity/aiff_a.c Mon Feb 7 08:02:19 2000 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/alsa_a.c TiMidity++-2.8.2/timidity/alsa_a.c --- TiMidity++-2.8.1/timidity/alsa_a.c Mon Sep 6 06:42:38 1999 +++ TiMidity++-2.8.2/timidity/alsa_a.c Mon Feb 7 15:29:27 2000 @@ -1,7 +1,6 @@ -/* - +/* -*- c-file-style: "gnu" -*- TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -42,6 +41,17 @@ /*ALSA header file*/ #include +#if defined(SND_LIB_MINOR) +#define ALSA_LIB SND_LIB_MINOR +#else +#define ALSA_LIB 3 +#endif + +#if ALSA_LIB < 4 +typedef void snd_pcm_t; +#endif + + #include "timidity.h" #include "common.h" #include "output.h" @@ -55,7 +65,11 @@ static void close_output(void); static int output_data(char *buf, int32 nbytes); static int acntl(int request, void *arg); -static int total_bytes, output_counter; +static int total_bytes; +static int output_counter; +#if ALSA_LIB >= 5 +static int bytes_to_go; +#endif /* export the playback mode */ @@ -84,7 +98,7 @@ static snd_pcm_t* handle = NULL; static int card = 0; static int device = 0; - +static int frag_size = 0; static void error_report (int snd_error) { @@ -114,7 +128,7 @@ *device__ = 0; if (env_pcm_device != NULL) *device__ = atoi (env_pcm_device); - + tmp = snd_cards (); if (tmp == 0) { @@ -126,7 +140,7 @@ error_report (tmp); return -1; } - + if (*card__ < 0 || *card__ >= tmp) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "There is %d sound cards." @@ -136,7 +150,7 @@ } tmp = snd_ctl_open (&ctl_handle, *card__); - if (tmp != 0) + if (tmp < 0) { error_report (tmp); return -1; @@ -152,7 +166,7 @@ snd_ctl_close (ctl_handle); return -1; } - + if (*device__ < 0 || *device__ >= ctl_hw_info.pcmdevs) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, @@ -160,7 +174,7 @@ " %d is invalid pcm device. assuming 0.", *card__, ctl_hw_info.longname, ctl_hw_info.pcmdevs, *device__); *device__ = 0; - + if (ctl_hw_info.pcmdevs == 0) {/*sound card has no pcm devices*/ snd_ctl_close (ctl_handle); @@ -170,13 +184,13 @@ /*check whether pcm device is able to playback*/ tmp = snd_ctl_pcm_info(ctl_handle, *device__, &pcm_info); - if (tmp != 0) + if (tmp < 0) { error_report (tmp); snd_ctl_close (ctl_handle); return -1; } - + if ((pcm_info.flags & SND_PCM_INFO_PLAYBACK) == 0) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, @@ -188,9 +202,9 @@ snd_ctl_close (ctl_handle); return -1; } - + tmp = snd_ctl_close (ctl_handle); - if (tmp != 0) + if (tmp < 0) { error_report (tmp); return -1; @@ -203,72 +217,111 @@ == 1 warning == -1 fails */ -static int set_playback_info (void* handle__, +static int set_playback_info (snd_pcm_t* handle__, int32* encoding__, int32* rate__, const int32 extra_param[5]) { int ret_val = 0; const int32 orig_encoding = *encoding__; const int32 orig_rate = *rate__; - snd_pcm_playback_info_t playback_info; - snd_pcm_format_t pcm_format; - struct snd_pcm_playback_params playback_params; - struct snd_pcm_playback_status playback_status; int tmp; +#if ALSA_LIB >= 5 + snd_pcm_channel_info_t pinfo; + snd_pcm_channel_params_t pparams; + snd_pcm_channel_setup_t psetup; +#else + snd_pcm_playback_info_t pinfo; + snd_pcm_format_t pcm_format; + struct snd_pcm_playback_params pparams; + struct snd_pcm_playback_status pstatus; memset (&pcm_format, 0, sizeof (pcm_format)); - memset (&playback_params, 0, sizeof (playback_params)); - - tmp = snd_pcm_playback_info (handle__, &playback_info); - if (tmp != 0) +#endif + memset (&pparams, 0, sizeof (pparams)); + +#if ALSA_LIB >= 5 + memset (&pinfo, 0, sizeof (pinfo)); + pinfo.channel = SND_PCM_CHANNEL_PLAYBACK; + tmp = snd_pcm_channel_info (handle__, &pinfo); +#else + tmp = snd_pcm_playback_info (handle__, &pinfo); +#endif + if (tmp < 0) { error_report (tmp); return -1; } /*check sample bit*/ - if ((playback_info.flags & SND_PCM_PINFO_8BITONLY) != 0) - *encoding__ &= ~PE_16BIT;/*force 8bit samles*/ - if ((playback_info.flags & SND_PCM_PINFO_16BITONLY) != 0) - *encoding__ |= PE_16BIT;/*force 16bit samples*/ - +#if ALSA_LIB >= 5 + if (!(pinfo.formats & ~(SND_PCM_FMT_S8 | SND_PCM_FMT_U8))) + *encoding__ &= ~PE_16BIT; /*force 8bit samples*/ + if (!(pinfo.formats & ~(SND_PCM_FMT_S16 | SND_PCM_FMT_U16))) + *encoding__ |= PE_16BIT; /*force 16bit samples*/ +#else + if ((pinfo.flags & SND_PCM_PINFO_8BITONLY) != 0) + *encoding__ &= ~PE_16BIT; /*force 8bit samples*/ + if ((pinfo.flags & SND_PCM_PINFO_16BITONLY) != 0) + *encoding__ |= PE_16BIT; /*force 16bit samples*/ +#endif + /*check rate*/ - if (playback_info.min_rate > *rate__) - *rate__ = playback_info.min_rate; - if (playback_info.max_rate < *rate__) - *rate__ = playback_info.max_rate; + if (pinfo.min_rate > *rate__) + *rate__ = pinfo.min_rate; + if (pinfo.max_rate < *rate__) + *rate__ = pinfo.max_rate; +#if ALSA_LIB >= 5 + pparams.format.rate = *rate__; +#else pcm_format.rate = *rate__; +#endif /*check channels*/ - if ((*encoding__ & PE_MONO) != 0 && playback_info.min_channels > 1) +#if ALSA_LIB >= 5 + if ((*encoding__ & PE_MONO) != 0 && pinfo.min_voices > 1) + *encoding__ &= ~PE_MONO; + if ((*encoding__ & PE_MONO) == 0 && pinfo.max_voices < 2) + *encoding__ |= PE_MONO; + + if ((*encoding__ & PE_MONO) != 0) + pparams.format.voices = 1; /*mono*/ + else + pparams.format.voices = 2; /*stereo*/ +#else /* ALSA_LIB < 5 */ + if ((*encoding__ & PE_MONO) != 0 && pinfo.min_channels > 1) *encoding__ &= ~PE_MONO; - if ((*encoding__ & PE_MONO) == 0 && playback_info.max_channels < 2) + if ((*encoding__ & PE_MONO) == 0 && pinfo.max_channels < 2) *encoding__ |= PE_MONO; - + if ((*encoding__ & PE_MONO) != 0) - pcm_format.channels = 1;/*mono*/ + pcm_format.channels = 1; /*mono*/ else - pcm_format.channels = 2;/*stereo*/ + pcm_format.channels = 2; /*stereo*/ +#endif /*check format*/ if ((*encoding__ & PE_16BIT) != 0) - {/*16bit*/ - if ((playback_info.formats & SND_PCM_FMT_S16_LE) != 0) + { /*16bit*/ + if ((pinfo.formats & SND_PCM_FMT_S16_LE) != 0) { +#if ALSA_LIB >= 5 + pparams.format.format = SND_PCM_SFMT_S16_LE; +#else pcm_format.format = SND_PCM_SFMT_S16_LE; +#endif *encoding__ |= PE_SIGNED; } #if 0 - else if ((playback_info.formats & SND_PCM_FMT_U16_LE) != 0) + else if ((pinfo.formats & SND_PCM_FMT_U16_LE) != 0) { pcm_format.format = SND_PCM_SFMT_U16_LE; *encoding__ &= ~PE_SIGNED; } - else if ((playback_info.formats & SND_PCM_FMT_S16_BE) != 0) + else if ((pinfo.formats & SND_PCM_FMT_S16_BE) != 0) { pcm_format.format = SND_PCM_SFMT_S16_BE; *encoding__ |= PE_SIGNED; } - else if ((playback_info.formats & SND_PCM_FMT_U16_BE) != 0) + else if ((pinfo.formats & SND_PCM_FMT_U16_BE) != 0) { pcm_format.format = SND_PCM_SFMT_U16_LE; *encoding__ &= ~PE_SIGNED; @@ -283,14 +336,18 @@ } } else - {/*8bit*/ - if ((playback_info.formats & SND_PCM_FMT_U8) != 0) + { /*8bit*/ + if ((pinfo.formats & SND_PCM_FMT_U8) != 0) { +#if ALSA_LIB >= 5 + pparams.format.format = SND_PCM_SFMT_U8; +#else pcm_format.format = SND_PCM_SFMT_U8; +#endif *encoding__ &= ~PE_SIGNED; } #if 0 - else if ((playback_info.formats & SND_PCM_FMT_S8) != 0) + else if ((pinfo.formats & SND_PCM_FMT_S8) != 0) { pcm_format.format = SND_PCM_SFMT_U16_LE; *encoding__ |= PE_SIGNED; @@ -305,9 +362,10 @@ } } - + +#if ALSA_LIB < 5 tmp = snd_pcm_playback_format (handle__, &pcm_format); - if (tmp != 0) + if (tmp < 0) { error_report (tmp); return -1; @@ -326,57 +384,110 @@ ((*encoding__ & PE_MONO) != 0)? "mono" : "stereo"); ret_val = 1; } - - /* Set buffer fragments (in extra_param[0]) */ - tmp = AUDIO_BUFFER_BITS; - if (!(*encoding__ & PE_MONO)) - tmp++; - if (*encoding__ & PE_16BIT) - tmp++; -#if 0 - tmp++; - playback_params.fragment_size = (1 << tmp); - if (extra_param[0] == 0) - playback_params.fragments_max = 7;/*default value. What's value is apporpriate?*/ - else - playback_params.fragments_max = extra_param[0]; -#else - playback_params.fragment_size = (1 << tmp); +#endif - if (extra_param[0] == 0) - playback_params.fragments_max = 15;/*default value. What's value is apporpriate?*/ + /* Set buffer fragment size (in extra_param[1]) */ + if (extra_param[1] != 0) + tmp = extra_param[1]; else - playback_params.fragments_max = extra_param[0]; + { + tmp = AUDIO_BUFFER_SIZE; + if (!(*encoding__ & PE_MONO)) + tmp <<= 1; + if (*encoding__ & PE_16BIT) + tmp <<= 1; + } + + /* Set buffer fragments (in extra_param[0]) */ +#if ALSA_LIB >= 5 + pparams.buf.block.frag_size = tmp; + pparams.buf.block.frags_max = (extra_param[0] == 0) ? -1 : extra_param[0]; + pparams.buf.block.frags_min = 1; + + pparams.mode = SND_PCM_MODE_BLOCK; + pparams.channel = SND_PCM_CHANNEL_PLAYBACK; + pparams.start_mode = SND_PCM_START_GO; + pparams.stop_mode = SND_PCM_STOP_STOP; + pparams.format.interleave = 1; + snd_pcm_channel_flush (handle__, SND_PCM_CHANNEL_PLAYBACK); + tmp = snd_pcm_channel_params (handle__, &pparams); +#else + pparams.fragment_size = tmp; + pparams.fragments_max = (extra_param[0] == 0) ? -1 : extra_param[0]; + pparams.fragments_room = 1; + tmp = snd_pcm_playback_params (handle__, &pparams); #endif - playback_params.fragments_room = 1; - tmp = snd_pcm_playback_params (handle__, &playback_params); - if (tmp != 0) + if (tmp < 0) { +#if ALSA_LIB >= 5 + ctl->cmsg(CMSG_WARNING, VERB_NORMAL, + "%s doesn't support buffer fragments" + ":request size=%d, max=%d, min=%d\n", + dpm.name, + pparams.buf.block.frag_size, + pparams.buf.block.frags_max, + pparams.buf.block.frags_min); +#else ctl->cmsg(CMSG_WARNING, VERB_NORMAL, "%s doesn't support buffer fragments" ":request size=%d, max=%d, room=%d\n", dpm.name, - playback_params.fragment_size, - playback_params.fragments_max, - playback_params.fragments_room); + pparams.fragment_size, + pparams.fragments_max, + pparams.fragments_room); +#endif ret_val =1; } - if(snd_pcm_playback_status(handle__, &playback_status) == 0) +#if ALSA_LIB >= 5 + tmp = snd_pcm_channel_prepare (handle__, SND_PCM_CHANNEL_PLAYBACK); + if (tmp < 0) + { + ctl->cmsg(CMSG_WARNING, VERB_NORMAL, + "unable to prepare channel\n"); + return -1; + } +#endif + +#if ALSA_LIB >= 5 + memset (&psetup, 0, sizeof(psetup)); + psetup.channel = SND_PCM_CHANNEL_PLAYBACK; + tmp = snd_pcm_channel_setup (handle__, &psetup); + if (tmp == 0) + { + if(psetup.format.rate != orig_rate) + { + ctl->cmsg(CMSG_WARNING, VERB_VERBOSE, + "Output rate adjusted to %d Hz (requested %d Hz)", + psetup.format.rate, orig_rate); + dpm.rate = psetup.format.rate; + ret_val = 1; + } + frag_size = psetup.buf.block.frag_size; + total_bytes = frag_size * psetup.buf.block.frags; + bytes_to_go = total_bytes; + } +#else /* ALSA_LIB < 5 */ + if (snd_pcm_playback_status(handle__, &pstatus) == 0) { - if (playback_status.rate != orig_rate) + if (pstatus.rate != orig_rate) { ctl->cmsg(CMSG_WARNING, VERB_VERBOSE, "Output rate adjusted to %d Hz (requested %d Hz)", - playback_status.rate, orig_rate); - dpm.rate = playback_status.rate; + pstatus.rate, orig_rate); + dpm.rate = pstatus.rate; ret_val = 1; } - total_bytes = playback_status.count; + frag_size = pstatus.fragment_size; + total_bytes = pstatus.count; } +#endif else - total_bytes = -1; /* snd_pcm_playback_status fails */ + { + frag_size = 0; + total_bytes = -1; /* snd_pcm_playback_status fails */ + } return ret_val; } @@ -385,14 +496,14 @@ { int tmp, warnings=0; int ret; - + tmp = check_sound_cards (&card, &device, dpm.extra_param); - if (tmp != 0) + if (tmp < 0) return -1; - + /* Open the audio device */ ret = snd_pcm_open (&handle, card, device, SND_PCM_OPEN_PLAYBACK); - if (ret != 0) + if (ret < 0) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "%s: %s", dpm.name, snd_strerror (ret)); @@ -403,13 +514,17 @@ dpm.encoding &= ~(PE_ULAW|PE_ALAW|PE_BYTESWAP); warnings = set_playback_info (handle, &dpm.encoding, &dpm.rate, dpm.extra_param); - if (warnings == -1) + if (warnings < 0) { close_output (); return -1; } +#if ALSA_LIB >= 5 + dpm.fd = snd_pcm_file_descriptor (handle, SND_PCM_CHANNEL_PLAYBACK); +#else dpm.fd = snd_pcm_file_descriptor (handle); +#endif output_counter = 0; return warnings; } @@ -417,90 +532,192 @@ static void close_output(void) { int ret; - + if (handle == NULL) return; - + ret = snd_pcm_close (handle); - if (ret != 0) - error_report (ret); +#if ALSA_LIB == 5 /* Maybe alsa-driver 0.5 has a bug */ + if (ret != -EINVAL) +#endif + if (ret < 0) + error_report (ret); handle = NULL; - + dpm.fd = -1; } static int output_data(char *buf, int32 nbytes) { - int n; + int n; - while(nbytes > 0) +#if ALSA_LIB >= 5 + snd_pcm_channel_status_t status; + + n = snd_pcm_write (handle, buf, nbytes); + if (n < 0) { - n = snd_pcm_write(handle, buf, nbytes); - if(n == -1) + memset (&status, 0, sizeof(status)); + status.channel = SND_PCM_CHANNEL_PLAYBACK; + if (snd_pcm_channel_status(handle, &status) < 0) + { + ctl->cmsg(CMSG_WARNING, VERB_DEBUG, + "%s: could not get channel status", dpm.name); + return -1; + } + if (status.status == SND_PCM_STATUS_UNDERRUN) + { + ctl->cmsg(CMSG_INFO, VERB_DEBUG, + "%s: underrun at %d", dpm.name, status.scount); + output_counter += status.scount; + snd_pcm_channel_flush (handle, SND_PCM_CHANNEL_PLAYBACK); + snd_pcm_channel_prepare (handle, SND_PCM_CHANNEL_PLAYBACK); + bytes_to_go = total_bytes; + n = snd_pcm_write (handle, buf, nbytes); + } + if (n < 0) { - ctl->cmsg(CMSG_WARNING, VERB_DEBUG, - "%s: %s", dpm.name, strerror(errno)); - if(errno == EWOULDBLOCK) - continue; - return -1; + ctl->cmsg(CMSG_WARNING, VERB_DEBUG, + "%s: %s", dpm.name, + (n < 0) ? snd_strerror(n) : "write error"); + return -1; + } + } + + if (bytes_to_go > 0) { + bytes_to_go -= nbytes; + if (bytes_to_go <= 0) { + if (snd_pcm_channel_go(handle, SND_PCM_CHANNEL_PLAYBACK) < 0) { + ctl->cmsg(CMSG_WARNING, VERB_DEBUG, + "%s: could not start playing", dpm.name); + return -1; + } + } + } + +#else /* ALSA_LIB < 5 */ + while (nbytes > 0) + { + n = snd_pcm_write (handle, buf, nbytes); + + if (n < 0) + { + ctl->cmsg(CMSG_WARNING, VERB_DEBUG, + "%s: %s", dpm.name, snd_strerror(n)); + if (n == -EWOULDBLOCK) + continue; + return -1; } - buf += n; - nbytes -= n; - output_counter += n; + buf += n; + nbytes -= n; + output_counter += n; } +#endif - return 0; + return 0; } static int acntl(int request, void *arg) { - struct snd_pcm_playback_status playback_status; - int i; + int i; +#if ALSA_LIB >= 5 + snd_pcm_channel_status_t pstatus; + memset (&pstatus, 0, sizeof (pstatus)); + pstatus.channel = SND_PCM_CHANNEL_PLAYBACK; +#else + struct snd_pcm_playback_status pstatus; +#endif - switch(request) + switch (request) { + case PM_REQ_GETFRAGSIZ: + if (frag_size == 0) + return -1; + *((int *)arg) = frag_size; + return 0; + case PM_REQ_GETQSIZ: - if(total_bytes == -1) + if (total_bytes == -1) return -1; *((int *)arg) = total_bytes; return 0; case PM_REQ_GETFILLABLE: - if(total_bytes == -1) + if (total_bytes == -1) return -1; - if(snd_pcm_playback_status(handle, &playback_status) != 0) +#if ALSA_LIB >= 5 + if (snd_pcm_channel_status(handle, &pstatus) < 0) return -1; - *((int *)arg) = playback_status.count; + i = pstatus.free; +#else /* ALSA_LIB < 5 */ + if (snd_pcm_playback_status(handle, &pstatus) < 0) + return -1; + i = pstatus.count; +#endif + if(!(dpm.encoding & PE_MONO)) i >>= 1; + if(dpm.encoding & PE_16BIT) i >>= 1; + *((int *)arg) = i; return 0; case PM_REQ_GETFILLED: - if(total_bytes == -1) + if (total_bytes == -1) + return -1; +#if ALSA_LIB >= 5 + if (snd_pcm_channel_status(handle, &pstatus) < 0) return -1; - if(snd_pcm_playback_status(handle, &playback_status) != 0) + i = pstatus.count; +#else /* ALSA_LIB < 5 */ + if (snd_pcm_playback_status(handle, &pstatus) < 0) return -1; - *((int *)arg) = playback_status.queue; + i = pstatus.queue; +#endif + if(!(dpm.encoding & PE_MONO)) i >>= 1; + if(dpm.encoding & PE_16BIT) i >>= 1; + *((int *)arg) = i; return 0; case PM_REQ_GETSAMPLES: - if(total_bytes == -1) + if (total_bytes == -1) return -1; - if(snd_pcm_playback_status(handle, &playback_status) != 0) +#if ALSA_LIB >= 5 + if (snd_pcm_channel_status(handle, &pstatus) < 0) return -1; - i = output_counter - playback_status.queue; - if(!(dpm.encoding & PE_MONO)) i >>= 1; - if(dpm.encoding & PE_16BIT) i >>= 1; + i = output_counter + pstatus.scount; +#else + if (snd_pcm_playback_status(handle, &pstatus) < 0) + return -1; + i = output_counter - pstatus.queue; +#endif + if (!(dpm.encoding & PE_MONO)) i >>= 1; + if (dpm.encoding & PE_16BIT) i >>= 1; *((int *)arg) = i; return 0; case PM_REQ_DISCARD: - if(snd_pcm_drain_playback (handle) != 0) - return -1; /* error */ +#if ALSA_LIB >= 5 + if (snd_pcm_playback_drain(handle) < 0) + return -1; + if (snd_pcm_channel_prepare(handle, SND_PCM_CHANNEL_PLAYBACK) < 0) + return -1; + bytes_to_go = total_bytes; +#else + if (snd_pcm_drain_playback (handle) < 0) + return -1; /* error */ +#endif output_counter = 0; return 0; case PM_REQ_FLUSH: - if(snd_pcm_flush_playback(handle) != 0) +#if ALSA_LIB >= 5 + if (snd_pcm_channel_flush(handle, SND_PCM_CHANNEL_PLAYBACK) < 0) + return -1; + if (snd_pcm_channel_prepare(handle, SND_PCM_CHANNEL_PLAYBACK) < 0) + return -1; + bytes_to_go = total_bytes; +#else + if (snd_pcm_flush_playback(handle) < 0) return -1; /* error */ +#endif output_counter = 0; return 0; } diff -ruN TiMidity++-2.8.1/timidity/aq.c TiMidity++-2.8.2/timidity/aq.c --- TiMidity++-2.8.1/timidity/aq.c Mon Sep 20 18:41:33 1999 +++ TiMidity++-2.8.2/timidity/aq.c Mon Feb 7 08:01:34 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -90,6 +89,35 @@ extern void init_effect(void); extern int do_effect(int32* buf, int32 count); +int aq_calc_fragsize(void) +{ + int ch, bps, bs; + double dq, bt; + + if(play_mode->encoding & PE_MONO) + ch = 1; + else + ch = 2; + if(play_mode->encoding & PE_16BIT) + bps = ch * 2; + else + bps = ch; + + bs = AUDIO_BUFFER_SIZE * bps; + dq = play_mode->rate * MAX_FILLED_TIME * bps; + while(bs * 2 > dq) + bs /= 2; + + bt = (double)bs / bps / play_mode->rate; + while(bt > MAX_BUCKET_TIME) + { + bs /= 2; + bt = (double)bs / bps / play_mode->rate; + } + + return bs; +} + void aq_setup(void) { int ch; @@ -105,7 +133,8 @@ if(IS_STREAM_TRACE) { - bucket_size = AUDIO_BUFFER_SIZE * Bps; + if(play_mode->acntl(PM_REQ_GETFRAGSIZ, &bucket_size) == -1) + bucket_size = AUDIO_BUFFER_SIZE * Bps; if(play_mode->acntl(PM_REQ_GETQSIZ, &device_qsize) == -1) device_qsize = estimate_queue_size(); else @@ -367,6 +396,11 @@ if(head == NULL) return 0; + if((play_mode->flag & PF_PCM_STREAM) && head->len < bucket_size) { + /* are there any probrems using 0 as the silence code? */ + memset (head->data + head->len, 0, bucket_size - head->len); + head->len = bucket_size; + } if(aq_output_data(head->data, head->len) == -1) return -1; tmp = head; diff -ruN TiMidity++-2.8.1/timidity/aq.h TiMidity++-2.8.2/timidity/aq.h --- TiMidity++-2.8.1/timidity/aq.h Wed Apr 14 19:46:50 1999 +++ TiMidity++-2.8.2/timidity/aq.h Mon Feb 7 08:01:30 2000 @@ -1,9 +1,8 @@ #ifndef ___AQ_H_ #define ___AQ_H_ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -26,6 +25,10 @@ /* interfaces */ + +extern int aq_calc_fragsize(void); +/* aq_calc_fragsize() calculates the best fragment size for audio device. + */ extern void aq_setup(void); /* aq_setup() allocates the buffer for software queue, and estimate diff -ruN TiMidity++-2.8.1/timidity/au_a.c TiMidity++-2.8.2/timidity/au_a.c --- TiMidity++-2.8.1/timidity/au_a.c Fri Jul 30 23:04:08 1999 +++ TiMidity++-2.8.2/timidity/au_a.c Mon Feb 7 08:01:25 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/audio_cnv.c TiMidity++-2.8.2/timidity/audio_cnv.c --- TiMidity++-2.8.1/timidity/audio_cnv.c Wed Aug 25 18:12:24 1999 +++ TiMidity++-2.8.2/timidity/audio_cnv.c Mon Feb 7 08:01:22 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/audio_cnv.h TiMidity++-2.8.2/timidity/audio_cnv.h --- TiMidity++-2.8.1/timidity/audio_cnv.h Mon Nov 30 16:56:42 1998 +++ TiMidity++-2.8.2/timidity/audio_cnv.h Mon Feb 7 08:01:18 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/audriv.h TiMidity++-2.8.2/timidity/audriv.h --- TiMidity++-2.8.1/timidity/audriv.h Mon Nov 30 17:03:04 1998 +++ TiMidity++-2.8.2/timidity/audriv.h Mon Feb 7 08:01:14 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/audriv_a.c TiMidity++-2.8.2/timidity/audriv_a.c --- TiMidity++-2.8.1/timidity/audriv_a.c Sun Apr 25 21:58:50 1999 +++ TiMidity++-2.8.2/timidity/audriv_a.c Mon Feb 7 08:01:10 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/audriv_al.c TiMidity++-2.8.2/timidity/audriv_al.c --- TiMidity++-2.8.1/timidity/audriv_al.c Wed Feb 3 17:29:04 1999 +++ TiMidity++-2.8.2/timidity/audriv_al.c Mon Feb 7 08:01:07 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/audriv_mme.c TiMidity++-2.8.2/timidity/audriv_mme.c --- TiMidity++-2.8.1/timidity/audriv_mme.c Mon Nov 30 17:50:22 1998 +++ TiMidity++-2.8.2/timidity/audriv_mme.c Mon Feb 7 08:01:04 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/audriv_none.c TiMidity++-2.8.2/timidity/audriv_none.c --- TiMidity++-2.8.1/timidity/audriv_none.c Mon Nov 30 17:26:18 1998 +++ TiMidity++-2.8.2/timidity/audriv_none.c Mon Feb 7 08:01:00 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/bsd20_a.c TiMidity++-2.8.2/timidity/bsd20_a.c --- TiMidity++-2.8.1/timidity/bsd20_a.c Thu Feb 18 19:44:26 1999 +++ TiMidity++-2.8.2/timidity/bsd20_a.c Mon Feb 7 08:00:57 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/common.c TiMidity++-2.8.2/timidity/common.c --- TiMidity++-2.8.1/timidity/common.c Tue Oct 12 14:54:47 1999 +++ TiMidity++-2.8.2/timidity/common.c Mon Feb 7 08:00:53 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/common.h TiMidity++-2.8.2/timidity/common.h --- TiMidity++-2.8.1/timidity/common.h Tue Oct 12 14:41:38 1999 +++ TiMidity++-2.8.2/timidity/common.h Mon Feb 7 08:00:50 2000 @@ -1,9 +1,8 @@ #ifndef ___COMMON_H_ #define ___COMMON_H_ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/controls.c TiMidity++-2.8.2/timidity/controls.c --- TiMidity++-2.8.1/timidity/controls.c Mon Jul 26 01:41:44 1999 +++ TiMidity++-2.8.2/timidity/controls.c Mon Feb 7 08:00:46 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/controls.h TiMidity++-2.8.2/timidity/controls.h --- TiMidity++-2.8.1/timidity/controls.h Fri Aug 20 20:47:06 1999 +++ TiMidity++-2.8.2/timidity/controls.h Mon Feb 7 08:00:42 2000 @@ -1,9 +1,8 @@ #ifndef ___CONTROLS_H_ #define ___CONTROLS_H_ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/dl_dld.c TiMidity++-2.8.2/timidity/dl_dld.c --- TiMidity++-2.8.1/timidity/dl_dld.c Thu Sep 2 23:03:38 1999 +++ TiMidity++-2.8.2/timidity/dl_dld.c Mon Feb 7 08:00:35 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/dl_dlopen.c TiMidity++-2.8.2/timidity/dl_dlopen.c --- TiMidity++-2.8.1/timidity/dl_dlopen.c Thu Sep 2 23:03:40 1999 +++ TiMidity++-2.8.2/timidity/dl_dlopen.c Mon Feb 7 08:00:29 2000 @@ -1,3 +1,23 @@ +/* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + #ifdef HAVE_CONFIG_H #include "config.h" #endif /* HAVE_CONFIG_H */ diff -ruN TiMidity++-2.8.1/timidity/dl_hpux.c TiMidity++-2.8.2/timidity/dl_hpux.c --- TiMidity++-2.8.1/timidity/dl_hpux.c Thu Sep 2 23:03:40 1999 +++ TiMidity++-2.8.2/timidity/dl_hpux.c Mon Feb 7 08:00:18 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/dl_w32.c TiMidity++-2.8.2/timidity/dl_w32.c --- TiMidity++-2.8.1/timidity/dl_w32.c Thu Sep 2 23:03:40 1999 +++ TiMidity++-2.8.2/timidity/dl_w32.c Mon Feb 7 08:00:14 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/dlutils.h TiMidity++-2.8.2/timidity/dlutils.h --- TiMidity++-2.8.1/timidity/dlutils.h Thu Sep 2 23:03:40 1999 +++ TiMidity++-2.8.2/timidity/dlutils.h Mon Feb 7 08:00:11 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/effect.c TiMidity++-2.8.2/timidity/effect.c --- TiMidity++-2.8.1/timidity/effect.c Wed Mar 31 13:41:06 1999 +++ TiMidity++-2.8.2/timidity/effect.c Mon Feb 7 08:00:07 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/esd_a.c TiMidity++-2.8.2/timidity/esd_a.c --- TiMidity++-2.8.1/timidity/esd_a.c Fri Apr 9 20:28:52 1999 +++ TiMidity++-2.8.2/timidity/esd_a.c Mon Feb 7 08:00:04 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/filter.c TiMidity++-2.8.2/timidity/filter.c --- TiMidity++-2.8.1/timidity/filter.c Mon Nov 30 17:36:22 1998 +++ TiMidity++-2.8.2/timidity/filter.c Mon Feb 7 08:00:00 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/filter.h TiMidity++-2.8.2/timidity/filter.h --- TiMidity++-2.8.1/timidity/filter.h Mon Nov 30 17:36:18 1998 +++ TiMidity++-2.8.2/timidity/filter.h Mon Feb 7 07:59:57 2000 @@ -1,9 +1,8 @@ #ifndef ___FILTER_H_ #define ___FILTER_H_ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/hpux_a.c TiMidity++-2.8.2/timidity/hpux_a.c --- TiMidity++-2.8.1/timidity/hpux_a.c Mon Aug 30 15:07:18 1999 +++ TiMidity++-2.8.2/timidity/hpux_a.c Mon Feb 7 07:59:53 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/hpux_d_a.c TiMidity++-2.8.2/timidity/hpux_d_a.c --- TiMidity++-2.8.1/timidity/hpux_d_a.c Fri Feb 26 12:49:34 1999 +++ TiMidity++-2.8.2/timidity/hpux_d_a.c Mon Feb 7 07:59:49 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/instrum.c TiMidity++-2.8.2/timidity/instrum.c --- TiMidity++-2.8.1/timidity/instrum.c Tue Oct 26 18:49:55 1999 +++ TiMidity++-2.8.2/timidity/instrum.c Mon Feb 7 07:59:45 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -604,7 +603,7 @@ } /* Then read the sample data */ - sp->data = (sample_t *)safe_malloc(sp->data_length+1); + sp->data = (sample_t *)safe_malloc(sp->data_length+2); sp->data_alloced = 1; if ((j = tf_read(sp->data, 1, sp->data_length, tf)) != sp->data_length) { diff -ruN TiMidity++-2.8.1/timidity/instrum.h TiMidity++-2.8.2/timidity/instrum.h --- TiMidity++-2.8.1/timidity/instrum.h Sun Jul 25 22:43:26 1999 +++ TiMidity++-2.8.2/timidity/instrum.h Mon Feb 7 07:59:41 2000 @@ -1,9 +1,8 @@ #ifndef ___INSTRUM_H_ #define ___INSTRUM_H_ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/list_a.c TiMidity++-2.8.2/timidity/list_a.c --- TiMidity++-2.8.1/timidity/list_a.c Sat Aug 21 16:41:44 1999 +++ TiMidity++-2.8.2/timidity/list_a.c Mon Feb 7 07:59:33 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/load_mod.c TiMidity++-2.8.2/timidity/load_mod.c --- TiMidity++-2.8.1/timidity/load_mod.c Mon Mar 1 21:05:08 1999 +++ TiMidity++-2.8.2/timidity/load_mod.c Mon Feb 7 07:59:30 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/loadtab.c TiMidity++-2.8.2/timidity/loadtab.c --- TiMidity++-2.8.1/timidity/loadtab.c Thu Jun 10 21:55:24 1999 +++ TiMidity++-2.8.2/timidity/loadtab.c Mon Feb 7 07:59:12 2000 @@ -1,3 +1,25 @@ +/* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + + loadtab.c - written by Nando Santagata +*/ + #ifdef HAVE_CONFIG_H #include "config.h" #endif /* HAVE_CONFIG_H */ diff -ruN TiMidity++-2.8.1/timidity/mac_a.c TiMidity++-2.8.2/timidity/mac_a.c --- TiMidity++-2.8.1/timidity/mac_a.c Sat Oct 30 12:23:25 1999 +++ TiMidity++-2.8.2/timidity/mac_a.c Mon Feb 7 08:05:26 2000 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/mac_com.h TiMidity++-2.8.2/timidity/mac_com.h --- TiMidity++-2.8.1/timidity/mac_com.h Sat Oct 30 12:23:25 1999 +++ TiMidity++-2.8.2/timidity/mac_com.h Mon Feb 7 08:02:54 2000 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/mac_dlog.c TiMidity++-2.8.2/timidity/mac_dlog.c --- TiMidity++-2.8.1/timidity/mac_dlog.c Sat Oct 30 12:23:26 1999 +++ TiMidity++-2.8.2/timidity/mac_dlog.c Mon Feb 7 08:03:38 2000 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/mac_main.c TiMidity++-2.8.2/timidity/mac_main.c --- TiMidity++-2.8.1/timidity/mac_main.c Sat Oct 30 12:23:26 1999 +++ TiMidity++-2.8.2/timidity/mac_main.c Mon Feb 7 08:03:32 2000 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/mac_main.h TiMidity++-2.8.2/timidity/mac_main.h --- TiMidity++-2.8.1/timidity/mac_main.h Sat Oct 30 12:23:26 1999 +++ TiMidity++-2.8.2/timidity/mac_main.h Mon Feb 7 08:02:50 2000 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/mac_qt_a.c TiMidity++-2.8.2/timidity/mac_qt_a.c --- TiMidity++-2.8.1/timidity/mac_qt_a.c Sat Oct 30 12:23:26 1999 +++ TiMidity++-2.8.2/timidity/mac_qt_a.c Mon Feb 7 08:03:11 2000 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/mac_soundspec.c TiMidity++-2.8.2/timidity/mac_soundspec.c --- TiMidity++-2.8.1/timidity/mac_soundspec.c Sat Oct 30 12:23:26 1999 +++ TiMidity++-2.8.2/timidity/mac_soundspec.c Mon Feb 7 08:03:21 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/mfnode.c TiMidity++-2.8.2/timidity/mfnode.c --- TiMidity++-2.8.1/timidity/mfnode.c Mon Nov 30 19:19:30 1998 +++ TiMidity++-2.8.2/timidity/mfnode.c Mon Feb 7 07:58:44 2000 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/mfnode.h TiMidity++-2.8.2/timidity/mfnode.h --- TiMidity++-2.8.1/timidity/mfnode.h Mon Nov 30 19:19:38 1998 +++ TiMidity++-2.8.2/timidity/mfnode.h Mon Feb 7 07:58:40 2000 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/miditrace.c TiMidity++-2.8.2/timidity/miditrace.c --- TiMidity++-2.8.1/timidity/miditrace.c Sat Aug 21 00:19:08 1999 +++ TiMidity++-2.8.2/timidity/miditrace.c Mon Feb 7 07:58:36 2000 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/miditrace.h TiMidity++-2.8.2/timidity/miditrace.h --- TiMidity++-2.8.1/timidity/miditrace.h Thu Jul 29 14:52:14 1999 +++ TiMidity++-2.8.2/timidity/miditrace.h Mon Feb 7 07:58:32 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/mix.c TiMidity++-2.8.2/timidity/mix.c --- TiMidity++-2.8.1/timidity/mix.c Tue Nov 16 15:50:29 1999 +++ TiMidity++-2.8.2/timidity/mix.c Mon Feb 7 07:58:29 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen Suddenly, you realize that this program is free software; you get diff -ruN TiMidity++-2.8.1/timidity/mix.h TiMidity++-2.8.2/timidity/mix.h --- TiMidity++-2.8.1/timidity/mix.h Tue Oct 19 22:33:51 1999 +++ TiMidity++-2.8.2/timidity/mix.h Mon Feb 7 07:58:24 2000 @@ -1,9 +1,8 @@ #ifndef ___MIX_H_ #define ___MIX_H_ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen In case you haven't heard, this program is free software; diff -ruN TiMidity++-2.8.1/timidity/mod.c TiMidity++-2.8.2/timidity/mod.c --- TiMidity++-2.8.1/timidity/mod.c Mon Nov 30 17:41:52 1998 +++ TiMidity++-2.8.2/timidity/mod.c Mon Feb 7 07:58:20 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/mod.h TiMidity++-2.8.2/timidity/mod.h --- TiMidity++-2.8.1/timidity/mod.h Mon Nov 30 17:41:58 1998 +++ TiMidity++-2.8.2/timidity/mod.h Mon Feb 7 07:58:16 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/nas_a.c TiMidity++-2.8.2/timidity/nas_a.c --- TiMidity++-2.8.1/timidity/nas_a.c Thu Jul 15 20:35:22 1999 +++ TiMidity++-2.8.2/timidity/nas_a.c Mon Feb 7 07:58:02 2000 @@ -1,6 +1,9 @@ /* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen - Copyright (C) 1999 Michael Haardt + nas_a.c - Copyright (C) 1999 Michael Haardt 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 diff -ruN TiMidity++-2.8.1/timidity/oss_a.c TiMidity++-2.8.2/timidity/oss_a.c --- TiMidity++-2.8.1/timidity/oss_a.c Mon Sep 20 18:29:12 1999 +++ TiMidity++-2.8.2/timidity/oss_a.c Mon Feb 7 07:57:35 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/output.c TiMidity++-2.8.2/timidity/output.c --- TiMidity++-2.8.1/timidity/output.c Mon Aug 30 18:13:10 1999 +++ TiMidity++-2.8.2/timidity/output.c Mon Feb 7 07:57:31 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -81,7 +80,7 @@ #endif /* AU_ALSA */ #ifdef AU_HPUX_ALIB -extern PlayMode hpux_nplay_mode +extern PlayMode hpux_nplay_mode; #endif /* AU_HPUX_ALIB */ #ifdef AU_ESD diff -ruN TiMidity++-2.8.1/timidity/output.h TiMidity++-2.8.2/timidity/output.h --- TiMidity++-2.8.1/timidity/output.h Fri Aug 27 23:43:41 1999 +++ TiMidity++-2.8.2/timidity/output.h Mon Feb 7 07:57:28 2000 @@ -1,9 +1,8 @@ #ifndef ___OUTPUT_H_ #define ___OUTPUT_H_ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -67,6 +66,10 @@ PM_REQ_SETQSIZ, /* ARG: int (in-out) * Set maxmum device queue size in bytes. * The specified ARG is updated new queue size. + */ + + PM_REQ_GETFRAGSIZ, /* ARG: int + * Get device fragment size in bytes. */ PM_REQ_RATE, /* ARG: int diff -ruN TiMidity++-2.8.1/timidity/playmidi.c TiMidity++-2.8.2/timidity/playmidi.c --- TiMidity++-2.8.1/timidity/playmidi.c Fri Nov 26 11:42:11 1999 +++ TiMidity++-2.8.2/timidity/playmidi.c Mon Feb 7 07:57:24 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -2422,7 +2421,7 @@ else channel[ch].drums[note]->pan_random = 0; channel[ch].drums[note]->drum_panning = val; - if(update_now && adjust_panning_immediately) + if(update_now && adjust_panning_immediately && !channel[ch].pan_random) adjust_drum_panning(ch, note); break; case NRPN_ADDR_1D00: /* Reverb Send Level of Drum */ @@ -3946,7 +3945,7 @@ case ME_PAN: channel[ch].panning = ev->a; channel[ch].pan_random = 0; - if(adjust_panning_immediately) + if(adjust_panning_immediately && !channel[ch].pan_random) adjust_panning(ch); ctl_mode_event(CTLE_PANNING, 1, ch, ev->a); break; @@ -4085,7 +4084,7 @@ case ME_RANDOM_PAN: channel[ch].panning = int_rand(128); channel[ch].pan_random = 1; - if(adjust_panning_immediately) + if(adjust_panning_immediately && !channel[ch].pan_random) adjust_panning(ch); break; diff -ruN TiMidity++-2.8.1/timidity/playmidi.h TiMidity++-2.8.2/timidity/playmidi.h --- TiMidity++-2.8.1/timidity/playmidi.h Fri Nov 19 10:51:05 1999 +++ TiMidity++-2.8.2/timidity/playmidi.h Mon Feb 7 07:57:20 2000 @@ -1,9 +1,8 @@ #ifndef ___PLAYMIDI_H_ #define ___PLAYMIDI_H_ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/raw_a.c TiMidity++-2.8.2/timidity/raw_a.c --- TiMidity++-2.8.1/timidity/raw_a.c Fri Jul 30 23:04:22 1999 +++ TiMidity++-2.8.2/timidity/raw_a.c Mon Feb 7 07:57:16 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/rcp.c TiMidity++-2.8.2/timidity/rcp.c --- TiMidity++-2.8.1/timidity/rcp.c Tue Sep 21 21:40:26 1999 +++ TiMidity++-2.8.2/timidity/rcp.c Mon Feb 7 07:57:13 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/readmidi.c TiMidity++-2.8.2/timidity/readmidi.c --- TiMidity++-2.8.1/timidity/readmidi.c Tue Oct 12 19:16:29 1999 +++ TiMidity++-2.8.2/timidity/readmidi.c Mon Feb 7 07:57:09 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/readmidi.h TiMidity++-2.8.2/timidity/readmidi.h --- TiMidity++-2.8.1/timidity/readmidi.h Fri Nov 12 16:37:50 1999 +++ TiMidity++-2.8.2/timidity/readmidi.h Mon Feb 7 07:57:05 2000 @@ -1,9 +1,8 @@ #ifndef ___READMIDI_H_ #define ___READMIDI_H_ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/recache.c TiMidity++-2.8.2/timidity/recache.c --- TiMidity++-2.8.1/timidity/recache.c Thu Jul 22 17:16:28 1999 +++ TiMidity++-2.8.2/timidity/recache.c Mon Feb 7 07:57:01 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -171,9 +170,9 @@ double a; int32 slen; - a = ((double)sp->sample_rate * freq_table[note]) / - ((double)sp->root_freq * play_mode->rate); - slen = (int32)((sp->data_length >> FRACTION_BITS) / a); + a = ((double)sp->root_freq * play_mode->rate) / + ((double)sp->sample_rate * freq_table[note]); + slen = (int32)((sp->data_length >> FRACTION_BITS) * a); if(len > slen) len = slen; } diff -ruN TiMidity++-2.8.1/timidity/recache.h TiMidity++-2.8.2/timidity/recache.h --- TiMidity++-2.8.1/timidity/recache.h Mon Nov 30 17:43:10 1998 +++ TiMidity++-2.8.2/timidity/recache.h Mon Feb 7 07:56:58 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/resample.c TiMidity++-2.8.2/timidity/resample.c --- TiMidity++-2.8.1/timidity/resample.c Mon Nov 22 11:49:23 1999 +++ TiMidity++-2.8.2/timidity/resample.c Mon Feb 7 14:17:18 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -933,16 +932,16 @@ sp->note_to_use, note_name[sp->note_to_use % 12], (sp->note_to_use & 0x7F) / 12); - a = ((double) (sp->sample_rate) * freq_table[(int) (sp->note_to_use)]) / - ((double) (sp->root_freq) * play_mode->rate); - if(sp->data_length / a >= 0x7fffffffL) + a = ((double) (sp->root_freq) * play_mode->rate) / + ((double) (sp->sample_rate) * freq_table[(int) (sp->note_to_use)]); + if(sp->data_length * a >= 0x7fffffffL) { /* Too large to compute */ ctl->cmsg(CMSG_INFO, VERB_DEBUG, " *** Can't pre-resampling for note %d", sp->note_to_use); return; } - newlen = (int32)(sp->data_length / a); + newlen = (int32)(sp->data_length * a); count = (newlen >> FRACTION_BITS) - 1; ofs = incr = (sp->data_length - (1 << FRACTION_BITS)) / count; @@ -994,8 +993,8 @@ *dest++ = *(dest - 1) / 2; sp->data_length = newlen; - sp->loop_start = (int32)(sp->loop_start / a); - sp->loop_end = (int32)(sp->loop_end / a); + sp->loop_start = (int32)(sp->loop_start * a); + sp->loop_end = (int32)(sp->loop_end * a); free(sp->data); sp->data = (sample_t *) newdata; sp->sample_rate = 0; diff -ruN TiMidity++-2.8.1/timidity/resample.h TiMidity++-2.8.2/timidity/resample.h --- TiMidity++-2.8.1/timidity/resample.h Sun Apr 18 15:32:16 1999 +++ TiMidity++-2.8.2/timidity/resample.h Mon Feb 7 07:56:50 2000 @@ -1,9 +1,8 @@ #ifndef ___RESAMPLE_H_ #define ___RESAMPLE_H_ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/reverb.c TiMidity++-2.8.2/timidity/reverb.c --- TiMidity++-2.8.1/timidity/reverb.c Tue Mar 9 11:04:54 1999 +++ TiMidity++-2.8.2/timidity/reverb.c Mon Feb 7 07:56:45 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/reverb.h TiMidity++-2.8.2/timidity/reverb.h --- TiMidity++-2.8.1/timidity/reverb.h Sat Feb 27 02:29:04 1999 +++ TiMidity++-2.8.2/timidity/reverb.h Mon Feb 7 07:56:42 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/sbkconv.c TiMidity++-2.8.2/timidity/sbkconv.c --- TiMidity++-2.8.1/timidity/sbkconv.c Mon Nov 30 17:45:36 1998 +++ TiMidity++-2.8.2/timidity/sbkconv.c Mon Feb 7 07:56:38 2000 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen */ diff -ruN TiMidity++-2.8.1/timidity/sffile.c TiMidity++-2.8.2/timidity/sffile.c --- TiMidity++-2.8.1/timidity/sffile.c Mon Nov 30 17:50:22 1998 +++ TiMidity++-2.8.2/timidity/sffile.c Mon Feb 7 07:56:34 2000 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen */ diff -ruN TiMidity++-2.8.1/timidity/sffile.h TiMidity++-2.8.2/timidity/sffile.h --- TiMidity++-2.8.1/timidity/sffile.h Mon Nov 30 17:46:22 1998 +++ TiMidity++-2.8.2/timidity/sffile.h Mon Feb 7 07:56:31 2000 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen */ diff -ruN TiMidity++-2.8.1/timidity/sfitem.c TiMidity++-2.8.2/timidity/sfitem.c --- TiMidity++-2.8.1/timidity/sfitem.c Mon Nov 30 17:46:32 1998 +++ TiMidity++-2.8.2/timidity/sfitem.c Mon Feb 7 07:56:27 2000 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen */ diff -ruN TiMidity++-2.8.1/timidity/sfitem.h TiMidity++-2.8.2/timidity/sfitem.h --- TiMidity++-2.8.1/timidity/sfitem.h Mon Nov 30 17:50:22 1998 +++ TiMidity++-2.8.2/timidity/sfitem.h Mon Feb 7 07:56:23 2000 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen */ diff -ruN TiMidity++-2.8.1/timidity/sflayer.h TiMidity++-2.8.2/timidity/sflayer.h --- TiMidity++-2.8.1/timidity/sflayer.h Mon Nov 30 17:46:56 1998 +++ TiMidity++-2.8.2/timidity/sflayer.h Mon Feb 7 07:56:19 2000 @@ -2,7 +2,7 @@ #define ___SFLAYER_H_ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen */ diff -ruN TiMidity++-2.8.1/timidity/smfconv.c TiMidity++-2.8.2/timidity/smfconv.c --- TiMidity++-2.8.1/timidity/smfconv.c Mon Mar 1 20:44:30 1999 +++ TiMidity++-2.8.2/timidity/smfconv.c Mon Feb 7 07:56:14 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/smfconv.h TiMidity++-2.8.2/timidity/smfconv.h --- TiMidity++-2.8.1/timidity/smfconv.h Mon Mar 1 20:44:40 1999 +++ TiMidity++-2.8.2/timidity/smfconv.h Mon Feb 7 07:56:11 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/sndfont.c TiMidity++-2.8.2/timidity/sndfont.c --- TiMidity++-2.8.1/timidity/sndfont.c Sun Apr 25 22:04:00 1999 +++ TiMidity++-2.8.2/timidity/sndfont.c Mon Feb 7 07:56:07 2000 @@ -1,10 +1,10 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen */ -/* This code from swesfx +/* This code from awesfx * Modified by Masanao Izumo */ @@ -198,7 +198,7 @@ static SFInsts *sfrecs = NULL; static SFInsts *current_sfrec = NULL; -static int def_drum_inst; +#define def_drum_inst 0 static SFInsts *find_soundfont(char *sf_file) { @@ -822,7 +822,9 @@ SFInstHdr *inst; int rc, i, nlayers; SFGenLayer *lay, *globalp; +#if 0 SFPresetHdr *preset = &sf->preset[pridx]; +#endif if (level >= 2) { fprintf(stderr, "parse_layer: too deep instrument level\n"); @@ -833,12 +835,17 @@ if (!tbl->set[SF_instrument]) return AWE_RET_SKIP; + inst = &sf->inst[tbl->val[SF_instrument]]; + + /* Here, TiMidity makes the reference of the data. The real data + * is loaded after. So, duplicated data is allowed */ +#if 0 /* if non-standard drumset includes standard drum instruments, skip it to avoid duplicate the data */ - inst = &sf->inst[tbl->val[SF_instrument]]; if (def_drum_inst >= 0 && preset->bank == 128 && preset->preset != 0 && tbl->val[SF_instrument] == def_drum_inst) return AWE_RET_SKIP; +#endif /* if layer is empty, skip it */ if ((nlayers = inst->hdr.nlayers) <= 0 || diff -ruN TiMidity++-2.8.1/timidity/sun_a.c TiMidity++-2.8.2/timidity/sun_a.c --- TiMidity++-2.8.1/timidity/sun_a.c Mon Sep 20 18:51:15 1999 +++ TiMidity++-2.8.2/timidity/sun_a.c Mon Feb 7 07:56:00 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/tables.c TiMidity++-2.8.2/timidity/tables.c --- TiMidity++-2.8.1/timidity/tables.c Mon Apr 12 04:35:32 1999 +++ TiMidity++-2.8.2/timidity/tables.c Mon Feb 7 07:55:56 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/tables.h TiMidity++-2.8.2/timidity/tables.h --- TiMidity++-2.8.1/timidity/tables.h Sun Apr 4 20:47:42 1999 +++ TiMidity++-2.8.2/timidity/tables.h Mon Feb 7 07:55:52 2000 @@ -1,9 +1,8 @@ #ifndef ___TABLES_H_ #define ___TABLES_H_ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/timidity.c TiMidity++-2.8.2/timidity/timidity.c --- TiMidity++-2.8.1/timidity/timidity.c Mon Nov 29 11:40:35 1999 +++ TiMidity++-2.8.2/timidity/timidity.c Mon Feb 7 07:35:40 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -17,7 +16,6 @@ You 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. - */ #ifdef HAVE_CONFIG_H @@ -3072,6 +3070,13 @@ "Open output: %c, %s", play_mode->id_character, play_mode->id_name); + + if (play_mode->flag & PF_PCM_STREAM) { + play_mode->extra_param[1] = aq_calc_fragsize(); + ctl->cmsg(CMSG_INFO, VERB_DEBUG_SILLY, + "requesting fragment size: %d", + play_mode->extra_param[1]); + } if(play_mode->open_output() < 0) { ctl->cmsg(CMSG_FATAL, VERB_NORMAL, diff -ruN TiMidity++-2.8.1/timidity/timidity.h TiMidity++-2.8.2/timidity/timidity.h --- TiMidity++-2.8.1/timidity/timidity.h Thu Nov 4 21:14:15 1999 +++ TiMidity++-2.8.2/timidity/timidity.h Mon Feb 7 07:55:37 2000 @@ -2,7 +2,7 @@ #define ___TIMIDITY_H_ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/version.c TiMidity++-2.8.2/timidity/version.c --- TiMidity++-2.8.1/timidity/version.c Wed Aug 25 18:25:58 1999 +++ TiMidity++-2.8.2/timidity/version.c Mon Feb 7 07:55:32 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/w32_a.c TiMidity++-2.8.2/timidity/w32_a.c --- TiMidity++-2.8.1/timidity/w32_a.c Sat Aug 21 18:28:04 1999 +++ TiMidity++-2.8.2/timidity/w32_a.c Mon Feb 7 07:55:28 2000 @@ -1,532 +1,713 @@ -/* - - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 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. - - w32_a.c - - Functions to play sound on the Windows audio driver (Windows 95/98/NT). - - Modified by Masanao Izumo - - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif /* HAVE_CONFIG_H */ -#include -#include -#ifndef NO_STRING_H -#include -#else -#include -#endif -#include - -#if defined(__CYGWIN32__) || defined(__MINGW32__) -/* On cygnus, there is not mmsystem.h for Multimedia API's. - * mmsystem.h can not distribute becase of Microsoft Lisence - * Then declare some of them here. - */ - -#define WOM_OPEN 0x3BB -#define WOM_CLOSE 0x3BC -#define WOM_DONE 0x3BD -#define WAVE_FORMAT_QUERY 0x0001 -#define WAVE_ALLOWSYNC 0x0002 -#define WAVE_FORMAT_PCM 1 -#define CALLBACK_FUNCTION 0x00030000l -#define WAVERR_BASE 32 -#define WAVE_MAPPER (UINT)-1 - -DECLARE_HANDLE(HWAVEOUT); -DECLARE_HANDLE(HWAVE); -typedef HWAVEOUT *LPHWAVEOUT; - -/* Define WAVEHDR, WAVEFORMAT structure */ -typedef struct wavehdr_tag { - LPSTR lpData; - DWORD dwBufferLength; - DWORD dwBytesRecorded; - DWORD dwUser; - DWORD dwFlags; - DWORD dwLoops; - struct wavehdr_tag *lpNext; - DWORD reserved; -} WAVEHDR; - -typedef struct { - WORD wFormatTag; - WORD nChannels; - DWORD nSamplesPerSec; - DWORD nAvgBytesPerSec; - WORD nBlockAlign; - WORD wBitsPerSample; - WORD cbSize; -} WAVEFORMAT; - -typedef struct waveoutcaps_tag { - WORD wMid; - WORD wPid; - UINT vDriverVersion; -#define MAXPNAMELEN 32 - char szPname[MAXPNAMELEN]; - DWORD dwFormats; - WORD wChannels; - DWORD dwSupport; -} WAVEOUTCAPS; - -typedef WAVEHDR *LPWAVEHDR; -typedef WAVEFORMAT *LPWAVEFORMAT; -typedef WAVEOUTCAPS *LPWAVEOUTCAPS; -typedef UINT MMRESULT; - -MMRESULT WINAPI waveOutOpen(LPHWAVEOUT, UINT, - LPWAVEFORMAT, DWORD, DWORD, DWORD); -MMRESULT WINAPI waveOutClose(HWAVEOUT); -MMRESULT WINAPI waveOutPrepareHeader(HWAVEOUT, LPWAVEHDR, UINT); -MMRESULT WINAPI waveOutUnprepareHeader(HWAVEOUT, LPWAVEHDR, UINT); -MMRESULT WINAPI waveOutWrite(HWAVEOUT, LPWAVEHDR, UINT); -UINT WINAPI waveOutGetNumDevs(void); - -MMRESULT WINAPI waveOutReset(HWAVEOUT); -MMRESULT WINAPI waveOutGetDevCaps(UINT, LPWAVEOUTCAPS, UINT); -MMRESULT WINAPI waveOutGetDevCapsA(UINT, LPWAVEOUTCAPS, UINT); -#define waveOutGetDevCaps waveOutGetDevCapsA -MMRESULT WINAPI waveOutGetID(HWAVEOUT, UINT*); - -#endif /* __CYGWIN32__ */ - - -#include "timidity.h" -#include "output.h" -#include "controls.h" -#include "timer.h" -#include "instrum.h" -#include "playmidi.h" -#include "mblock.h" -#include "miditrace.h" -#include "interface.h" - -static int open_output(void); /* 0=success, 1=warning, -1=fatal error */ -static void close_output(void); -static int output_data(char *buf, int32 nbytes); -static int acntl(int request, void *arg); - -#ifdef IA_W32GUI -volatile int data_block_time = 400; // msec -volatile int data_block_num = 20; -#endif /* IA_W32GUI */ - -#define DATA_BLOCK_SIZE (4*AUDIO_BUFFER_SIZE) -#define DATA_BLOCK_NUM (dpm.extra_param[0]) -#define DATA_MIN_NBLOCKS (DATA_BLOCK_NUM-1) - -struct data_block_t -{ - HGLOBAL data_hg; - HGLOBAL head_hg; - void *data; - WAVEHDR *head; - int blockno; - struct data_block_t *next; -}; - -static struct data_block_t *all_data_block; -static struct data_block_t *free_data_block; -static void reuse_data_block(struct data_block_t *); -static void reset_data_block(void); -static struct data_block_t *new_data_block(); - -static HWAVEOUT dev; -static volatile int nBlocks; -static const char *mmerror_code_string(MMRESULT res); -static int msec_per_block; - -/* export the playback mode */ - -#define dpm w32_play_mode - -PlayMode dpm = { - 33075, - PE_16BIT|PE_SIGNED, - PF_PCM_STREAM|PF_CAN_TRACE|PF_BUFF_FRAGM_OPT, - -1, - {32}, - "Windows audio driver", 'd', - NULL, - open_output, - close_output, - output_data, - acntl -}; - -extern CRITICAL_SECTION critSect; -/* Optional flag */ -static int w32_wave_allowsync = 1; /* waveOutOpen() fdwOpen : WAVE_ALLOWSYNC */ -//static int w32_wave_allowsync = 0; - -static void wait_playing(int all) -{ - if(all) - { - while(nBlocks) - Sleep(msec_per_block); - reset_data_block(); - } - else - { -#ifndef IA_W32GUI - if(ctl->trace_playing) - Sleep(0); - else -#endif /* IA_W32GUI */ - Sleep(msec_per_block); - } -} - -static void CALLBACK wave_callback(HWAVE hWave, UINT uMsg, - DWORD dwInstance, DWORD dwParam1, DWORD dwParam2) -{ - ctl->cmsg(CMSG_INFO, VERB_DEBUG, - "MMCallback: Msg=0x%x, nBlocks=%d", uMsg, nBlocks); - - if(uMsg == WOM_DONE) - { - WAVEHDR *wh; - - EnterCriticalSection (&critSect); - wh = (WAVEHDR *)dwParam1; - waveOutUnprepareHeader(dev, wh, sizeof(WAVEHDR)); - reuse_data_block(&all_data_block[wh->dwUser]); - LeaveCriticalSection (&critSect); - } -} - -static int open_output(void) -{ - int i, j, mono, eight_bit, warnings = 0; - WAVEFORMAT wf; - WAVEOUTCAPS caps; - MMRESULT res; - UINT devid; - - if(dpm.extra_param[0] < 8) - { - ctl->cmsg(CMSG_WARNING, VERB_NORMAL, "Too small -B option: %d", - dpm.extra_param[0]); - dpm.extra_param[0] = 8; - } - - /* Check if there is at least one audio device */ - if (!(i=waveOutGetNumDevs ())) - { - ctl->cmsg (CMSG_ERROR, VERB_NORMAL, "No audio devices present!"); - return -1; - } - - /* They can't mean these */ - dpm.encoding &= ~(PE_ULAW|PE_ALAW|PE_BYTESWAP); - - if (dpm.encoding & PE_16BIT) - dpm.encoding |= PE_SIGNED; - else - dpm.encoding &= ~PE_SIGNED; - - mono = (dpm.encoding & PE_MONO); - eight_bit = !(dpm.encoding & PE_16BIT); - - memset(&wf, 0, sizeof(wf)); - wf.wFormatTag = WAVE_FORMAT_PCM; - wf.nChannels = mono ? 1 : 2; - wf.nSamplesPerSec = i = dpm.rate; - j = 1; - if (!mono) - { - i *= 2; - j *= 2; - } - if (!eight_bit) - { - i *= 2; - j *= 2; - } - wf.nAvgBytesPerSec = i; - wf.nBlockAlign = j; - wf.wBitsPerSample = eight_bit ? 8 : 16; - wf.cbSize=sizeof(WAVEFORMAT); - - dev = 0; - if (w32_wave_allowsync) - res = waveOutOpen (&dev, WAVE_MAPPER, (LPWAVEFORMAT)&wf, - (DWORD)wave_callback, 0, - CALLBACK_FUNCTION | WAVE_ALLOWSYNC); - else - res = waveOutOpen (&dev, WAVE_MAPPER, (LPWAVEFORMAT)&wf, - (DWORD)wave_callback, 0, CALLBACK_FUNCTION); - if (res) - { - ctl->cmsg(CMSG_ERROR, VERB_NORMAL, - "Can't open audio device: " - "encoding=<%s>, rate=<%d>, ch=<%d>: %s", - output_encoding_string(dpm.encoding), - dpm.rate, - wf.nChannels, - mmerror_code_string(res)); - return -1; - } - - devid = 0; - memset(&caps, 0, sizeof(WAVEOUTCAPS)); - waveOutGetID(dev, &devid); - res = waveOutGetDevCaps(devid, &caps, sizeof(WAVEOUTCAPS)); - ctl->cmsg(CMSG_INFO, VERB_DEBUG, - "Play Device ID: %d", devid); - ctl->cmsg(CMSG_INFO, VERB_DEBUG, - "Manufacture ID: %d"); - ctl->cmsg(CMSG_INFO, VERB_DEBUG, - "Product ID: %d", caps.wPid); - ctl->cmsg(CMSG_INFO, VERB_DEBUG, - "Version of the driver: %d", caps.vDriverVersion); - ctl->cmsg(CMSG_INFO, VERB_DEBUG, - "Product name: %s", caps.szPname); - ctl->cmsg(CMSG_INFO, VERB_DEBUG, - "Formats supported: 0x%x", caps.dwFormats); - ctl->cmsg(CMSG_INFO, VERB_DEBUG, - "number of sources supported: %d", caps.wChannels); - ctl->cmsg(CMSG_INFO, VERB_DEBUG, - "functionality supported by driver: 0x%x", caps.dwSupport); - - /* Prepere audio queue buffer */ - all_data_block = (struct data_block_t *) - safe_malloc(DATA_BLOCK_NUM * sizeof(struct data_block_t)); - for(i = 0; i < DATA_BLOCK_NUM; i++) - { - struct data_block_t *block; - block = &all_data_block[i]; - block->data_hg = GlobalAlloc(GMEM_ZEROINIT, DATA_BLOCK_SIZE); - block->data = GlobalLock(block->data_hg); - block->head_hg = GlobalAlloc(GMEM_ZEROINIT, sizeof(WAVEHDR)); - block->head = GlobalLock(block->head_hg); - } - reset_data_block(); - dpm.fd = 0; - - /* calc. msec/block */ - msec_per_block = AUDIO_BUFFER_SIZE; - if(!(dpm.encoding & PE_MONO)) - msec_per_block *= 2; - if(dpm.encoding & PE_16BIT) - msec_per_block *= 2; - msec_per_block = msec_per_block * 1000 / dpm.rate; - - return warnings; -} - -static int output_data(char *buf, int32 nbytes) -{ - int32 len = nbytes, n; - HGLOBAL data_hg; - HGLOBAL head_hg; - void *b; - struct data_block_t *block; - int32 total; - char *bp; - MMRESULT res; - LPWAVEHDR wh; - - total = 0; - bp = (char *)buf; - while(len > 0) - { - if((block = new_data_block()) == NULL) - { - wait_playing(0); - continue; - } - if(len <= DATA_BLOCK_SIZE) - n = len; - else - n = DATA_BLOCK_SIZE; - data_hg = block->data_hg; - head_hg = block->head_hg; - - b = block->data; - CopyMemory(b, bp, n); - - wh = block->head; - wh->dwBufferLength = n; - wh->lpData = b; - wh->dwUser = block->blockno; - res = waveOutPrepareHeader(dev, wh, sizeof(WAVEHDR)); - if(res) - { - ctl->cmsg (CMSG_ERROR, VERB_NORMAL, "waveOutPrepareHeader(): %s", - mmerror_code_string(res)); - return -1; - } - res = waveOutWrite(dev, wh, sizeof(WAVEHDR)); - if(res) - { - ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "waveOutWrite(): %s", - mmerror_code_string(res)); - return -1; - } - - len -= n; - bp += n; - } - return 0; -} - -static void close_output(void) -{ - int i; - - if(dpm.fd == -1) - return; - wait_playing(1); - waveOutClose(dev); - - for(i = 0; i < DATA_BLOCK_NUM; i++) - { - struct data_block_t *block; - block = &all_data_block[i]; - GlobalUnlock(block->head_hg); - GlobalFree(block->head_hg); - GlobalUnlock(block->data_hg); - GlobalFree(block->data_hg); - } - free(all_data_block); - - dpm.fd = -1; -} - -static int acntl(int request, void *arg) -{ - switch(request) - { - case PM_REQ_GETQSIZ: - *(int *)arg = DATA_BLOCK_NUM * AUDIO_BUFFER_SIZE; - if(!(dpm.encoding & PE_MONO)) - *(int *)arg *= 2; - if(dpm.encoding & PE_16BIT) - *(int *)arg *= 2; - return 0; - case PM_REQ_DISCARD: - waveOutReset(dev); - wait_playing(1); - return 0; - case PM_REQ_FLUSH: - wait_playing(1); - return 0; - } - return -1; -} - - -#define ARRAY_SIZE(a) sizeof(a) / sizeof(a[0]) -static const char *mmsyserr_code_string[] = -{ - "no error", - "unspecified error", - "device ID out of range", - "driver failed enable", - "device already allocated", - "device handle is invalid", - "no device driver present", - "memory allocation error", - "function isn't supported", - "error value out of range", - "invalid flag passed", - "invalid parameter passed", - "handle being used", -}; - -static const char *waverr_code_sring[] = -{ - "unsupported wave format", - "still something playing", - "header not prepared", - "device is synchronous", -}; - -static const char *mmerror_code_string(MMRESULT err_code) -{ - static char s[32]; - - if(err_code >= WAVERR_BASE) - { - err_code -= WAVERR_BASE; - if(err_code > ARRAY_SIZE(waverr_code_sring)) - { - sprintf(s, "WAVERR %d", err_code); - return s; - } - return waverr_code_sring[err_code]; - } - if(err_code > ARRAY_SIZE(mmsyserr_code_string)) - { - sprintf(s, "MMSYSERR %d", err_code); - return s; - } - return mmsyserr_code_string[err_code]; -} - - -static struct data_block_t *new_data_block() -{ - struct data_block_t *p; - - p = NULL; - EnterCriticalSection (&critSect); - if(free_data_block != NULL) - { - p = free_data_block; - free_data_block = free_data_block->next; - nBlocks++; - p->next = NULL; - } - LeaveCriticalSection (&critSect); - - return p; -} - -static void reuse_data_block(struct data_block_t *block) -{ - block->next = free_data_block; - free_data_block = block; - nBlocks--; -} - -static void reset_data_block(void) -{ - int i; - - all_data_block[0].blockno = 0; - all_data_block[0].next = &all_data_block[1]; - for(i = 1; i < DATA_BLOCK_NUM - 1; i++) - { - all_data_block[i].blockno = i; - all_data_block[i].next = &all_data_block[i + 1]; - } - all_data_block[i].blockno = i; - all_data_block[i].next = NULL; - free_data_block = &all_data_block[0]; - nBlocks = 0; -} +/* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + + w32_a.c + + Functions to play sound on the Windows audio driver (Windows 95/98/NT). + + Modified by Masanao Izumo + + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif /* HAVE_CONFIG_H */ +#include +#include +#ifndef NO_STRING_H +#include +#else +#include +#endif +#include + +extern CRITICAL_SECTION critSect; + +/*****************************************************************************************************************************/ + +#if defined(__CYGWIN32__) || defined(__MINGW32__) + +/* On cygnus, there is not mmsystem.h for Multimedia API's. mmsystem.h can not distribute becase of Microsoft Lisence + * Then declare some of them here. **/ + +#define WOM_OPEN 0x3BB +#define WOM_CLOSE 0x3BC +#define WOM_DONE 0x3BD +#define WAVE_FORMAT_QUERY 0x0001 +#define WAVE_ALLOWSYNC 0x0002 +#define WAVE_FORMAT_PCM 1 +#define CALLBACK_FUNCTION 0x00030000l +#define WAVERR_BASE 32 +#define WAVE_MAPPER (UINT)-1 + +DECLARE_HANDLE(HWAVEOUT); +DECLARE_HANDLE(HWAVE); +typedef HWAVEOUT *LPHWAVEOUT; + +/* Define WAVEHDR, WAVEFORMAT structure */ + +typedef struct wavehdr_tag +{ + LPSTR lpData; + DWORD dwBufferLength; + DWORD dwBytesRecorded; + DWORD dwUser; + DWORD dwFlags; + DWORD dwLoops; + struct wavehdr_tag *lpNext; + DWORD reserved; +} WAVEHDR; + +typedef struct +{ + WORD wFormatTag; + WORD nChannels; + DWORD nSamplesPerSec; + DWORD nAvgBytesPerSec; + WORD nBlockAlign; + WORD wBitsPerSample; + WORD cbSize; +} WAVEFORMAT, WAVEFORMATEX, *LPWAVEFORMATEX; + + +typedef struct waveoutcaps_tag +{ + WORD wMid; + WORD wPid; + UINT vDriverVersion; +#define MAXPNAMELEN 32 + char szPname[MAXPNAMELEN]; + DWORD dwFormats; + WORD wChannels; + DWORD dwSupport; +} WAVEOUTCAPS; + +typedef WAVEHDR * LPWAVEHDR; +typedef WAVEFORMAT * LPWAVEFORMAT; +typedef WAVEOUTCAPS * LPWAVEOUTCAPS; +typedef UINT MMRESULT; + +MMRESULT WINAPI waveOutOpen(LPHWAVEOUT, UINT, LPWAVEFORMAT, DWORD, DWORD, DWORD); +MMRESULT WINAPI waveOutClose(HWAVEOUT); +MMRESULT WINAPI waveOutPrepareHeader(HWAVEOUT, LPWAVEHDR, UINT); +MMRESULT WINAPI waveOutUnprepareHeader(HWAVEOUT, LPWAVEHDR, UINT); +MMRESULT WINAPI waveOutWrite(HWAVEOUT, LPWAVEHDR, UINT); +UINT WINAPI waveOutGetNumDevs(void); +MMRESULT WINAPI waveOutReset(HWAVEOUT); +MMRESULT WINAPI waveOutGetDevCaps(UINT, LPWAVEOUTCAPS, UINT); +MMRESULT WINAPI waveOutGetDevCapsA(UINT, LPWAVEOUTCAPS, UINT); +#define waveOutGetDevCaps waveOutGetDevCapsA +MMRESULT WINAPI waveOutGetID(HWAVEOUT, UINT*); + +#endif /* __CYGWIN32__ */ + +/*****************************************************************************************************************************/ + +#include "timidity.h" +#include "output.h" +#include "controls.h" +#include "timer.h" +#include "instrum.h" +#include "playmidi.h" +#include "mblock.h" +#include "miditrace.h" +#include "interface.h" + +#define NOT ! + +static int open_output (void); /* 0=success, 1=warning, -1=fatal error */ +static void close_output (void); +static int output_data (char * Data, int32 Size); +static int acntl (int request, void * arg); + +#ifdef IA_W32GUI +volatile int data_block_time = 400; // Milliseconds +volatile int data_block_num = 20; +#endif + +#define DATA_BLOCK_SIZE (4 * AUDIO_BUFFER_SIZE) +#define DATA_BLOCK_NUM (dpm.extra_param[0]) + +struct MMBuffer +{ + int Number; + int Prepared; // Non-zero if this buffer has been prepared. + + HGLOBAL hData; + void * Data; + + HGLOBAL hHead; + WAVEHDR * Head; + + struct MMBuffer * Next; +}; + +static struct MMBuffer * Buffers; + +static volatile struct MMBuffer * FreeBuffers; +static volatile int NumBuffersInUse; + +static HWAVEOUT hDevice; +static int BufferDelay; // in milliseconds + +static const int AllowSynchronousWaveforms = 1; + +/*****************************************************************************************************************************/ + +static void CALLBACK OnPlaybackEvent (HWAVE hWave, UINT Msg, DWORD UserData, DWORD Param1, DWORD Param2); +static void BufferPoolReset (void); +static struct MMBuffer * GetBuffer (); +static void PutBuffer (struct MMBuffer *); +static const char * MMErrorMessage (MMRESULT Result); +static void WaitForBuffer (int WaitForAllBuffers); + +/*****************************************************************************************************************************/ + +#define dpm w32_play_mode + +PlayMode dpm = +{ + 33075, + PE_16BIT | PE_SIGNED, + PF_PCM_STREAM|PF_CAN_TRACE|PF_BUFF_FRAGM_OPT, + -1, + {32}, + "Windows audio driver", 'd', + NULL, + open_output, + close_output, + output_data, + acntl +}; + +/*****************************************************************************************************************************/ + +static int open_output(void) +{ + int i; + int j; + int IsMono; + int Is16bit; + WAVEFORMATEX wf; + WAVEOUTCAPS woc; + MMRESULT Result; + UINT DeviceID; + + if (dpm.extra_param[0] < 8) + { + ctl->cmsg(CMSG_WARNING, VERB_NORMAL, "Too small -B option: %d", dpm.extra_param[0]); + dpm.extra_param[0] = 8; + } + +/** Check if there is at least one audio device. **/ + + if (waveOutGetNumDevs() == 0) + { + ctl->cmsg (CMSG_ERROR, VERB_NORMAL, "No audio devices present!"); + return -1; + } + +/** They can't mean these. **/ + + dpm.encoding &= ~(PE_ULAW | PE_ALAW | PE_BYTESWAP); + + if (dpm.encoding & PE_16BIT) + dpm.encoding |= PE_SIGNED; + else + dpm.encoding &= ~PE_SIGNED; + + IsMono = (dpm.encoding & PE_MONO); + Is16bit = (dpm.encoding & PE_16BIT); + + memset(&wf, 0, sizeof(wf)); + + wf.wFormatTag = WAVE_FORMAT_PCM; + wf.nChannels = IsMono ? 1 : 2; + wf.nSamplesPerSec = dpm.rate; + + i = dpm.rate; + j = 1; + + if (!IsMono) + { + i *= 2; + j *= 2; + } + + if (Is16bit) + { + i *= 2; + j *= 2; + } + + wf.nAvgBytesPerSec = i; + wf.nBlockAlign = j; + wf.wBitsPerSample = Is16bit ? 16 : 8; + wf.cbSize = sizeof(WAVEFORMAT); + +/** Open the device. **/ + + { CHAR b[256]; wsprintf(b, "Opening device...\n"); OutputDebugString(b); } + + hDevice = 0; + + if (AllowSynchronousWaveforms) + Result = waveOutOpen(&hDevice, WAVE_MAPPER, (LPWAVEFORMATEX) &wf, (DWORD) OnPlaybackEvent, 0, CALLBACK_FUNCTION | WAVE_ALLOWSYNC); + else + Result = waveOutOpen(&hDevice, WAVE_MAPPER, (LPWAVEFORMATEX) &wf, (DWORD) OnPlaybackEvent, 0, CALLBACK_FUNCTION); + + if (Result) + { + ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "Can't open audio device: " "encoding=<%s>, rate=<%d>, ch=<%d>: %s", output_encoding_string(dpm.encoding), dpm.rate, wf.nChannels, MMErrorMessage(Result)); + return -1; + } + else + { CHAR b[256]; wsprintf(b, "Device opened.\n"); OutputDebugString(b); } + +/** Get the device ID. **/ + + DeviceID = 0; + waveOutGetID(hDevice, &DeviceID); + +/** Get the device capabilities. **/ + + memset(&woc, 0, sizeof(WAVEOUTCAPS)); + Result = waveOutGetDevCaps(DeviceID, &woc, sizeof(WAVEOUTCAPS)); + + ctl->cmsg(CMSG_INFO, VERB_DEBUG, "Device ID: %d", DeviceID); + ctl->cmsg(CMSG_INFO, VERB_DEBUG, "Manufacture ID: %d", woc.wMid); + ctl->cmsg(CMSG_INFO, VERB_DEBUG, "Product ID: %d", woc.wPid); + ctl->cmsg(CMSG_INFO, VERB_DEBUG, "Driver version: %d", woc.vDriverVersion); + ctl->cmsg(CMSG_INFO, VERB_DEBUG, "Product name: %s", woc.szPname); + ctl->cmsg(CMSG_INFO, VERB_DEBUG, "Formats supported: 0x%08X", woc.dwFormats); + ctl->cmsg(CMSG_INFO, VERB_DEBUG, "Max. channels: %d", woc.wChannels); + ctl->cmsg(CMSG_INFO, VERB_DEBUG, "Supported features: 0x%08X", woc.dwSupport); + +/** Calculate the buffer delay. **/ + + BufferDelay = AUDIO_BUFFER_SIZE; + + if (NOT (dpm.encoding & PE_MONO)) + BufferDelay *= 2; + + if (dpm.encoding & PE_16BIT) + BufferDelay *= 2; + + BufferDelay = (BufferDelay * 1000) / dpm.rate; + +/** Create the buffer pool. **/ + + Buffers = (struct MMBuffer *) safe_malloc(DATA_BLOCK_NUM * sizeof(struct MMBuffer)); + + for (i = 0; i < DATA_BLOCK_NUM; i++) + { + struct MMBuffer * b; + + b = &Buffers[i]; + + b->hData = GlobalAlloc(GMEM_ZEROINIT, DATA_BLOCK_SIZE); + b->Data = GlobalLock (b->hData); + b->hHead = GlobalAlloc(GMEM_ZEROINIT, sizeof(WAVEHDR)); + b->Head = GlobalLock (b->hHead); + } + + BufferPoolReset(); + +/** Set the file descriptor. **/ + + dpm.fd = 0; + + return 0; +} + +/*****************************************************************************************************************************/ + +static void close_output(void) +{ + int i; + + if (dpm.fd != -1) + { + WaitForBuffer(1); + + { CHAR b[256]; wsprintf(b, "Closing device...\n"); OutputDebugString(b); } + + waveOutClose(hDevice); + + { CHAR b[256]; wsprintf(b, "Device closed.\n"); OutputDebugString(b); } + + /** Free all buffers. **/ + + for (i = 0; i < DATA_BLOCK_NUM; i++) + { + struct MMBuffer * block; + + block = &Buffers[i]; + + GlobalUnlock(block->hHead); + GlobalFree (block->hHead); + + GlobalUnlock(block->hData); + GlobalFree (block->hData); + } + + free(Buffers); + + /** Reset the file descriptor. **/ + + dpm.fd = -1; + } +} + +/*****************************************************************************************************************************/ + +static int output_data(char * Data, int32 Size) +{ + char * d; + int32 s; + + d = Data; + s = Size; + + while (s > 0) + { + int32 n; + struct MMBuffer * b; + + MMRESULT Result; + LPWAVEHDR wh; + + if ((b = GetBuffer()) == NULL) + { + WaitForBuffer(0); + continue; + } + + if (s <= DATA_BLOCK_SIZE) + n = s; + else + n = DATA_BLOCK_SIZE; + + CopyMemory(b->Data, d, n); + + wh = b->Head; + + wh->dwBufferLength = n; + wh->lpData = b->Data; + wh->dwUser = b->Number; + + /** Prepare the buffer. **/ + + { CHAR b[256]; wsprintf(b, "%2d: Preparing buffer %d...\n", NumBuffersInUse, wh->dwUser); OutputDebugString(b); } + + Result = waveOutPrepareHeader(hDevice, wh, sizeof(WAVEHDR)); + + if (Result) + { + { CHAR b[256]; wsprintf(b, "%2d: Buffer preparation failed.\n", NumBuffersInUse); OutputDebugString(b); } + + ctl->cmsg (CMSG_ERROR, VERB_NORMAL, "waveOutPrepareHeader(): %s", MMErrorMessage(Result)); + return -1; + } + else + { CHAR b[256]; wsprintf(b, "%2d: Buffer %d prepared.\n", NumBuffersInUse, wh->dwUser); OutputDebugString(b); } + + b->Prepared = 1; + + /** Queue the buffer. **/ + + { CHAR b[256]; wsprintf(b, "%2d: Queueing buffer %d...\n", NumBuffersInUse, wh->dwUser); OutputDebugString(b); } + + Result = waveOutWrite(hDevice, wh, sizeof(WAVEHDR)); + + if (Result) + { + { CHAR b[256]; wsprintf(b, "%2d: Buffer queueing failed.\n", NumBuffersInUse); OutputDebugString(b); } + + ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "waveOutWrite(): %s", MMErrorMessage(Result)); + return -1; + } + else + { CHAR b[256]; wsprintf(b, "%2d: Buffer %d queued.\n", NumBuffersInUse, wh->dwUser); OutputDebugString(b); } + + d += n; + s -= n; + } + + return 0; +} + +/*****************************************************************************************************************************/ + +static int acntl(int request, void *arg) +{ + switch(request) + { + case PM_REQ_GETQSIZ: + *(int *)arg = DATA_BLOCK_NUM * AUDIO_BUFFER_SIZE; + + if (NOT (dpm.encoding & PE_MONO)) + *(int *)arg *= 2; + + if (dpm.encoding & PE_16BIT) + *(int *)arg *= 2; + + return 0; + + case PM_REQ_DISCARD: + { + { CHAR b[256]; wsprintf(b, "Resetting audio device.\n"); OutputDebugString(b); } + + waveOutReset(hDevice); + + { CHAR b[256]; wsprintf(b, "Audio device reset.\n"); OutputDebugString(b); } + + WaitForBuffer(1); + + return 0; + } + + case PM_REQ_FLUSH: + { + WaitForBuffer(1); + return 0; + } + } + + return -1; +} + +/*****************************************************************************************************************************/ + +static void CALLBACK OnPlaybackEvent(HWAVE hWave, UINT Msg, DWORD UserData, DWORD Param1, DWORD Param2) +{ + ctl->cmsg(CMSG_INFO, VERB_DEBUG, "Msg: 0x%08X, Num. buffers in use: %d", Msg, NumBuffersInUse); + + switch (Msg) + { + case WOM_OPEN: + { CHAR b[256]; wsprintf(b, "%2d: Device opened.\n", NumBuffersInUse); OutputDebugString(b); } + break; + + case WOM_CLOSE: + { CHAR b[256]; wsprintf(b, "%2d: Device closed.\n", NumBuffersInUse); OutputDebugString(b); } + break; + + case WOM_DONE: + { + WAVEHDR * wh; + + EnterCriticalSection(&critSect); + + wh = (WAVEHDR *) Param1; + +/* It's not safe to do this here. Read the remarks of waveOutProc() in the SDK on which functions are safe to call. + if (NOT Queueing) + { + { CHAR b[256]; wsprintf(b, "%2d: Dequeueing buffer %d...\n", NumBuffersInUse, wh->dwUser); OutputDebugString(b); } + + waveOutUnprepareHeader(hDevice, wh, sizeof(WAVEHDR)); + + { CHAR b[256]; wsprintf(b, "%2d: Buffer %d dequeued.\n", NumBuffersInUse, wh->dwUser); OutputDebugString(b); } + } + else + { CHAR b[256]; wsprintf(b, "%2d: *** Buffer %d not dequeued! ***\n", NumBuffersInUse, wh->dwUser); OutputDebugString(b); } + */ + PutBuffer(&Buffers[wh->dwUser]); + + LeaveCriticalSection(&critSect); + + break; + } + + default: + { + CHAR b[256]; + + wsprintf(b, "%2d: Unknown play back event 0x%08X.\n", NumBuffersInUse, Msg); + OutputDebugString(b); + } + } +} + +/*****************************************************************************************************************************/ + +#define DIM(a) sizeof(a) / sizeof(a[0]) + +static const char * mmsyserr_code_string[] = +{ + "no error", + "unspecified error", + "device ID out of range", + "driver failed enable", + "device already allocated", + "device handle is invalid", + "no device driver present", + "memory allocation error", + "function isn't supported", + "error value out of range", + "invalid flag passed", + "invalid parameter passed", + "handle being used", +}; + +static const char * waverr_code_sring[] = +{ + "unsupported wave format", + "still something playing", + "header not prepared", + "device is synchronous", +}; + +static const char * MMErrorMessage(MMRESULT ErrorCode) +{ + static char s[32]; + + if (ErrorCode >= WAVERR_BASE) + { + ErrorCode -= WAVERR_BASE; + + if (ErrorCode > DIM(waverr_code_sring)) + { + wsprintf(s, "Unknown wave error %d", ErrorCode); + return s; + } + else + return waverr_code_sring[ErrorCode]; + } + else + if (ErrorCode > DIM(mmsyserr_code_string)) + { + wsprintf(s, "Unknown multimedia error %d", ErrorCode); + return s; + } + else + return mmsyserr_code_string[ErrorCode]; +} + +#undef DIM + +/*****************************************************************************************************************************/ + +static void BufferPoolReset(void) +{ + int i; + + { CHAR b[256]; wsprintf(b, "Resetting buffer pool...\n"); OutputDebugString(b); } + + Buffers[0].Number = 0; + Buffers[0].Prepared = 0; + Buffers[0].Next = &Buffers[1]; + + for (i = 1; i < DATA_BLOCK_NUM - 1; i++) + { + Buffers[i].Number = i; + Buffers[i].Prepared = 0; + Buffers[i].Next = &Buffers[i + 1]; + } + + Buffers[i].Number = i; + Buffers[i].Prepared = 0; + Buffers[i].Next = NULL; + + FreeBuffers = &Buffers[0]; + NumBuffersInUse = 0; + + { CHAR b[256]; wsprintf(b, "Buffer pool reset.\n", NumBuffersInUse); OutputDebugString(b); } +} + +/*****************************************************************************************************************************/ + +static struct MMBuffer * GetBuffer() +{ + struct MMBuffer * b; + + { CHAR b[256]; wsprintf(b, "%2d: Getting buffer...\n", NumBuffersInUse); OutputDebugString(b); } + + EnterCriticalSection(&critSect); + + if (FreeBuffers) + { + b = FreeBuffers; + FreeBuffers = FreeBuffers->Next; + NumBuffersInUse++; + + /** If this buffer is still prepared we can safely unprepare it because we got it from the free buffer list. **/ + + if (b->Prepared) + { + waveOutUnprepareHeader(hDevice, (LPWAVEHDR) b->Head, sizeof(WAVEHDR)); + + b->Prepared = 0; + } + + b->Next = NULL; + } + else + b = NULL; + + LeaveCriticalSection(&critSect); + + { CHAR b[256]; wsprintf(b, "%2d: Got buffer.\n", NumBuffersInUse); OutputDebugString(b); } + + return b; +} + +/*****************************************************************************************************************************/ + +static void PutBuffer(struct MMBuffer * b) +{ + { CHAR b[256]; wsprintf(b, "%2d: Putting buffer...\n", NumBuffersInUse); OutputDebugString(b); } + + b->Next = FreeBuffers; + FreeBuffers = b; + NumBuffersInUse--; + + { CHAR b[256]; wsprintf(b, "%2d: Buffer put.\n", NumBuffersInUse); OutputDebugString(b); } +} + +/*****************************************************************************************************************************/ + +static void WaitForBuffer(int WaitForAllBuffers) +{ + if (WaitForAllBuffers) + { + { CHAR b[256]; wsprintf(b, "%2d: Waiting for all buffers to be dequeued...\n", NumBuffersInUse); OutputDebugString(b); } + + while (NumBuffersInUse) + Sleep(BufferDelay); + + { CHAR b[256]; wsprintf(b, "%2d: All buffers dequeued.\n", NumBuffersInUse); OutputDebugString(b); } + + BufferPoolReset(); + } + else + { + { CHAR b[256]; wsprintf(b, "%2d: Waiting %dms...\n", NumBuffersInUse, BufferDelay); OutputDebugString(b); } + + #ifndef IA_W32GUI + if(ctl->trace_playing) + Sleep(0); + else + #endif + Sleep(BufferDelay); + + { CHAR b[256]; wsprintf(b, "%2d: Wait finished.\n", NumBuffersInUse); OutputDebugString(b); } + } +} diff -ruN TiMidity++-2.8.1/timidity/w32g_a.c TiMidity++-2.8.2/timidity/w32g_a.c --- TiMidity++-2.8.1/timidity/w32g_a.c Mon Oct 4 15:56:37 1999 +++ TiMidity++-2.8.2/timidity/w32g_a.c Mon Feb 7 07:55:24 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/wave_a.c TiMidity++-2.8.2/timidity/wave_a.c --- TiMidity++-2.8.1/timidity/wave_a.c Fri Jul 30 23:59:34 1999 +++ TiMidity++-2.8.2/timidity/wave_a.c Mon Feb 7 07:55:21 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/wrd.h TiMidity++-2.8.2/timidity/wrd.h --- TiMidity++-2.8.1/timidity/wrd.h Thu Mar 11 14:54:40 1999 +++ TiMidity++-2.8.2/timidity/wrd.h Mon Feb 7 07:55:17 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/wrd_read.c TiMidity++-2.8.2/timidity/wrd_read.c --- TiMidity++-2.8.1/timidity/wrd_read.c Fri Nov 19 10:41:48 1999 +++ TiMidity++-2.8.2/timidity/wrd_read.c Mon Feb 7 07:55:08 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/timidity/wrdt.c TiMidity++-2.8.2/timidity/wrdt.c --- TiMidity++-2.8.1/timidity/wrdt.c Wed Aug 18 02:08:56 1999 +++ TiMidity++-2.8.2/timidity/wrdt.c Mon Feb 7 07:55:13 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/utils/Makefile.am TiMidity++-2.8.2/utils/Makefile.am --- TiMidity++-2.8.1/utils/Makefile.am Mon Jul 19 09:59:34 1999 +++ TiMidity++-2.8.2/utils/Makefile.am Mon Feb 7 07:33:55 2000 @@ -1,5 +1,5 @@ # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999 Masanao Izumo +# Copyright (C) 1999,2000 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/utils/Makefile.in TiMidity++-2.8.2/utils/Makefile.in --- TiMidity++-2.8.1/utils/Makefile.in Mon Nov 29 11:59:03 1999 +++ TiMidity++-2.8.2/utils/Makefile.in Mon Feb 7 21:39:15 2000 @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999 Masanao Izumo +# Copyright (C) 1999,2000 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/utils/bitset.c TiMidity++-2.8.2/utils/bitset.c --- TiMidity++-2.8.1/utils/bitset.c Wed Aug 18 02:08:56 1999 +++ TiMidity++-2.8.2/utils/bitset.c Mon Feb 7 07:33:51 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/utils/bitset.h TiMidity++-2.8.2/utils/bitset.h --- TiMidity++-2.8.1/utils/bitset.h Wed Aug 18 02:08:56 1999 +++ TiMidity++-2.8.2/utils/bitset.h Mon Feb 7 07:33:46 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/utils/fft.c TiMidity++-2.8.2/utils/fft.c --- TiMidity++-2.8.1/utils/fft.c Mon Nov 30 18:17:16 1998 +++ TiMidity++-2.8.2/utils/fft.c Mon Feb 7 07:33:42 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/utils/fft.h TiMidity++-2.8.2/utils/fft.h --- TiMidity++-2.8.1/utils/fft.h Mon Nov 30 18:17:20 1998 +++ TiMidity++-2.8.2/utils/fft.h Mon Feb 7 07:33:38 2000 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/utils/mac_readdir.c TiMidity++-2.8.2/utils/mac_readdir.c --- TiMidity++-2.8.1/utils/mac_readdir.c Sat Oct 30 12:23:32 1999 +++ TiMidity++-2.8.2/utils/mac_readdir.c Mon Feb 7 07:33:33 2000 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/utils/mac_readdir.h TiMidity++-2.8.2/utils/mac_readdir.h --- TiMidity++-2.8.1/utils/mac_readdir.h Sat Oct 30 12:23:32 1999 +++ TiMidity++-2.8.2/utils/mac_readdir.h Mon Feb 7 07:33:29 2000 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/utils/mac_util.c TiMidity++-2.8.2/utils/mac_util.c --- TiMidity++-2.8.1/utils/mac_util.c Sat Oct 30 12:23:32 1999 +++ TiMidity++-2.8.2/utils/mac_util.c Mon Feb 7 07:33:25 2000 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/utils/mac_util.h TiMidity++-2.8.2/utils/mac_util.h --- TiMidity++-2.8.1/utils/mac_util.h Sat Oct 30 12:23:32 1999 +++ TiMidity++-2.8.2/utils/mac_util.h Mon Feb 7 07:33:22 2000 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/utils/mblock.c TiMidity++-2.8.2/utils/mblock.c --- TiMidity++-2.8.1/utils/mblock.c Mon Mar 1 20:54:14 1999 +++ TiMidity++-2.8.2/utils/mblock.c Mon Feb 7 07:33:18 2000 @@ -1,7 +1,7 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/utils/mblock.h TiMidity++-2.8.2/utils/mblock.h --- TiMidity++-2.8.1/utils/mblock.h Thu Mar 11 14:08:04 1999 +++ TiMidity++-2.8.2/utils/mblock.h Mon Feb 7 07:33:15 2000 @@ -1,7 +1,7 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/utils/memb.c TiMidity++-2.8.2/utils/memb.c --- TiMidity++-2.8.1/utils/memb.c Mon Nov 30 18:18:54 1998 +++ TiMidity++-2.8.2/utils/memb.c Mon Feb 7 07:33:11 2000 @@ -1,7 +1,7 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/utils/memb.h TiMidity++-2.8.2/utils/memb.h --- TiMidity++-2.8.1/utils/memb.h Mon Nov 30 18:19:02 1998 +++ TiMidity++-2.8.2/utils/memb.h Mon Feb 7 07:33:08 2000 @@ -1,7 +1,7 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/utils/net.c TiMidity++-2.8.2/utils/net.c --- TiMidity++-2.8.1/utils/net.c Sat Jul 17 18:09:42 1999 +++ TiMidity++-2.8.2/utils/net.c Mon Feb 7 07:33:04 2000 @@ -1,7 +1,7 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/utils/net.h TiMidity++-2.8.2/utils/net.h --- TiMidity++-2.8.1/utils/net.h Thu Feb 4 18:13:52 1999 +++ TiMidity++-2.8.2/utils/net.h Mon Feb 7 07:33:00 2000 @@ -1,7 +1,7 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/utils/nkflib.c TiMidity++-2.8.2/utils/nkflib.c --- TiMidity++-2.8.1/utils/nkflib.c Sat Jul 17 18:08:32 1999 +++ TiMidity++-2.8.2/utils/nkflib.c Mon Feb 7 07:32:56 2000 @@ -1,7 +1,7 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/utils/nkflib.h TiMidity++-2.8.2/utils/nkflib.h --- TiMidity++-2.8.1/utils/nkflib.h Mon Nov 30 18:19:42 1998 +++ TiMidity++-2.8.2/utils/nkflib.h Mon Feb 7 07:32:53 2000 @@ -1,7 +1,7 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/utils/readdir.h TiMidity++-2.8.2/utils/readdir.h --- TiMidity++-2.8.1/utils/readdir.h Mon Nov 30 18:20:14 1998 +++ TiMidity++-2.8.2/utils/readdir.h Mon Feb 7 07:32:49 2000 @@ -1,7 +1,7 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/utils/readdir_win.c TiMidity++-2.8.2/utils/readdir_win.c --- TiMidity++-2.8.1/utils/readdir_win.c Mon Mar 1 20:56:04 1999 +++ TiMidity++-2.8.2/utils/readdir_win.c Mon Feb 7 07:32:45 2000 @@ -1,7 +1,7 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/utils/strtab.c TiMidity++-2.8.2/utils/strtab.c --- TiMidity++-2.8.1/utils/strtab.c Mon Nov 30 18:20:38 1998 +++ TiMidity++-2.8.2/utils/strtab.c Mon Feb 7 07:32:35 2000 @@ -1,7 +1,7 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/utils/strtab.h TiMidity++-2.8.2/utils/strtab.h --- TiMidity++-2.8.1/utils/strtab.h Mon Nov 30 18:20:42 1998 +++ TiMidity++-2.8.2/utils/strtab.h Mon Feb 7 07:32:28 2000 @@ -1,7 +1,7 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/utils/support.c TiMidity++-2.8.2/utils/support.c --- TiMidity++-2.8.1/utils/support.c Mon Aug 9 03:20:40 1999 +++ TiMidity++-2.8.2/utils/support.c Mon Feb 7 07:32:24 2000 @@ -1,7 +1,7 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/utils/support.h TiMidity++-2.8.2/utils/support.h --- TiMidity++-2.8.1/utils/support.h Wed Jun 23 12:47:28 1999 +++ TiMidity++-2.8.2/utils/support.h Mon Feb 7 07:32:19 2000 @@ -1,5 +1,24 @@ #ifndef ___SUPPORT_H_ #define ___SUPPORT_H_ +/* + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1995 Tuukka Toivonen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ #ifndef HAVE_VSNPRINTF diff -ruN TiMidity++-2.8.1/utils/timer.c TiMidity++-2.8.2/utils/timer.c --- TiMidity++-2.8.1/utils/timer.c Sun Mar 28 18:16:10 1999 +++ TiMidity++-2.8.2/utils/timer.c Mon Feb 7 07:31:24 2000 @@ -1,7 +1,7 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.8.1/utils/timer.h TiMidity++-2.8.2/utils/timer.h --- TiMidity++-2.8.1/utils/timer.h Mon Nov 30 18:20:50 1998 +++ TiMidity++-2.8.2/utils/timer.h Mon Feb 7 07:31:31 2000 @@ -1,7 +1,7 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999,2000 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify