diff -ruN TiMidity++-2.10.2/ChangeLog TiMidity++-2.10.3/ChangeLog --- TiMidity++-2.10.2/ChangeLog Thu Nov 2 17:42:25 2000 +++ TiMidity++-2.10.3/ChangeLog Sat Mar 10 18:26:20 2001 @@ -1,3 +1,36 @@ +2001-03-10 Masanao Izumo + + * Version 2.10.3 released. + +2001-02-24 Eric A. Welsh + + * timidity/readmidi.c: Improved XG SYSEX support. + +2001-02-20 Ron Akkersdijk + + * interface/xaw_i.c: Bug fix. + 1) Selecting "LoadALL" in the fileselecor didn't work. + Adding a "/" at the end of the 'p' string did the trick ;-) + 2) I think XtVaSetValues free's whatever memory it got from + the caller the previous time. So ultimately it tries to + free local var 'currdir' (which was nevered malloced) + Solution: Copy 'currdir' to heapspace (new strsav routine). + Of course this may have introduced a memory leak 8-) + + * timidity/common.c: Bug fix. + Electric Fence doesn't like it if you try to alloc 0 bytes. + Besides, why first malloc 0 bytes and then check for a 0 + bogus count afterwards. + Hmm, requesting 0 bytes should never happen doesn't it; + We are actually "repairing" an error made elsewhere 8-) + +2000-02-15 Paolo Bonzini + + * libunimod/load_stx.c: fix a crash if the tracker that made + an STX file is not recognized + * libunimod/mlutil.c: fixed false negatives in recognizing + STM files. + 2000-11-02 Masanao Izumo * Version 2.10.2 released. diff -ruN TiMidity++-2.10.2/Makefile.am TiMidity++-2.10.3/Makefile.am --- TiMidity++-2.10.2/Makefile.am Wed Aug 30 14:24:47 2000 +++ TiMidity++-2.10.3/Makefile.am Sat Mar 10 17:50:19 2001 @@ -1,5 +1,5 @@ # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999,2000 Masanao Izumo +# Copyright (C) 1999-2001 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/Makefile.in TiMidity++-2.10.3/Makefile.in --- TiMidity++-2.10.2/Makefile.in Thu Nov 2 17:55:26 2000 +++ TiMidity++-2.10.3/Makefile.in Sat Mar 10 20:03:00 2001 @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999,2000 Masanao Izumo +# Copyright (C) 1999-2001 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify @@ -240,7 +240,7 @@ rev="$$subdir $$rev"; \ test "$$subdir" = "." && dot_seen=yes; \ done; \ - test "$$dot_seen" = "no" && rev="$$rev ."; \ + test "$$dot_seen" = "no" && rev=". $$rev"; \ target=`echo $@ | sed s/-recursive//`; \ for subdir in $$rev; do \ echo "Making $$target in $$subdir"; \ @@ -332,7 +332,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ diff -ruN TiMidity++-2.10.2/NEWS TiMidity++-2.10.3/NEWS --- TiMidity++-2.10.2/NEWS Thu Nov 2 17:42:30 2000 +++ TiMidity++-2.10.3/NEWS Sat Mar 10 20:02:54 2001 @@ -1,3 +1,6 @@ +03/10, 2001 + * Version 2.10.3 released. + 11/02, 2000 * Version 2.10.2 released. diff -ruN TiMidity++-2.10.2/common.makefile.in TiMidity++-2.10.3/common.makefile.in --- TiMidity++-2.10.2/common.makefile.in Wed Jul 5 22:52:34 2000 +++ TiMidity++-2.10.3/common.makefile.in Sat Mar 10 17:50:40 2001 @@ -1,5 +1,5 @@ # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999,2000 Masanao Izumo +# Copyright (C) 1999-2001 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/configs/msc-config.h TiMidity++-2.10.3/configs/msc-config.h --- TiMidity++-2.10.2/configs/msc-config.h Thu Nov 2 17:55:35 2000 +++ TiMidity++-2.10.3/configs/msc-config.h Sat Mar 10 20:03:08 2001 @@ -261,7 +261,7 @@ /* In VDS Macro AAA=BBB is not available. */ #define __W32__ -#define TIMID_VERSION "2.10.2" +#define TIMID_VERSION "2.10.3" #define DEFAULT_PATH ".\\" #define AU_W32 #define WINSOCK diff -ruN TiMidity++-2.10.2/configure TiMidity++-2.10.3/configure --- TiMidity++-2.10.2/configure Mon Oct 30 21:23:37 2000 +++ TiMidity++-2.10.3/configure Sat Mar 10 18:45:09 2001 @@ -891,7 +891,7 @@ PACKAGE=TiMidity++ -VERSION=2.10.2 +VERSION=2.10.3 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; } @@ -4117,15 +4117,48 @@ EXTRADEFS="$EXTRADEFS -DHAVE_UNION_SEMUN" fi +if test "x$CYGNUS" = xyes; then + echo $ac_n "checking Cygwin new mmsystem""... $ac_c" 1>&6 +echo "configure:4123: checking Cygwin new mmsystem" >&5 +if eval "test \"`echo '$''{'timidity_cv_header_new_mmsystem'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < + #include +int main() { +return WOM_OPEN == 0x3BB +; return 0; } +EOF +if { (eval echo configure:4136: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + timidity_cv_header_new_mmsystem=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + timidity_cv_header_new_mmsystem=no +fi +rm -f conftest* +fi + +echo "$ac_t""$timidity_cv_header_new_mmsystem" 1>&6 + if test $timidity_cv_header_new_mmsystem = yes; then + EXTRADEFS="$EXTRADEFS -DHAVE_NEW_MMSYSTEM=1" + fi +fi + if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:4123: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:4156: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext < Autoconf TIOCGETP @@ -4143,7 +4176,7 @@ if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -4165,7 +4198,7 @@ fi echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:4169: checking for 8-bit clean memcmp" >&5 +echo "configure:4202: checking for 8-bit clean memcmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4173,7 +4206,7 @@ ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -4204,17 +4237,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4208: checking for $ac_hdr" >&5 +echo "configure:4241: 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:4218: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4251: \"$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* @@ -4243,12 +4276,12 @@ for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4247: checking for $ac_func" >&5 +echo "configure:4280: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4296,7 +4329,7 @@ done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:4300: checking for working mmap" >&5 +echo "configure:4333: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4304,7 +4337,7 @@ ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -4467,7 +4500,7 @@ fi echo $ac_n "checking whether setvbuf arguments are reversed""... $ac_c" 1>&6 -echo "configure:4471: checking whether setvbuf arguments are reversed" >&5 +echo "configure:4504: checking whether setvbuf arguments are reversed" >&5 if eval "test \"`echo '$''{'ac_cv_func_setvbuf_reversed'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4475,7 +4508,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < /* If setvbuf has the reversed format, exit 0. */ @@ -4489,7 +4522,7 @@ exit(0); /* Non-reversed systems segv here. */ } EOF -if { (eval echo configure:4493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_setvbuf_reversed=yes else @@ -4513,12 +4546,12 @@ fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:4517: checking return type of signal handlers" >&5 +echo "configure:4550: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4535,7 +4568,7 @@ int i; ; return 0; } EOF -if { (eval echo configure:4539: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4572: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -4554,12 +4587,12 @@ echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:4558: checking for vprintf" >&5 +echo "configure:4591: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -4606,12 +4639,12 @@ if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:4610: checking for _doprnt" >&5 +echo "configure:4643: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -4662,12 +4695,12 @@ sleep usleep strncasecmp strerror getopt getcwd popen signal isatty do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4666: checking for $ac_func" >&5 +echo "configure:4699: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4719,12 +4752,12 @@ case "$ac_cv_header_dirent_dirent_h$ac_cv_header_dirent_sys_ndir_h$ac_cv_header_dirent_sys_dir_h$ac_cv_header_dirent_ndir_h" in *yes*) echo $ac_n "checking for opendir""... $ac_c" 1>&6 -echo "configure:4723: checking for opendir" >&5 +echo "configure:4756: checking for opendir" >&5 if eval "test \"`echo '$''{'ac_cv_func_opendir'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_opendir=yes" else @@ -4775,12 +4808,12 @@ esac if test "x$enable_network" = "xyes"; then echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:4779: checking for socket" >&5 +echo "configure:4812: checking for socket" >&5 if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_socket=yes" else @@ -4821,7 +4854,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for WSAStartup in -lwsock32""... $ac_c" 1>&6 -echo "configure:4825: checking for WSAStartup in -lwsock32" >&5 +echo "configure:4858: checking for WSAStartup in -lwsock32" >&5 ac_lib_var=`echo wsock32'_'WSAStartup | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'wapi_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4829,7 +4862,7 @@ ac_save_LIBS="$LIBS" LIBS="-lwsock32 $LIBS" cat > conftest.$ac_ext < #include @@ -4838,7 +4871,7 @@ WSAStartup(0,0); ; return 0; } EOF -if { (eval echo configure:4842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "wapi_cv_lib_$ac_lib_var=yes" else @@ -5030,7 +5063,7 @@ fi echo $ac_n "checking enable_audio=oss""... $ac_c" 1>&6 -echo "configure:5034: checking enable_audio=oss" >&5 +echo "configure:5067: checking enable_audio=oss" >&5 if test "x$au_enable_oss" = xyes; then EXTRADEFS="$EXTRADEFS -DAU_OSS" SYSEXTRAS="$SYSEXTRAS oss_a.c" @@ -5051,7 +5084,7 @@ fi echo $ac_n "checking enable_audio=sun""... $ac_c" 1>&6 -echo "configure:5055: checking enable_audio=sun" >&5 +echo "configure:5088: checking enable_audio=sun" >&5 if test "x$au_enable_sun" = xyes; then case "$target" in *-*-sunos4*) @@ -5080,7 +5113,7 @@ fi echo $ac_n "checking enable_audio=hpux""... $ac_c" 1>&6 -echo "configure:5084: checking enable_audio=hpux" >&5 +echo "configure:5117: checking enable_audio=hpux" >&5 if test "x$au_enable_hpux" = xyes; then case "$target" in *-*-hpux*) echo "$ac_t""yes" 1>&6 ;; @@ -5093,7 +5126,7 @@ fi echo $ac_n "checking enable_audio=irix""... $ac_c" 1>&6 -echo "configure:5097: checking enable_audio=irix" >&5 +echo "configure:5130: checking enable_audio=irix" >&5 if test "x$au_enable_irix" = xyes; then case "$target" in *-sgi-irix5*|*-sgi-irix6.2) @@ -5113,7 +5146,7 @@ fi echo $ac_n "checking enable_audio=mme""... $ac_c" 1>&6 -echo "configure:5117: checking enable_audio=mme" >&5 +echo "configure:5150: checking enable_audio=mme" >&5 if test "x$au_enable_mme" = xyes; then case "$target" in *-dec-*) echo "$ac_t""yes" 1>&6 ;; @@ -5128,7 +5161,7 @@ fi echo $ac_n "checking enable_audio=sb_dsp""... $ac_c" 1>&6 -echo "configure:5132: checking enable_audio=sb_dsp" >&5 +echo "configure:5165: checking enable_audio=sb_dsp" >&5 if test "x$au_enable_sb_dsp" = xyes; then case "$target" in *-*-bsdi2.0) echo "$ac_t""yes" 1>&6 ;; @@ -5141,7 +5174,7 @@ fi echo $ac_n "checking enable_audio=w32""... $ac_c" 1>&6 -echo "configure:5145: checking enable_audio=w32" >&5 +echo "configure:5178: checking enable_audio=w32" >&5 if test "x$au_enable_w32" = xyes; then case "$target" in *-*-cygwin*) @@ -5164,7 +5197,7 @@ fi echo $ac_n "checking enable_audio=alsa""... $ac_c" 1>&6 -echo "configure:5168: checking enable_audio=alsa" >&5 +echo "configure:5201: checking enable_audio=alsa" >&5 if test "x$au_enable_alsa" = xyes; then echo "$ac_t""" 1>&6 KEEPCFLAGS=$CFLAGS @@ -5197,7 +5230,7 @@ echo $ac_n "checking for ALSA CFLAGS""... $ac_c" 1>&6 -echo "configure:5201: checking for ALSA CFLAGS" >&5 +echo "configure:5234: checking for ALSA CFLAGS" >&5 if test "$alsa_inc_prefix" != "" ; then ALSA_CFLAGS="$ALSA_CFLAGS -I$alsa_inc_prefix" CFLAGS="$CFLAGS -I$alsa_inc_prefix" @@ -5205,7 +5238,7 @@ echo "$ac_t""$ALSA_CFLAGS" 1>&6 echo $ac_n "checking for ALSA LDFLAGS""... $ac_c" 1>&6 -echo "configure:5209: checking for ALSA LDFLAGS" >&5 +echo "configure:5242: checking for ALSA LDFLAGS" >&5 if test "$alsa_prefix" != "" ; then ALSA_LIBS="$ALSA_LIBS -L$alsa_prefix" LIBS="-L$alsa_prefix" @@ -5217,7 +5250,7 @@ min_alsa_version=0.1.1 echo $ac_n "checking for libasound headers version >= $min_alsa_version""... $ac_c" 1>&6 -echo "configure:5221: checking for libasound headers version >= $min_alsa_version" >&5 +echo "configure:5254: checking for libasound headers version >= $min_alsa_version" >&5 no_alsa="" alsa_min_major_version=`echo $min_alsa_version | \ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` @@ -5227,7 +5260,7 @@ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` cat > conftest.$ac_ext < @@ -5268,7 +5301,7 @@ ; return 0; } EOF -if { (eval echo configure:5272: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5305: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""found." 1>&6 have_alsa=yes @@ -5282,7 +5315,7 @@ rm -f conftest* echo $ac_n "checking for snd_cards in -lasound""... $ac_c" 1>&6 -echo "configure:5286: checking for snd_cards in -lasound" >&5 +echo "configure:5319: checking for snd_cards in -lasound" >&5 ac_lib_var=`echo asound'_'snd_cards | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5290,7 +5323,7 @@ ac_save_LIBS="$LIBS" LIBS="-lasound $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5338: \"$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 @@ -5350,14 +5383,14 @@ esac done - LIBS="$LIBS $ALSA_LIBS" + LIBS="$KEEPLIBS $ALSA_LIBS" fi else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking enable_audio=alib""... $ac_c" 1>&6 -echo "configure:5361: checking enable_audio=alib" >&5 +echo "configure:5394: checking enable_audio=alib" >&5 if test "x$au_enable_alib" = xyes; then case "$target" in *-*-hpux*) echo "$ac_t""yes" 1>&6 ;; @@ -5377,7 +5410,7 @@ fi echo $ac_n "checking enable_audio=nas""... $ac_c" 1>&6 -echo "configure:5381: checking enable_audio=nas" >&5 +echo "configure:5414: checking enable_audio=nas" >&5 if test "x$au_enable_nas" = xyes; then if test "x$with_x" != xyes; then { echo "configure: error: nas: --with-x option must be specified" 1>&2; exit 1; } @@ -5392,7 +5425,7 @@ else echo "$ac_t""" 1>&6 echo $ac_n "checking for library containing AuOpenServer""... $ac_c" 1>&6 -echo "configure:5396: checking for library containing AuOpenServer" >&5 +echo "configure:5429: checking for library containing AuOpenServer" >&5 if eval "test \"`echo '$''{'timidity_cv_search_AuOpenServer'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5403,7 +5436,7 @@ /usr/lib/libaudio.a ; do LIBS="$i $ac_func_search_save_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* timidity_cv_search_AuOpenServer="$i"; break else @@ -5447,7 +5480,7 @@ fi echo $ac_n "checking enable_audio=esd""... $ac_c" 1>&6 -echo "configure:5451: checking enable_audio=esd" >&5 +echo "configure:5484: checking enable_audio=esd" >&5 if test "x$au_enable_esd" = xyes; then echo "$ac_t""" 1>&6 KEEPCFLAGS=$CFLAGS @@ -5494,7 +5527,7 @@ # Extract the first word of "esd-config", so it can be a program name with args. set dummy esd-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5498: checking for $ac_word" >&5 +echo "configure:5531: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_ESD_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5529,7 +5562,7 @@ min_esd_version=0.2.7 echo $ac_n "checking for ESD - version >= $min_esd_version""... $ac_c" 1>&6 -echo "configure:5533: checking for ESD - version >= $min_esd_version" >&5 +echo "configure:5566: checking for ESD - version >= $min_esd_version" >&5 no_esd="" if test "$ESD_CONFIG" = "no" ; then no_esd=yes @@ -5553,7 +5586,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -5611,7 +5644,7 @@ EOF -if { (eval echo configure:5615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -5645,7 +5678,7 @@ CFLAGS="$CFLAGS $ESD_CFLAGS" LIBS="$LIBS $ESD_LIBS" cat > conftest.$ac_ext < @@ -5655,7 +5688,7 @@ return 0; ; return 0; } EOF -if { (eval echo configure:5659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding ESD or finding the wrong" @@ -5711,23 +5744,23 @@ fi echo $ac_n "checking enable_audio=vorbis""... $ac_c" 1>&6 -echo "configure:5715: checking enable_audio=vorbis" >&5 +echo "configure:5748: checking enable_audio=vorbis" >&5 if test "x$au_enable_vorbis" = xyes; then echo "$ac_t""" 1>&6 have_vorbis=yes ac_safe=`echo "vorbis/modes.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for vorbis/modes.h""... $ac_c" 1>&6 -echo "configure:5721: checking for vorbis/modes.h" >&5 +echo "configure:5754: checking for vorbis/modes.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:5731: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5764: \"$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* @@ -5750,7 +5783,7 @@ fi echo $ac_n "checking for vorbis_analysis_init in -lvorbis""... $ac_c" 1>&6 -echo "configure:5754: checking for vorbis_analysis_init in -lvorbis" >&5 +echo "configure:5787: checking for vorbis_analysis_init in -lvorbis" >&5 ac_lib_var=`echo vorbis'_'vorbis_analysis_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 @@ -5758,7 +5791,7 @@ ac_save_LIBS="$LIBS" LIBS="-lvorbis $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5806: \"$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 @@ -5817,7 +5850,7 @@ echo $ac_n "checking default output mode""... $ac_c" 1>&6 -echo "configure:5821: checking default output mode" >&5 +echo "configure:5854: checking default output mode" >&5 if test "x$DEFAULT_PLAYMODE" = x; then DEFAULT_PLAYMODE=`echo $enable_audio | sed 's/,.*//'` fi @@ -5887,12 +5920,12 @@ have_dl=no echo $ac_n "checking for LoadLibrary""... $ac_c" 1>&6 -echo "configure:5891: checking for LoadLibrary" >&5 +echo "configure:5924: checking for LoadLibrary" >&5 if eval "test \"`echo '$''{'wapi_cv_func_LoadLibrary'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -5901,7 +5934,7 @@ LoadLibrary(0); ; return 0; } EOF -if { (eval echo configure:5905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* wapi_cv_func_LoadLibrary=yes else @@ -5924,12 +5957,12 @@ if test "$have_dl" = "no"; then echo $ac_n "checking for shl_load""... $ac_c" 1>&6 -echo "configure:5928: checking for shl_load" >&5 +echo "configure:5961: checking for shl_load" >&5 if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shl_load=yes" else @@ -5977,12 +6010,12 @@ fi if test "$have_dl" = "no"; then echo $ac_n "checking for dlopen""... $ac_c" 1>&6 -echo "configure:5981: checking for dlopen" >&5 +echo "configure:6014: checking for dlopen" >&5 if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dlopen=yes" else @@ -6027,12 +6060,12 @@ fi if test "$have_dl" = "no"; then echo $ac_n "checking for dld_init""... $ac_c" 1>&6 -echo "configure:6031: checking for dld_init" >&5 +echo "configure:6064: checking for dld_init" >&5 if eval "test \"`echo '$''{'ac_cv_func_dld_init'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dld_init=yes" else @@ -6077,7 +6110,7 @@ fi if test "$have_dl" = "no"; then echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6 -echo "configure:6081: checking for dld_init in -ldld" >&5 +echo "configure:6114: checking for dld_init in -ldld" >&5 ac_lib_var=`echo dld'_'dld_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6085,7 +6118,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6133: \"$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 @@ -6119,13 +6152,13 @@ fi echo $ac_n "checking dynamic link method""... $ac_c" 1>&6 -echo "configure:6123: checking dynamic link method" >&5 +echo "configure:6156: checking dynamic link method" >&5 case "$have_dl" in dlopen) echo "$ac_t""use dl_dlopen.c" 1>&6 SYSEXTRAS="$SYSEXTRAS dl_dlopen.c" echo $ac_n "checking whether your dlsym() needs a leading underscore""... $ac_c" 1>&6 -echo "configure:6129: checking whether your dlsym() needs a leading underscore" >&5 +echo "configure:6162: checking whether your dlsym() needs a leading underscore" >&5 if eval "test \"`echo '$''{'timidity_cv_func_dlsym_underscore'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6273,17 +6306,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6277: checking for $ac_hdr" >&5 +echo "configure:6310: 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:6287: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6320: \"$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* @@ -6324,7 +6357,7 @@ esac echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6 -echo "configure:6328: checking for initscr in -lncurses" >&5 +echo "configure:6361: checking for initscr in -lncurses" >&5 ac_lib_var=`echo ncurses'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6332,7 +6365,7 @@ ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6380: \"$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 @@ -6362,7 +6395,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for PDC_set_ctrl_break in -lcurses""... $ac_c" 1>&6 -echo "configure:6366: checking for PDC_set_ctrl_break in -lcurses" >&5 +echo "configure:6399: checking for PDC_set_ctrl_break in -lcurses" >&5 ac_lib_var=`echo curses'_'PDC_set_ctrl_break | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6370,7 +6403,7 @@ ac_save_LIBS="$LIBS" LIBS="-lcurses $lib_user32_test $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6418: \"$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 @@ -6403,7 +6436,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for PDC_set_ctrl_break in -lpdcurses""... $ac_c" 1>&6 -echo "configure:6407: checking for PDC_set_ctrl_break in -lpdcurses" >&5 +echo "configure:6440: 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 @@ -6411,7 +6444,7 @@ ac_save_LIBS="$LIBS" LIBS="-lpdcurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6459: \"$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 @@ -6512,7 +6545,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:6516: checking for SLang_init_tty in -lslang" >&5 +echo "configure:6549: 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 @@ -6520,7 +6553,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:6568: \"$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 @@ -6557,17 +6590,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6561: checking for $ac_hdr" >&5 +echo "configure:6594: 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:6571: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6604: \"$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* @@ -6619,7 +6652,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:6623: checking for initscr in -ltermcap" >&5 +echo "configure:6656: 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 @@ -6627,7 +6660,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:6675: \"$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 @@ -6758,7 +6791,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:6762: checking for Tcl_Init in -l$l" >&5 +echo "configure:6795: 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 @@ -6766,7 +6799,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:6814: \"$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 @@ -6801,7 +6834,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:6805: checking for Tk_Init in -l$l" >&5 +echo "configure:6838: 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 @@ -6809,7 +6842,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:6857: \"$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 @@ -7184,7 +7217,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:7188: checking for $ac_word" >&5 +echo "configure:7221: 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 @@ -7219,7 +7252,7 @@ min_gtk_version=1.1.3 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:7223: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:7256: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" = "no" ; then no_gtk=yes @@ -7242,7 +7275,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -7308,7 +7341,7 @@ } EOF -if { (eval echo configure:7312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7345: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -7342,7 +7375,7 @@ CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat > conftest.$ac_ext < @@ -7352,7 +7385,7 @@ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ; return 0; } EOF -if { (eval echo configure:7356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7389: \"$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" @@ -7481,17 +7514,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7485: checking for $ac_hdr" >&5 +echo "configure:7518: 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:7495: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7528: \"$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* @@ -7565,17 +7598,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7569: checking for $ac_hdr" >&5 +echo "configure:7602: 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:7579: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7612: \"$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* @@ -7671,17 +7704,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:7675: checking for X11/xpm.h" >&5 +echo "configure:7708: 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:7685: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7718: \"$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* @@ -7704,7 +7737,7 @@ fi echo $ac_n "checking for XpmCreatePixmapFromData in -lXpm""... $ac_c" 1>&6 -echo "configure:7708: checking for XpmCreatePixmapFromData in -lXpm" >&5 +echo "configure:7741: 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 @@ -7712,7 +7745,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:7760: \"$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 @@ -7795,7 +7828,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:7799: checking for DndInitialize in -lDnd" >&5 +echo "configure:7832: 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 @@ -7803,7 +7836,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:7851: \"$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 @@ -7921,7 +7954,7 @@ EXTRADEFS="$EXTRADEFS -DWRDT_X" enable_sherry_wrd=yes echo $ac_n "checking for zlibVersion in -lz""... $ac_c" 1>&6 -echo "configure:7925: checking for zlibVersion in -lz" >&5 +echo "configure:7958: 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 @@ -7929,7 +7962,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:7977: \"$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 @@ -7963,17 +7996,17 @@ ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for png.h""... $ac_c" 1>&6 -echo "configure:7967: checking for png.h" >&5 +echo "configure:8000: 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:7977: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8010: \"$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* @@ -7996,7 +8029,7 @@ fi echo $ac_n "checking for png_init_io in -lpng""... $ac_c" 1>&6 -echo "configure:8000: checking for png_init_io in -lpng" >&5 +echo "configure:8033: 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 @@ -8004,7 +8037,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:8052: \"$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.10.2/configure.in TiMidity++-2.10.3/configure.in --- TiMidity++-2.10.2/configure.in Mon Oct 30 21:23:31 2000 +++ TiMidity++-2.10.3/configure.in Sat Mar 10 18:44:57 2001 @@ -1,5 +1,5 @@ dnl TiMidity++ -- MIDI to WAVE converter and player -dnl Copyright (C) 1999,2000 Masanao Izumo +dnl Copyright (C) 1999-2001 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.10.2, no-define) +AM_INIT_AUTOMAKE(TiMidity++, 2.10.3, no-define) dnl To use CONTAINS() macro (See acinclude.m4) CONTAINS_INIT @@ -337,6 +337,18 @@ EXTRADEFS="$EXTRADEFS -DHAVE_UNION_SEMUN" fi +if test "x$CYGNUS" = xyes; then + AC_CACHE_CHECK(Cygwin new mmsystem,timidity_cv_header_new_mmsystem, + AC_TRY_COMPILE( + [#include + #include ], + return WOM_OPEN == 0x3BB, + timidity_cv_header_new_mmsystem=yes,timidity_cv_header_new_mmsystem=no)) + if test $timidity_cv_header_new_mmsystem = yes; then + EXTRADEFS="$EXTRADEFS -DHAVE_NEW_MMSYSTEM=1" + fi +fi + dnl Checks for library functions. AC_PROG_GCC_TRADITIONAL AC_FUNC_MEMCMP @@ -678,7 +690,7 @@ EXTRADEFS="$EXTRADEFS -DAU_ALSA" SYSEXTRAS="$SYSEXTRAS alsa_a.c" EXTRACT_CPPFLAGS(CPPFLAGS,CFLAGS,$ALSA_CFLAGS) - LIBS="$LIBS $ALSA_LIBS" + LIBS="$KEEPLIBS $ALSA_LIBS" fi else AC_MSG_RESULT(no) diff -ruN TiMidity++-2.10.2/doc/C/Makefile.am TiMidity++-2.10.3/doc/C/Makefile.am --- TiMidity++-2.10.2/doc/C/Makefile.am Wed Jul 5 22:51:50 2000 +++ TiMidity++-2.10.3/doc/C/Makefile.am Sat Mar 10 17:52:18 2001 @@ -1,5 +1,5 @@ # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999,2000 Masanao Izumo +# Copyright (C) 1999-2001 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/doc/C/Makefile.in TiMidity++-2.10.3/doc/C/Makefile.in --- TiMidity++-2.10.2/doc/C/Makefile.in Thu Nov 2 17:55:34 2000 +++ TiMidity++-2.10.3/doc/C/Makefile.in Sat Mar 10 20:03:07 2001 @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999,2000 Masanao Izumo +# Copyright (C) 1999-2001 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify @@ -145,7 +145,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ diff -ruN TiMidity++-2.10.2/doc/C/timidity.1 TiMidity++-2.10.3/doc/C/timidity.1 --- TiMidity++-2.10.2/doc/C/timidity.1 Sat Jul 15 01:00:54 2000 +++ TiMidity++-2.10.3/doc/C/timidity.1 Sat Mar 10 17:54:49 2001 @@ -619,7 +619,7 @@ .P .SH COPYRIGHT -Copyright (C) 1999,2000 Masanao Izumo +Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen .P Original version was developed under the name of Tuukka Toivonen diff -ruN TiMidity++-2.10.2/doc/Makefile.am TiMidity++-2.10.3/doc/Makefile.am --- TiMidity++-2.10.2/doc/Makefile.am Wed Jul 5 22:51:48 2000 +++ TiMidity++-2.10.3/doc/Makefile.am Sat Mar 10 17:52:22 2001 @@ -1,5 +1,5 @@ # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999,2000 Masanao Izumo +# Copyright (C) 1999-2001 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/doc/Makefile.in TiMidity++-2.10.3/doc/Makefile.in --- TiMidity++-2.10.2/doc/Makefile.in Thu Nov 2 17:55:34 2000 +++ TiMidity++-2.10.3/doc/Makefile.in Sat Mar 10 20:03:07 2001 @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999,2000 Masanao Izumo +# Copyright (C) 1999-2001 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify @@ -254,7 +254,7 @@ rev="$$subdir $$rev"; \ test "$$subdir" = "." && dot_seen=yes; \ done; \ - test "$$dot_seen" = "no" && rev="$$rev ."; \ + test "$$dot_seen" = "no" && rev=". $$rev"; \ target=`echo $@ | sed s/-recursive//`; \ for subdir in $$rev; do \ echo "Making $$target in $$subdir"; \ @@ -313,7 +313,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ diff -ruN TiMidity++-2.10.2/doc/ja_JP.ujis/Makefile.am TiMidity++-2.10.3/doc/ja_JP.ujis/Makefile.am --- TiMidity++-2.10.2/doc/ja_JP.ujis/Makefile.am Wed Jul 5 22:51:50 2000 +++ TiMidity++-2.10.3/doc/ja_JP.ujis/Makefile.am Sat Mar 10 17:52:10 2001 @@ -1,5 +1,5 @@ # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999,2000 Masanao Izumo +# Copyright (C) 1999-2001 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/doc/ja_JP.ujis/Makefile.in TiMidity++-2.10.3/doc/ja_JP.ujis/Makefile.in --- TiMidity++-2.10.2/doc/ja_JP.ujis/Makefile.in Thu Nov 2 17:55:35 2000 +++ TiMidity++-2.10.3/doc/ja_JP.ujis/Makefile.in Sat Mar 10 20:03:08 2001 @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999,2000 Masanao Izumo +# Copyright (C) 1999-2001 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify @@ -145,7 +145,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ diff -ruN TiMidity++-2.10.2/interface/Makefile.am TiMidity++-2.10.3/interface/Makefile.am --- TiMidity++-2.10.2/interface/Makefile.am Wed Oct 18 08:32:00 2000 +++ TiMidity++-2.10.3/interface/Makefile.am Sat Mar 10 17:52:44 2001 @@ -1,5 +1,5 @@ # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999,2000 Masanao Izumo +# Copyright (C) 1999-2001 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/Makefile.in TiMidity++-2.10.3/interface/Makefile.in --- TiMidity++-2.10.2/interface/Makefile.in Thu Nov 2 17:55:29 2000 +++ TiMidity++-2.10.3/interface/Makefile.in Sat Mar 10 20:03:02 2001 @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999,2000 Masanao Izumo +# Copyright (C) 1999-2001 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify @@ -284,7 +284,7 @@ rev="$$subdir $$rev"; \ test "$$subdir" = "." && dot_seen=yes; \ done; \ - test "$$dot_seen" = "no" && rev="$$rev ."; \ + test "$$dot_seen" = "no" && rev=". $$rev"; \ target=`echo $@ | sed s/-recursive//`; \ for subdir in $$rev; do \ echo "Making $$target in $$subdir"; \ @@ -343,7 +343,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ @@ -361,21 +361,11 @@ fi; \ done VTPrsTbl.o: VTPrsTbl.c VTparse.h -alsaseq_c.o: alsaseq_c.c ../config.h ../timidity/timidity.h \ - ../utils/support.h ../timidity/common.h ../libarc/url.h \ - ../utils/mblock.h ../timidity/controls.h ../timidity/instrum.h \ - ../timidity/playmidi.h ../timidity/readmidi.h \ - ../timidity/recache.h ../timidity/output.h ../timidity/aq.h \ - ../utils/timer.h dumb_c.o: dumb_c.c ../config.h ../timidity/timidity.h ../utils/support.h \ ../timidity/common.h ../libarc/url.h ../utils/mblock.h \ ../timidity/output.h ../timidity/controls.h \ ../timidity/instrum.h ../timidity/playmidi.h \ ../timidity/readmidi.h -dynamic_c.o: dynamic_c.c ../config.h ../timidity/timidity.h \ - ../utils/support.h ../timidity/common.h ../libarc/url.h \ - ../utils/mblock.h ../timidity/output.h ../timidity/controls.h \ - ../timidity/dlutils.h emacs_c.o: emacs_c.c ../config.h ../timidity/timidity.h \ ../utils/support.h ../timidity/common.h ../libarc/url.h \ ../utils/mblock.h ../timidity/output.h ../timidity/controls.h \ @@ -395,21 +385,6 @@ pixmaps/slow.xpm pixmaps/fast.xpm pixmaps/timidity.xpm gtk_p.o: gtk_p.c ../config.h ../timidity/timidity.h ../utils/support.h \ ../timidity/controls.h gtk_h.h -motif_c.o: motif_c.c ../config.h ../timidity/timidity.h \ - ../utils/support.h ../timidity/common.h ../libarc/url.h \ - ../utils/mblock.h ../timidity/instrum.h ../timidity/playmidi.h \ - ../timidity/readmidi.h ../timidity/output.h \ - ../timidity/controls.h motif.h ../timidity/miditrace.h -motif_i.o: motif_i.c ../config.h ../timidity/timidity.h \ - ../utils/support.h ../timidity/common.h ../libarc/url.h \ - ../utils/mblock.h ../timidity/instrum.h ../timidity/playmidi.h \ - ../timidity/output.h ../timidity/controls.h motif.h \ - motif_bitmaps/back.xbm motif_bitmaps/next.xbm \ - motif_bitmaps/prev.xbm motif_bitmaps/restart.xbm \ - motif_bitmaps/fwd.xbm motif_bitmaps/pause.xbm \ - motif_bitmaps/quit.xbm motif_bitmaps/timidity.xbm -motif_p.o: motif_p.c ../config.h ../timidity/timidity.h \ - ../utils/support.h ../timidity/controls.h motif.h ncurs_c.o: ncurs_c.c ../config.h ../timidity/timidity.h \ ../utils/support.h ../timidity/common.h ../libarc/url.h \ ../utils/mblock.h ../timidity/instrum.h ../timidity/playmidi.h \ @@ -481,7 +456,7 @@ ../timidity/common.h ../libarc/url.h ../utils/mblock.h \ ../timidity/instrum.h ../timidity/playmidi.h \ ../timidity/readmidi.h ../timidity/controls.h ../utils/timer.h \ - ../utils/strtab.h ../interface.h xaw_redef.c + ../utils/strtab.h ../interface.h xskin_c.o: xskin_c.c ../config.h ../timidity/timidity.h \ ../utils/support.h ../timidity/common.h ../libarc/url.h \ ../utils/mblock.h ../timidity/instrum.h ../timidity/playmidi.h \ diff -ruN TiMidity++-2.10.2/interface/alsaseq_c.c TiMidity++-2.10.3/interface/alsaseq_c.c --- TiMidity++-2.10.2/interface/alsaseq_c.c Thu Nov 2 17:55:07 2000 +++ TiMidity++-2.10.3/interface/alsaseq_c.c Sat Mar 10 18:02:52 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/bitmaps/Makefile.am TiMidity++-2.10.3/interface/bitmaps/Makefile.am --- TiMidity++-2.10.2/interface/bitmaps/Makefile.am Wed Jul 5 22:51:50 2000 +++ TiMidity++-2.10.3/interface/bitmaps/Makefile.am Sat Mar 10 17:52:37 2001 @@ -1,5 +1,5 @@ # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999,2000 Masanao Izumo +# Copyright (C) 1999-2001 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/bitmaps/Makefile.in TiMidity++-2.10.3/interface/bitmaps/Makefile.in --- TiMidity++-2.10.2/interface/bitmaps/Makefile.in Thu Nov 2 17:55:30 2000 +++ TiMidity++-2.10.3/interface/bitmaps/Makefile.in Sat Mar 10 20:03:03 2001 @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999,2000 Masanao Izumo +# Copyright (C) 1999-2001 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify @@ -147,7 +147,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ diff -ruN TiMidity++-2.10.2/interface/browser.tcl TiMidity++-2.10.3/interface/browser.tcl --- TiMidity++-2.10.2/interface/browser.tcl Sun Feb 7 05:18:56 1999 +++ TiMidity++-2.10.3/interface/browser.tcl Sat Mar 10 18:02:46 2001 @@ -1,5 +1,5 @@ # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999 Masanao Izumo +# Copyright (C) 1999-2001 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/dumb_c.c TiMidity++-2.10.3/interface/dumb_c.c --- TiMidity++-2.10.2/interface/dumb_c.c Mon May 8 13:29:14 2000 +++ TiMidity++-2.10.3/interface/dumb_c.c Sat Mar 10 18:02:41 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/dynamic_c.c TiMidity++-2.10.3/interface/dynamic_c.c --- TiMidity++-2.10.2/interface/dynamic_c.c Mon Feb 7 07:50:19 2000 +++ TiMidity++-2.10.3/interface/dynamic_c.c Sat Mar 10 18:02:37 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/emacs_c.c TiMidity++-2.10.3/interface/emacs_c.c --- TiMidity++-2.10.2/interface/emacs_c.c Mon Feb 7 07:51:11 2000 +++ TiMidity++-2.10.3/interface/emacs_c.c Sat Mar 10 18:02:34 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/gtk_c.c TiMidity++-2.10.3/interface/gtk_c.c --- TiMidity++-2.10.2/interface/gtk_c.c Sat Feb 19 20:43:12 2000 +++ TiMidity++-2.10.3/interface/gtk_c.c Sat Mar 10 18:02:30 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/gtk_h.h TiMidity++-2.10.3/interface/gtk_h.h --- TiMidity++-2.10.2/interface/gtk_h.h Mon Feb 7 07:50:12 2000 +++ TiMidity++-2.10.3/interface/gtk_h.h Sat Mar 10 18:02:26 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/gtk_i.c TiMidity++-2.10.3/interface/gtk_i.c --- TiMidity++-2.10.2/interface/gtk_i.c Tue Jul 4 17:08:11 2000 +++ TiMidity++-2.10.3/interface/gtk_i.c Sat Mar 10 18:02:22 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/gtk_p.c TiMidity++-2.10.3/interface/gtk_p.c --- TiMidity++-2.10.2/interface/gtk_p.c Mon Feb 7 07:50:05 2000 +++ TiMidity++-2.10.3/interface/gtk_p.c Sat Mar 10 18:02:18 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/mac_c.c TiMidity++-2.10.3/interface/mac_c.c --- TiMidity++-2.10.2/interface/mac_c.c Mon Feb 7 07:54:14 2000 +++ TiMidity++-2.10.3/interface/mac_c.c Sat Mar 10 18:02:08 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/mac_c.h TiMidity++-2.10.3/interface/mac_c.h --- TiMidity++-2.10.2/interface/mac_c.h Mon Feb 7 07:53:07 2000 +++ TiMidity++-2.10.3/interface/mac_c.h Sat Mar 10 18:02:04 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/mac_mag.c TiMidity++-2.10.3/interface/mac_mag.c --- TiMidity++-2.10.2/interface/mac_mag.c Mon Feb 7 07:54:04 2000 +++ TiMidity++-2.10.3/interface/mac_mag.c Sat Mar 10 18:02:00 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/mac_mag.h TiMidity++-2.10.3/interface/mac_mag.h --- TiMidity++-2.10.2/interface/mac_mag.h Mon Feb 7 07:52:59 2000 +++ TiMidity++-2.10.3/interface/mac_mag.h Sat Mar 10 18:01:57 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/mac_trace.c TiMidity++-2.10.3/interface/mac_trace.c --- TiMidity++-2.10.2/interface/mac_trace.c Sat Feb 19 22:34:11 2000 +++ TiMidity++-2.10.3/interface/mac_trace.c Sat Mar 10 18:01:52 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/mac_wrdwindow.c TiMidity++-2.10.3/interface/mac_wrdwindow.c --- TiMidity++-2.10.2/interface/mac_wrdwindow.c Mon Feb 7 07:53:32 2000 +++ TiMidity++-2.10.3/interface/mac_wrdwindow.c Sat Mar 10 18:01:48 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/mac_wrdwindow.h TiMidity++-2.10.3/interface/mac_wrdwindow.h --- TiMidity++-2.10.2/interface/mac_wrdwindow.h Mon Feb 7 07:52:47 2000 +++ TiMidity++-2.10.3/interface/mac_wrdwindow.h Sat Mar 10 18:01:44 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/misc.tcl TiMidity++-2.10.3/interface/misc.tcl --- TiMidity++-2.10.2/interface/misc.tcl Mon Nov 30 17:56:28 1998 +++ TiMidity++-2.10.3/interface/misc.tcl Sat Mar 10 18:01:39 2001 @@ -1,5 +1,5 @@ # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999 Masanao Izumo +# Copyright (C) 1999-2001 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/motif.h TiMidity++-2.10.3/interface/motif.h --- TiMidity++-2.10.2/interface/motif.h Mon Feb 7 07:50:01 2000 +++ TiMidity++-2.10.3/interface/motif.h Sat Mar 10 18:01:35 2001 @@ -1,8 +1,6 @@ -#ifndef ___MOTIF_H_ -#define ___MOTIF_H_ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -22,6 +20,9 @@ motif.h: written by Vincent Pagel (pagel@loria.fr) 10/4/95 */ + +#ifndef ___MOTIF_H_ +#define ___MOTIF_H_ /* * MESSAGE FROM KERNEL TO MOTIF diff -ruN TiMidity++-2.10.2/interface/motif_bitmaps/Makefile.am TiMidity++-2.10.3/interface/motif_bitmaps/Makefile.am --- TiMidity++-2.10.2/interface/motif_bitmaps/Makefile.am Wed Jul 5 22:51:50 2000 +++ TiMidity++-2.10.3/interface/motif_bitmaps/Makefile.am Sat Mar 10 17:52:41 2001 @@ -1,5 +1,5 @@ # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999,2000 Masanao Izumo +# Copyright (C) 1999-2001 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/motif_bitmaps/Makefile.in TiMidity++-2.10.3/interface/motif_bitmaps/Makefile.in --- TiMidity++-2.10.2/interface/motif_bitmaps/Makefile.in Thu Nov 2 17:55:30 2000 +++ TiMidity++-2.10.3/interface/motif_bitmaps/Makefile.in Sat Mar 10 20:03:03 2001 @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999,2000 Masanao Izumo +# Copyright (C) 1999-2001 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify @@ -147,7 +147,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ diff -ruN TiMidity++-2.10.2/interface/motif_c.c TiMidity++-2.10.3/interface/motif_c.c --- TiMidity++-2.10.2/interface/motif_c.c Mon Feb 7 07:49:57 2000 +++ TiMidity++-2.10.3/interface/motif_c.c Sat Mar 10 18:01:25 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/motif_i.c TiMidity++-2.10.3/interface/motif_i.c --- TiMidity++-2.10.2/interface/motif_i.c Mon Feb 7 07:49:53 2000 +++ TiMidity++-2.10.3/interface/motif_i.c Sat Mar 10 18:01:21 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/motif_p.c TiMidity++-2.10.3/interface/motif_p.c --- TiMidity++-2.10.2/interface/motif_p.c Mon Feb 7 07:49:49 2000 +++ TiMidity++-2.10.3/interface/motif_p.c Sat Mar 10 18:01:17 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/ncurs_c.c TiMidity++-2.10.3/interface/ncurs_c.c --- TiMidity++-2.10.2/interface/ncurs_c.c Thu Mar 30 10:36:06 2000 +++ TiMidity++-2.10.3/interface/ncurs_c.c Sat Mar 10 20:00:47 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -433,7 +433,7 @@ wmove(dftwin, VERSION_LINE,0); waddstr(dftwin, "TiMidity++ v"); waddstr(dftwin, timidity_version); wmove(dftwin, VERSION_LINE,COLS-54); - waddstr(dftwin, "(C) 1995,1999,2000 Tuukka Toivonen, Masanao Izumo"); + waddstr(dftwin, "(C) 1995,1999-2001 Tuukka Toivonen, Masanao Izumo"); wmove(dftwin, FILE_LINE,0); waddstr(dftwin, "File:"); #ifdef MIDI_TITLE diff -ruN TiMidity++-2.10.2/interface/pixmaps/Makefile.am TiMidity++-2.10.3/interface/pixmaps/Makefile.am --- TiMidity++-2.10.2/interface/pixmaps/Makefile.am Wed Jul 5 22:51:50 2000 +++ TiMidity++-2.10.3/interface/pixmaps/Makefile.am Sat Mar 10 17:52:33 2001 @@ -1,5 +1,5 @@ # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999,2000 Masanao Izumo +# Copyright (C) 1999-2001 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/pixmaps/Makefile.in TiMidity++-2.10.3/interface/pixmaps/Makefile.in --- TiMidity++-2.10.2/interface/pixmaps/Makefile.in Thu Nov 2 17:55:31 2000 +++ TiMidity++-2.10.3/interface/pixmaps/Makefile.in Sat Mar 10 20:03:04 2001 @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999,2000 Masanao Izumo +# Copyright (C) 1999-2001 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify @@ -147,7 +147,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ diff -ruN TiMidity++-2.10.2/interface/server_c.c TiMidity++-2.10.3/interface/server_c.c --- TiMidity++-2.10.2/interface/server_c.c Wed Apr 12 12:32:07 2000 +++ TiMidity++-2.10.3/interface/server_c.c Sat Mar 10 18:01:01 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/server_defs.h TiMidity++-2.10.3/interface/server_defs.h --- TiMidity++-2.10.2/interface/server_defs.h Mon Feb 7 07:49:38 2000 +++ TiMidity++-2.10.3/interface/server_defs.h Sat Mar 10 18:00:57 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/slang_c.c TiMidity++-2.10.3/interface/slang_c.c --- TiMidity++-2.10.2/interface/slang_c.c Mon Feb 7 07:49:33 2000 +++ TiMidity++-2.10.3/interface/slang_c.c Sat Mar 10 18:00:53 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/soundspec.c TiMidity++-2.10.3/interface/soundspec.c --- TiMidity++-2.10.2/interface/soundspec.c Mon Feb 7 07:44:01 2000 +++ TiMidity++-2.10.3/interface/soundspec.c Sat Mar 10 18:00:49 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/soundspec.h TiMidity++-2.10.3/interface/soundspec.h --- TiMidity++-2.10.2/interface/soundspec.h Mon Feb 7 07:43:58 2000 +++ TiMidity++-2.10.3/interface/soundspec.h Sat Mar 10 18:00:44 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/timidity.el TiMidity++-2.10.3/interface/timidity.el --- TiMidity++-2.10.2/interface/timidity.el Mon Mar 8 11:55:22 1999 +++ TiMidity++-2.10.3/interface/timidity.el Sat Mar 10 18:00:39 2001 @@ -1,7 +1,7 @@ ;; TiMidity interface for Emacs ;; ;; TiMidity++ -- MIDI to WAVE converter and player -;; Copyright (C) 1999 Masanao Izumo +;; Copyright (C) 1999-2001 Masanao Izumo ;; Copyright (C) 1995 Tuukka Toivonen ;; ;; This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/tk_c.c TiMidity++-2.10.3/interface/tk_c.c --- TiMidity++-2.10.2/interface/tk_c.c Mon Feb 7 07:43:53 2000 +++ TiMidity++-2.10.3/interface/tk_c.c Sat Mar 10 18:00:34 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/tkmidity.ptcl TiMidity++-2.10.3/interface/tkmidity.ptcl --- TiMidity++-2.10.2/interface/tkmidity.ptcl Sun Feb 7 03:50:38 1999 +++ TiMidity++-2.10.3/interface/tkmidity.ptcl Sat Mar 10 18:00:29 2001 @@ -1,7 +1,7 @@ #!/usr/local/bin/wishx -f # # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999 Masanao Izumo +# Copyright (C) 1999-2001 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/tkpanel.tcl TiMidity++-2.10.3/interface/tkpanel.tcl --- TiMidity++-2.10.2/interface/tkpanel.tcl Fri Sep 10 11:27:04 1999 +++ TiMidity++-2.10.3/interface/tkpanel.tcl Sat Mar 10 18:00:20 2001 @@ -1,7 +1,7 @@ #!/usr/local/bin/wishx -f # # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999 Masanao Izumo +# Copyright (C) 1999-2001 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/vt100.c TiMidity++-2.10.3/interface/vt100.c --- TiMidity++-2.10.2/interface/vt100.c Mon Feb 7 07:43:48 2000 +++ TiMidity++-2.10.3/interface/vt100.c Sat Mar 10 18:00:14 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/vt100.h TiMidity++-2.10.3/interface/vt100.h --- TiMidity++-2.10.2/interface/vt100.h Mon Feb 7 07:43:44 2000 +++ TiMidity++-2.10.3/interface/vt100.h Sat Mar 10 18:00:10 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/vt100_c.c TiMidity++-2.10.3/interface/vt100_c.c --- TiMidity++-2.10.2/interface/vt100_c.c Mon Feb 7 07:43:39 2000 +++ TiMidity++-2.10.3/interface/vt100_c.c Sat Mar 10 18:00:05 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/w32g.h TiMidity++-2.10.3/interface/w32g.h --- TiMidity++-2.10.2/interface/w32g.h Tue Aug 8 12:37:40 2000 +++ TiMidity++-2.10.3/interface/w32g.h Sat Mar 10 18:00:01 2001 @@ -1,8 +1,6 @@ -#ifndef ___W32G_H_ -#define ___W32G_H_ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -19,6 +17,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + +#ifndef ___W32G_H_ +#define ___W32G_H_ #include #include diff -ruN TiMidity++-2.10.2/interface/w32g_c.c TiMidity++-2.10.3/interface/w32g_c.c --- TiMidity++-2.10.2/interface/w32g_c.c Tue Aug 8 12:37:40 2000 +++ TiMidity++-2.10.3/interface/w32g_c.c Sat Mar 10 17:59:51 2001 @@ -1,6 +1,6 @@ /* TiMidity -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/w32g_i.c TiMidity++-2.10.3/interface/w32g_i.c --- TiMidity++-2.10.2/interface/w32g_i.c Tue Aug 8 12:37:40 2000 +++ TiMidity++-2.10.3/interface/w32g_i.c Sat Mar 10 19:59:49 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -33,18 +33,21 @@ #include // #include #if defined(__CYGWIN32__) || defined(__MINGW32__) +#ifndef HAVE_NEW_MMSYSTEM #include #ifndef TPM_TOPALIGN #define TPM_TOPALIGN 0x0000L /* for old version of cygwin */ #endif #define TIME_ONESHOT 0 #define TIME_PERIODIC 1 -WINAPI int timeSetEvent(UINT uDelay, UINT uResolution, - void *fptc, DWORD dwUser, UINT fuEvent); -WINAPI int timeKillEvent(UINT uTimerID); +int WINAPI timeSetEvent(UINT uDelay, UINT uResolution, + void *fptc, DWORD dwUser, UINT fuEvent); +int WINAPI timeKillEvent(UINT uTimerID); +#endif #else #include #endif /* __CYGWIN32__ */ + #include #ifndef NO_STRING_H #include diff -ruN TiMidity++-2.10.2/interface/w32g_ini.c TiMidity++-2.10.3/interface/w32g_ini.c --- TiMidity++-2.10.2/interface/w32g_ini.c Tue Aug 8 12:37:40 2000 +++ TiMidity++-2.10.3/interface/w32g_ini.c Sat Mar 10 17:59:42 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/w32g_playlist.c TiMidity++-2.10.3/interface/w32g_playlist.c --- TiMidity++-2.10.2/interface/w32g_playlist.c Tue Aug 8 12:37:40 2000 +++ TiMidity++-2.10.3/interface/w32g_playlist.c Sat Mar 10 17:59:38 2001 @@ -1,6 +1,6 @@ /* TiMidity -- Experimental MIDI to WAVE converter - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/w32g_pref.c TiMidity++-2.10.3/interface/w32g_pref.c --- TiMidity++-2.10.2/interface/w32g_pref.c Tue Aug 8 12:37:41 2000 +++ TiMidity++-2.10.3/interface/w32g_pref.c Sat Mar 10 19:59:54 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -82,7 +82,8 @@ static int DlgOpenConfigFile(char *Filename, HWND hwnd); static int DlgOpenOutputFile(char *Filename, HWND hwnd); -#if defined(__CYGWIN32__) || defined(__MINGW32__) +//#if defined(__CYGWIN32__) || defined(__MINGW32__) +#if 0 /* New version of mingw */ //#define pszTemplate u1.pszTemplate //#define pszIcon u2.pszIcon #ifndef NONAMELESSUNION diff -ruN TiMidity++-2.10.2/interface/w32g_pref.h TiMidity++-2.10.3/interface/w32g_pref.h --- TiMidity++-2.10.2/interface/w32g_pref.h Tue Aug 8 12:37:41 2000 +++ TiMidity++-2.10.3/interface/w32g_pref.h Sat Mar 10 17:59:23 2001 @@ -1,8 +1,6 @@ -#ifndef __W32G2_PREF_H__ -#define __W32G2_PREF_H__ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -19,6 +17,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + +#ifndef __W32G2_PREF_H__ +#define __W32G2_PREF_H__ extern volatile int PrefWndDoing; void PrefWndCreate(HWND hwnd); diff -ruN TiMidity++-2.10.2/interface/w32g_subwin.c TiMidity++-2.10.3/interface/w32g_subwin.c --- TiMidity++-2.10.2/interface/w32g_subwin.c Tue Aug 8 12:37:41 2000 +++ TiMidity++-2.10.3/interface/w32g_subwin.c Sat Mar 10 17:59:07 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/w32g_subwin.h TiMidity++-2.10.3/interface/w32g_subwin.h --- TiMidity++-2.10.2/interface/w32g_subwin.h Tue Aug 8 12:37:41 2000 +++ TiMidity++-2.10.3/interface/w32g_subwin.h Sat Mar 10 17:59:02 2001 @@ -1,8 +1,6 @@ -#ifndef ___W32G_SUBWIN_H_ -#define ___W32G_SUBWIN_H_ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -19,6 +17,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + +#ifndef ___W32G_SUBWIN_H_ +#define ___W32G_SUBWIN_H_ // Console Window void InitConsoleWnd(HWND hParentWnd); diff -ruN TiMidity++-2.10.2/interface/w32g_utl.c TiMidity++-2.10.3/interface/w32g_utl.c --- TiMidity++-2.10.2/interface/w32g_utl.c Tue Aug 8 12:37:41 2000 +++ TiMidity++-2.10.3/interface/w32g_utl.c Sat Mar 10 17:58:27 2001 @@ -1,6 +1,6 @@ /* - TiMidity -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + TiMidity++ -- MIDI to WAVE converter and player + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/w32g_utl.h TiMidity++-2.10.3/interface/w32g_utl.h --- TiMidity++-2.10.2/interface/w32g_utl.h Tue Aug 8 12:37:41 2000 +++ TiMidity++-2.10.3/interface/w32g_utl.h Sat Mar 10 17:58:19 2001 @@ -1,8 +1,6 @@ -#ifndef ___W32G_UTL_H_ -#define ___W32G_UTL_H_ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -19,6 +17,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + +#ifndef ___W32G_UTL_H_ +#define ___W32G_UTL_H_ // ini & config #define IniVersion "2.2" diff -ruN TiMidity++-2.10.2/interface/wrdt_dumb.c TiMidity++-2.10.3/interface/wrdt_dumb.c --- TiMidity++-2.10.2/interface/wrdt_dumb.c Mon Feb 7 07:41:15 2000 +++ TiMidity++-2.10.3/interface/wrdt_dumb.c Sat Mar 10 17:58:11 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/wrdt_mac.c TiMidity++-2.10.3/interface/wrdt_mac.c --- TiMidity++-2.10.2/interface/wrdt_mac.c Mon Feb 7 07:53:43 2000 +++ TiMidity++-2.10.3/interface/wrdt_mac.c Sat Mar 10 17:58:07 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/wrdt_tty.c TiMidity++-2.10.3/interface/wrdt_tty.c --- TiMidity++-2.10.2/interface/wrdt_tty.c Mon Feb 7 07:41:10 2000 +++ TiMidity++-2.10.3/interface/wrdt_tty.c Sat Mar 10 17:58:03 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/wrdt_wcon.c TiMidity++-2.10.3/interface/wrdt_wcon.c --- TiMidity++-2.10.2/interface/wrdt_wcon.c Mon Feb 7 07:41:06 2000 +++ TiMidity++-2.10.3/interface/wrdt_wcon.c Sat Mar 10 17:57:58 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/wrdt_x.c TiMidity++-2.10.3/interface/wrdt_x.c --- TiMidity++-2.10.2/interface/wrdt_x.c Mon Feb 7 07:41:03 2000 +++ TiMidity++-2.10.3/interface/wrdt_x.c Sat Mar 10 17:57:54 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/x_mag.c TiMidity++-2.10.3/interface/x_mag.c --- TiMidity++-2.10.2/interface/x_mag.c Mon Feb 7 07:40:59 2000 +++ TiMidity++-2.10.3/interface/x_mag.c Sat Mar 10 17:57:50 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/x_mag.h TiMidity++-2.10.3/interface/x_mag.h --- TiMidity++-2.10.2/interface/x_mag.h Mon Feb 7 07:40:56 2000 +++ TiMidity++-2.10.3/interface/x_mag.h Sat Mar 10 17:57:47 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/x_sherry.c TiMidity++-2.10.3/interface/x_sherry.c --- TiMidity++-2.10.2/interface/x_sherry.c Tue Aug 29 15:20:56 2000 +++ TiMidity++-2.10.3/interface/x_sherry.c Sat Mar 10 17:57:42 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/x_sherry.h TiMidity++-2.10.3/interface/x_sherry.h --- TiMidity++-2.10.2/interface/x_sherry.h Mon Feb 7 07:40:44 2000 +++ TiMidity++-2.10.3/interface/x_sherry.h Sat Mar 10 17:57:38 2001 @@ -1,8 +1,6 @@ -#ifndef ___X_SRY_H_ -#define ___X_SRY_H_ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -19,6 +17,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + +#ifndef ___X_SRY_H_ +#define ___X_SRY_H_ extern void x_sry_wrdt_apply(uint8 *data, int len); extern void CloseSryWindow(void); diff -ruN TiMidity++-2.10.2/interface/x_wrdwindow.c TiMidity++-2.10.3/interface/x_wrdwindow.c --- TiMidity++-2.10.2/interface/x_wrdwindow.c Mon Feb 7 07:40:33 2000 +++ TiMidity++-2.10.3/interface/x_wrdwindow.c Sat Mar 10 17:57:29 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/x_wrdwindow.h TiMidity++-2.10.3/interface/x_wrdwindow.h --- TiMidity++-2.10.2/interface/x_wrdwindow.h Mon Feb 7 07:40:29 2000 +++ TiMidity++-2.10.3/interface/x_wrdwindow.h Sat Mar 10 17:57:23 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/xaw.h TiMidity++-2.10.3/interface/xaw.h --- TiMidity++-2.10.2/interface/xaw.h Mon Feb 7 07:40:25 2000 +++ TiMidity++-2.10.3/interface/xaw.h Sat Mar 10 17:57:15 2001 @@ -1,8 +1,6 @@ -#ifndef _XAW_H_ -#define _XAW_H_ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -22,7 +20,8 @@ xaw.h: written by Yoshishige Arai (ryo2@on.rim.or.jp) 12/8/98 */ - +#ifndef _XAW_H_ +#define _XAW_H_ /* * XAW configurations */ diff -ruN TiMidity++-2.10.2/interface/xaw_c.c TiMidity++-2.10.3/interface/xaw_c.c --- TiMidity++-2.10.2/interface/xaw_c.c Wed Nov 1 13:42:52 2000 +++ TiMidity++-2.10.3/interface/xaw_c.c Sat Mar 10 17:57:01 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/xaw_i.c TiMidity++-2.10.3/interface/xaw_i.c --- TiMidity++-2.10.2/interface/xaw_i.c Mon Feb 7 07:40:17 2000 +++ TiMidity++-2.10.3/interface/xaw_i.c Sat Mar 10 17:56:56 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -1058,18 +1058,27 @@ char *p, *p2; DirPath full; char local_buf[300],tmp[PATH_MAX]; +#ifndef ORIGINAL + int Aflag = 0; /* RAKK/HIOENS: adding All files in directory */ +#endif /*RAKK/HIOENS*/ /* tricky way for both use of action and callback */ if (s != NULL && data == NULL){ if(*(char *)s == 'A') { snprintf(tmp,sizeof(tmp),"%s%c",basepath,'/'); p = tmp; +#ifndef ORIGINAL + Aflag = 1; +#endif /*RAKK/HIOENS*/ } else { p = XawDialogGetValueString(load_d); } if (NULL != (p2 = expandDir(p, &full))) p = p2; if(IsEffectiveFile(p)) { +#ifndef ORIGINAL + if(Aflag == 1) strcat(p,"/"); +#endif /*RAKK/HIOENS*/ snprintf(local_buf,sizeof(local_buf),"X %s\n",p); a_pipe_write(local_buf); } @@ -1671,6 +1680,15 @@ return strcmp (s1, s2); } +#ifndef ORIGINAL +/* RAKK/HIOENS: Save a string on the heap. Addition for 'common.c' ? */ +static char * strsav( char * str ) { + char * tp = safe_malloc( strlen(str)+1 ); + strcpy(tp, str); + return tp; +} +#endif /* RAKK/HIOENS */ + static void setDirList(Widget list, Widget label, XawListReturnStruct *lrs) { URL dirp; struct stat st; @@ -1681,7 +1699,11 @@ canonicalize_path(currdir); if(stat(currdir, &st) == -1) return; if(!S_ISDIR(st.st_mode)) { +#ifdef ORIGINAL XtVaSetValues(load_d,XtNvalue,currdir,NULL); +#else /* RAKK/HIOENS */ + XtVaSetValues(load_d,XtNvalue,strsav(currdir),NULL); +#endif /* ORIGINAL */ return; } @@ -1723,11 +1745,19 @@ strcpy(local_buf, "Can't read directry"); XtVaSetValues(load_info,XtNlabel,local_buf,NULL); +#ifdef ORIGINAL XtVaSetValues(label,XtNlabel,currdir,NULL); +#else /* RAKK/HIOENS */ + XtVaSetValues(label,XtNlabel,strsav(currdir),NULL); +#endif /* RAKK/HIOENS */ strcpy(basepath, currdir); if(currdir[strlen(currdir) - 1] != '/') strcat(currdir, "/"); +#ifdef ORIGINAL XtVaSetValues(load_d,XtNvalue,currdir,NULL); +#else /* RAKK/HIOENS */ + XtVaSetValues(load_d,XtNvalue,strsav(currdir),NULL); +#endif /* RAKK/HIOENS */ } static void drawBar(int ch,int len, int xofs, int column, Pixel color) { diff -ruN TiMidity++-2.10.2/interface/xskin.h TiMidity++-2.10.3/interface/xskin.h --- TiMidity++-2.10.2/interface/xskin.h Mon Feb 7 07:40:01 2000 +++ TiMidity++-2.10.3/interface/xskin.h Sat Mar 10 17:56:37 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/xskin_c.c TiMidity++-2.10.3/interface/xskin_c.c --- TiMidity++-2.10.2/interface/xskin_c.c Mon Feb 7 07:39:56 2000 +++ TiMidity++-2.10.3/interface/xskin_c.c Sat Mar 10 17:56:34 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/xskin_i.c TiMidity++-2.10.3/interface/xskin_i.c --- TiMidity++-2.10.2/interface/xskin_i.c Mon Feb 7 07:39:53 2000 +++ TiMidity++-2.10.3/interface/xskin_i.c Sat Mar 10 17:56:29 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/xskin_loadBMP.c TiMidity++-2.10.3/interface/xskin_loadBMP.c --- TiMidity++-2.10.2/interface/xskin_loadBMP.c Mon Feb 7 07:39:49 2000 +++ TiMidity++-2.10.3/interface/xskin_loadBMP.c Sat Mar 10 17:56:19 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/interface/xskin_spectrum.c TiMidity++-2.10.3/interface/xskin_spectrum.c --- TiMidity++-2.10.2/interface/xskin_spectrum.c Mon Feb 7 07:39:44 2000 +++ TiMidity++-2.10.3/interface/xskin_spectrum.c Sat Mar 10 17:56:25 2001 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/libarc/Makefile.am TiMidity++-2.10.3/libarc/Makefile.am --- TiMidity++-2.10.2/libarc/Makefile.am Wed Jul 5 22:51:48 2000 +++ TiMidity++-2.10.3/libarc/Makefile.am Sat Mar 10 17:52:48 2001 @@ -1,5 +1,5 @@ # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999,2000 Masanao Izumo +# Copyright (C) 1999-2001 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/libarc/Makefile.in TiMidity++-2.10.3/libarc/Makefile.in --- TiMidity++-2.10.2/libarc/Makefile.in Thu Nov 2 17:55:28 2000 +++ TiMidity++-2.10.3/libarc/Makefile.in Sat Mar 10 20:03:01 2001 @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999,2000 Masanao Izumo +# Copyright (C) 1999-2001 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify @@ -241,7 +241,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ diff -ruN TiMidity++-2.10.2/libarc/arc.c TiMidity++-2.10.3/libarc/arc.c --- TiMidity++-2.10.2/libarc/arc.c Mon Feb 7 07:37:44 2000 +++ TiMidity++-2.10.3/libarc/arc.c Sat Mar 10 18:05:58 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/libarc/arc.h TiMidity++-2.10.3/libarc/arc.h --- TiMidity++-2.10.2/libarc/arc.h Mon Feb 7 07:37:42 2000 +++ TiMidity++-2.10.3/libarc/arc.h Sat Mar 10 18:05:52 2001 @@ -1,8 +1,6 @@ -#ifndef ___LIBARC_H_ -#define ___LIBARC_H_ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -19,6 +17,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + +#ifndef ___LIBARC_H_ +#define ___LIBARC_H_ /* Archive library */ diff -ruN TiMidity++-2.10.2/libarc/arc_lzh.c TiMidity++-2.10.3/libarc/arc_lzh.c --- TiMidity++-2.10.2/libarc/arc_lzh.c Mon Mar 20 14:47:50 2000 +++ TiMidity++-2.10.3/libarc/arc_lzh.c Sat Mar 10 18:05:45 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/libarc/arc_mime.c TiMidity++-2.10.3/libarc/arc_mime.c --- TiMidity++-2.10.2/libarc/arc_mime.c Mon Feb 7 07:37:36 2000 +++ TiMidity++-2.10.3/libarc/arc_mime.c Sat Mar 10 18:05:41 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/libarc/arc_tar.c TiMidity++-2.10.3/libarc/arc_tar.c --- TiMidity++-2.10.2/libarc/arc_tar.c Mon Mar 20 14:55:09 2000 +++ TiMidity++-2.10.3/libarc/arc_tar.c Sat Mar 10 18:05:38 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/libarc/arc_zip.c TiMidity++-2.10.3/libarc/arc_zip.c --- TiMidity++-2.10.2/libarc/arc_zip.c Mon Feb 7 07:37:31 2000 +++ TiMidity++-2.10.3/libarc/arc_zip.c Sat Mar 10 18:05:34 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/libarc/deflate.c TiMidity++-2.10.3/libarc/deflate.c --- TiMidity++-2.10.2/libarc/deflate.c Mon Feb 7 07:37:29 2000 +++ TiMidity++-2.10.3/libarc/deflate.c Sat Mar 10 18:05:29 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/libarc/explode.c TiMidity++-2.10.3/libarc/explode.c --- TiMidity++-2.10.2/libarc/explode.c Mon Feb 7 07:37:27 2000 +++ TiMidity++-2.10.3/libarc/explode.c Sat Mar 10 18:05:25 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/libarc/explode.h TiMidity++-2.10.3/libarc/explode.h --- TiMidity++-2.10.2/libarc/explode.h Mon Feb 7 07:37:25 2000 +++ TiMidity++-2.10.3/libarc/explode.h Sat Mar 10 18:05:22 2001 @@ -1,8 +1,6 @@ -#ifndef ___EXPLODE_H_ -#define ___EXPLODE_H_ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -19,6 +17,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + +#ifndef ___EXPLODE_H_ +#define ___EXPLODE_H_ typedef struct _ExplodeHandler *ExplodeHandler; diff -ruN TiMidity++-2.10.2/libarc/inflate.c TiMidity++-2.10.3/libarc/inflate.c --- TiMidity++-2.10.2/libarc/inflate.c Mon Feb 7 07:37:23 2000 +++ TiMidity++-2.10.3/libarc/inflate.c Sat Mar 10 18:05:14 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/libarc/unlzh.c TiMidity++-2.10.3/libarc/unlzh.c --- TiMidity++-2.10.2/libarc/unlzh.c Mon Feb 7 07:37:20 2000 +++ TiMidity++-2.10.3/libarc/unlzh.c Sat Mar 10 18:05:09 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/libarc/unlzh.h TiMidity++-2.10.3/libarc/unlzh.h --- TiMidity++-2.10.2/libarc/unlzh.h Mon Feb 7 07:37:18 2000 +++ TiMidity++-2.10.3/libarc/unlzh.h Sat Mar 10 18:05:06 2001 @@ -1,8 +1,6 @@ -#ifndef ___LZH_H_ -#define ___LZH_H_ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -19,6 +17,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + +#ifndef ___LZH_H_ +#define ___LZH_H_ typedef struct _UNLZHHandler *UNLZHHandler; diff -ruN TiMidity++-2.10.2/libarc/url.c TiMidity++-2.10.3/libarc/url.c --- TiMidity++-2.10.2/libarc/url.c Mon Mar 20 14:59:28 2000 +++ TiMidity++-2.10.3/libarc/url.c Sat Mar 10 18:04:58 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/libarc/url.h TiMidity++-2.10.3/libarc/url.h --- TiMidity++-2.10.2/libarc/url.h Mon Mar 6 13:57:18 2000 +++ TiMidity++-2.10.3/libarc/url.h Sat Mar 10 18:04:55 2001 @@ -1,8 +1,6 @@ -#ifndef ___URL_H_ -#define ___URL_H_ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -19,6 +17,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + +#ifndef ___URL_H_ +#define ___URL_H_ /* This header file from liburl-1.8.3. * You can get full source from: diff -ruN TiMidity++-2.10.2/libarc/url_b64decode.c TiMidity++-2.10.3/libarc/url_b64decode.c --- TiMidity++-2.10.2/libarc/url_b64decode.c Mon Feb 7 07:37:04 2000 +++ TiMidity++-2.10.3/libarc/url_b64decode.c Sat Mar 10 18:04:47 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/libarc/url_buff.c TiMidity++-2.10.3/libarc/url_buff.c --- TiMidity++-2.10.2/libarc/url_buff.c Mon Feb 7 07:37:02 2000 +++ TiMidity++-2.10.3/libarc/url_buff.c Sat Mar 10 18:04:43 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/libarc/url_cache.c TiMidity++-2.10.3/libarc/url_cache.c --- TiMidity++-2.10.2/libarc/url_cache.c Mon Feb 7 07:37:00 2000 +++ TiMidity++-2.10.3/libarc/url_cache.c Sat Mar 10 18:04:40 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/libarc/url_dir.c TiMidity++-2.10.3/libarc/url_dir.c --- TiMidity++-2.10.2/libarc/url_dir.c Mon Feb 7 07:36:58 2000 +++ TiMidity++-2.10.3/libarc/url_dir.c Sat Mar 10 18:04:36 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/libarc/url_file.c TiMidity++-2.10.3/libarc/url_file.c --- TiMidity++-2.10.2/libarc/url_file.c Mon Feb 7 07:36:56 2000 +++ TiMidity++-2.10.3/libarc/url_file.c Sat Mar 10 18:04:32 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/libarc/url_ftp.c TiMidity++-2.10.3/libarc/url_ftp.c --- TiMidity++-2.10.2/libarc/url_ftp.c Mon Mar 6 13:52:26 2000 +++ TiMidity++-2.10.3/libarc/url_ftp.c Sat Mar 10 18:04:29 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/libarc/url_hqxdecode.c TiMidity++-2.10.3/libarc/url_hqxdecode.c --- TiMidity++-2.10.2/libarc/url_hqxdecode.c Mon Feb 7 07:36:53 2000 +++ TiMidity++-2.10.3/libarc/url_hqxdecode.c Sat Mar 10 18:04:25 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/libarc/url_http.c TiMidity++-2.10.3/libarc/url_http.c --- TiMidity++-2.10.2/libarc/url_http.c Mon Feb 7 07:36:52 2000 +++ TiMidity++-2.10.3/libarc/url_http.c Sat Mar 10 18:04:21 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/libarc/url_inflate.c TiMidity++-2.10.3/libarc/url_inflate.c --- TiMidity++-2.10.2/libarc/url_inflate.c Mon Feb 7 07:36:50 2000 +++ TiMidity++-2.10.3/libarc/url_inflate.c Sat Mar 10 18:04:18 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/libarc/url_mem.c TiMidity++-2.10.3/libarc/url_mem.c --- TiMidity++-2.10.2/libarc/url_mem.c Mon Feb 7 07:36:49 2000 +++ TiMidity++-2.10.3/libarc/url_mem.c Sat Mar 10 18:04:14 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/libarc/url_news.c TiMidity++-2.10.3/libarc/url_news.c --- TiMidity++-2.10.2/libarc/url_news.c Mon Feb 7 07:36:47 2000 +++ TiMidity++-2.10.3/libarc/url_news.c Sat Mar 10 18:04:10 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/libarc/url_newsgroup.c TiMidity++-2.10.3/libarc/url_newsgroup.c --- TiMidity++-2.10.2/libarc/url_newsgroup.c Mon Feb 7 07:36:45 2000 +++ TiMidity++-2.10.3/libarc/url_newsgroup.c Sat Mar 10 18:04:07 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/libarc/url_pipe.c TiMidity++-2.10.3/libarc/url_pipe.c --- TiMidity++-2.10.2/libarc/url_pipe.c Mon Feb 7 07:36:43 2000 +++ TiMidity++-2.10.3/libarc/url_pipe.c Sat Mar 10 18:04:03 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/libarc/url_qsdecode.c TiMidity++-2.10.3/libarc/url_qsdecode.c --- TiMidity++-2.10.2/libarc/url_qsdecode.c Mon Feb 7 07:36:40 2000 +++ TiMidity++-2.10.3/libarc/url_qsdecode.c Sat Mar 10 18:03:59 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/libarc/url_uudecode.c TiMidity++-2.10.3/libarc/url_uudecode.c --- TiMidity++-2.10.2/libarc/url_uudecode.c Mon Feb 7 07:35:32 2000 +++ TiMidity++-2.10.3/libarc/url_uudecode.c Sat Mar 10 18:03:51 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/libarc/zip.h TiMidity++-2.10.3/libarc/zip.h --- TiMidity++-2.10.2/libarc/zip.h Mon Feb 7 07:36:22 2000 +++ TiMidity++-2.10.3/libarc/zip.h Sat Mar 10 18:03:55 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/libunimod/Makefile.am TiMidity++-2.10.3/libunimod/Makefile.am --- TiMidity++-2.10.2/libunimod/Makefile.am Tue Oct 17 19:29:08 2000 +++ TiMidity++-2.10.3/libunimod/Makefile.am Sat Mar 10 17:52:29 2001 @@ -1,5 +1,5 @@ # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999,2000 Masanao Izumo +# Copyright (C) 1999-2001 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/libunimod/Makefile.in TiMidity++-2.10.3/libunimod/Makefile.in --- TiMidity++-2.10.2/libunimod/Makefile.in Thu Nov 2 17:55:32 2000 +++ TiMidity++-2.10.3/libunimod/Makefile.in Sat Mar 10 20:03:05 2001 @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999,2000 Masanao Izumo +# Copyright (C) 1999-2001 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify @@ -234,7 +234,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ diff -ruN TiMidity++-2.10.2/libunimod/load_stx.c TiMidity++-2.10.3/libunimod/load_stx.c --- TiMidity++-2.10.2/libunimod/load_stx.c Tue Oct 17 19:43:59 2000 +++ TiMidity++-2.10.3/libunimod/load_stx.c Sat Mar 10 17:40:19 2001 @@ -294,6 +294,7 @@ int t, u, track = 0; int version = 0; SAMPLE *q; + char *tracker; /* try to read module header */ _mm_read_string (mh->songname, 20, modreader); @@ -323,15 +324,19 @@ return 0; } + tracker = "unknown tracker"; for (t = 0; t < STM_NTRACKERS; t++) if (!memcmp (mh->trackername, STM_Signatures[t], 8)) - break; + { + tracker = STM_Version[t]; + break; + } of.modtype = _mm_malloc( - strlen(STM_Version[t]) + + strlen(tracker) + strlen("STM2STX 1.x ()") + 1); - sprintf(of.modtype, "STM2STX 1.x (%s)", STM_Version[t]); + sprintf(of.modtype, "STM2STX 1.x (%s)", tracker); /* set module variables */ of.songname = DupStr (mh->songname, 20, 1); diff -ruN TiMidity++-2.10.2/libunimod/mlutil.c TiMidity++-2.10.3/libunimod/mlutil.c --- TiMidity++-2.10.2/libunimod/mlutil.c Tue Oct 17 19:23:57 2000 +++ TiMidity++-2.10.3/libunimod/mlutil.c Sat Mar 10 17:40:19 2001 @@ -51,7 +51,7 @@ /* tracker identifiers */ CHAR *STM_Signatures[STM_NTRACKERS] = { - "!Scream", + "!Scream!", "BMOD2STM", "WUZAMOD!" }; diff -ruN TiMidity++-2.10.2/timidity/Makefile.am TiMidity++-2.10.3/timidity/Makefile.am --- TiMidity++-2.10.2/timidity/Makefile.am Thu Jul 20 03:51:47 2000 +++ TiMidity++-2.10.3/timidity/Makefile.am Sat Mar 10 17:52:26 2001 @@ -1,5 +1,5 @@ # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999,2000 Masanao Izumo +# Copyright (C) 1999-2001 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/Makefile.in TiMidity++-2.10.3/timidity/Makefile.in --- TiMidity++-2.10.2/timidity/Makefile.in Thu Nov 2 17:55:33 2000 +++ TiMidity++-2.10.3/timidity/Makefile.in Sat Mar 10 20:03:06 2001 @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999,2000 Masanao Izumo +# Copyright (C) 1999-2001 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify @@ -259,7 +259,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ @@ -269,9 +269,6 @@ aiff_a.o: aiff_a.c ../config.h timidity.h ../utils/support.h common.h \ ../libarc/url.h ../utils/mblock.h output.h controls.h instrum.h \ playmidi.h readmidi.h -alsa_a.o: alsa_a.c ../config.h timidity.h ../utils/support.h common.h \ - ../libarc/url.h ../utils/mblock.h output.h controls.h \ - ../utils/timer.h instrum.h playmidi.h miditrace.h aq.o: aq.c ../config.h timidity.h ../utils/support.h common.h \ ../libarc/url.h ../utils/mblock.h output.h aq.h \ ../utils/timer.h controls.h miditrace.h instrum.h playmidi.h @@ -285,8 +282,6 @@ ../libarc/arc.h ../utils/nkflib.h wrd.h ../utils/strtab.h controls.o: controls.c ../config.h ../interface.h timidity.h \ ../utils/support.h controls.h -dl_dlopen.o: dl_dlopen.c ../config.h timidity.h ../utils/support.h \ - dlutils.h effect.o: effect.c ../config.h timidity.h ../utils/support.h instrum.h \ playmidi.h output.h reverb.h esd_a.o: esd_a.c ../config.h timidity.h ../utils/support.h common.h \ @@ -316,11 +311,6 @@ common.h ../libarc/url.h ../utils/mblock.h instrum.h playmidi.h \ readmidi.h tables.h mod.h output.h controls.h \ ../libunimod/unimod.h mod2midi.h filter.h -nas_a.o: nas_a.c ../config.h timidity.h ../utils/support.h common.h \ - ../libarc/url.h ../utils/mblock.h output.h controls.h \ - ../utils/timer.h instrum.h playmidi.h miditrace.h -ogg_a.o: ogg_a.c ../config.h timidity.h ../utils/support.h output.h \ - controls.h oss_a.o: oss_a.c ../config.h timidity.h ../utils/support.h common.h \ ../libarc/url.h ../utils/mblock.h output.h controls.h \ ../utils/timer.h instrum.h playmidi.h miditrace.h @@ -329,8 +319,7 @@ playmidi.o: playmidi.c ../config.h timidity.h ../utils/support.h \ common.h ../libarc/url.h ../utils/mblock.h instrum.h playmidi.h \ readmidi.h output.h mix.h controls.h miditrace.h recache.h \ - ../libarc/arc.h reverb.h wrd.h aq.h ../interface/soundspec.h \ - tables.h + ../libarc/arc.h reverb.h wrd.h aq.h tables.h raw_a.o: raw_a.c ../config.h timidity.h ../utils/support.h common.h \ ../libarc/url.h ../utils/mblock.h output.h controls.h instrum.h \ playmidi.h readmidi.h @@ -365,12 +354,9 @@ timidity.o: timidity.c ../config.h ../interface.h timidity.h \ ../utils/support.h common.h ../libarc/url.h ../utils/mblock.h \ instrum.h playmidi.h readmidi.h output.h controls.h tables.h \ - miditrace.h reverb.h ../interface/soundspec.h recache.h \ - ../libarc/arc.h ../utils/strtab.h wrd.h mid.defs aq.h mix.h \ - ../libunimod/unimod.h dlutils.h -vorbis_a.o: vorbis_a.c ../config.h timidity.h ../utils/support.h \ - common.h ../libarc/url.h ../utils/mblock.h output.h controls.h \ - instrum.h playmidi.h readmidi.h + miditrace.h reverb.h recache.h ../libarc/arc.h \ + ../utils/strtab.h wrd.h mid.defs aq.h mix.h \ + ../libunimod/unimod.h wave_a.o: wave_a.c ../config.h timidity.h ../utils/support.h common.h \ ../libarc/url.h ../utils/mblock.h output.h controls.h instrum.h \ playmidi.h readmidi.h diff -ruN TiMidity++-2.10.2/timidity/aenc.h TiMidity++-2.10.3/timidity/aenc.h --- TiMidity++-2.10.2/timidity/aenc.h Mon Feb 7 08:02:23 2000 +++ TiMidity++-2.10.3/timidity/aenc.h Sat Mar 10 18:14:22 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/aiff_a.c TiMidity++-2.10.3/timidity/aiff_a.c --- TiMidity++-2.10.2/timidity/aiff_a.c Sun Oct 22 17:42:12 2000 +++ TiMidity++-2.10.3/timidity/aiff_a.c Sat Mar 10 18:14:19 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/alsa_a.c TiMidity++-2.10.3/timidity/alsa_a.c --- TiMidity++-2.10.2/timidity/alsa_a.c Sat Jul 15 00:36:15 2000 +++ TiMidity++-2.10.3/timidity/alsa_a.c Sat Mar 10 18:14:13 2001 @@ -1,6 +1,6 @@ /* -*- c-file-style: "gnu" -*- TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen ALSA 0.[56] support by Katsuhiro Ueno diff -ruN TiMidity++-2.10.2/timidity/aq.c TiMidity++-2.10.3/timidity/aq.c --- TiMidity++-2.10.2/timidity/aq.c Wed Nov 1 13:49:28 2000 +++ TiMidity++-2.10.3/timidity/aq.c Sat Mar 10 18:14:09 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/aq.h TiMidity++-2.10.3/timidity/aq.h --- TiMidity++-2.10.2/timidity/aq.h Mon Feb 7 08:01:30 2000 +++ TiMidity++-2.10.3/timidity/aq.h Sat Mar 10 18:14:05 2001 @@ -1,8 +1,6 @@ -#ifndef ___AQ_H_ -#define ___AQ_H_ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -23,6 +21,8 @@ Written by Masanao Izumo */ +#ifndef ___AQ_H_ +#define ___AQ_H_ /* interfaces */ diff -ruN TiMidity++-2.10.2/timidity/au_a.c TiMidity++-2.10.3/timidity/au_a.c --- TiMidity++-2.10.2/timidity/au_a.c Mon Jul 24 17:11:50 2000 +++ TiMidity++-2.10.3/timidity/au_a.c Sat Mar 10 18:13:58 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/audio_cnv.c TiMidity++-2.10.3/timidity/audio_cnv.c --- TiMidity++-2.10.2/timidity/audio_cnv.c Mon Feb 7 08:01:22 2000 +++ TiMidity++-2.10.3/timidity/audio_cnv.c Sat Mar 10 18:13:53 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/audio_cnv.h TiMidity++-2.10.3/timidity/audio_cnv.h --- TiMidity++-2.10.2/timidity/audio_cnv.h Mon Feb 7 08:01:18 2000 +++ TiMidity++-2.10.3/timidity/audio_cnv.h Sat Mar 10 18:13:50 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/audriv.h TiMidity++-2.10.3/timidity/audriv.h --- TiMidity++-2.10.2/timidity/audriv.h Mon Feb 7 08:01:14 2000 +++ TiMidity++-2.10.3/timidity/audriv.h Sat Mar 10 18:13:46 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/audriv_a.c TiMidity++-2.10.3/timidity/audriv_a.c --- TiMidity++-2.10.2/timidity/audriv_a.c Mon Feb 7 08:01:10 2000 +++ TiMidity++-2.10.3/timidity/audriv_a.c Sat Mar 10 18:13:43 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/audriv_al.c TiMidity++-2.10.3/timidity/audriv_al.c --- TiMidity++-2.10.2/timidity/audriv_al.c Mon Feb 7 08:01:07 2000 +++ TiMidity++-2.10.3/timidity/audriv_al.c Sat Mar 10 18:13:39 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/audriv_mme.c TiMidity++-2.10.3/timidity/audriv_mme.c --- TiMidity++-2.10.2/timidity/audriv_mme.c Mon Feb 7 08:01:04 2000 +++ TiMidity++-2.10.3/timidity/audriv_mme.c Sat Mar 10 18:13:36 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/audriv_none.c TiMidity++-2.10.3/timidity/audriv_none.c --- TiMidity++-2.10.2/timidity/audriv_none.c Mon Feb 7 08:01:00 2000 +++ TiMidity++-2.10.3/timidity/audriv_none.c Sat Mar 10 18:13:33 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/bsd20_a.c TiMidity++-2.10.3/timidity/bsd20_a.c --- TiMidity++-2.10.2/timidity/bsd20_a.c Mon Feb 7 08:00:57 2000 +++ TiMidity++-2.10.3/timidity/bsd20_a.c Sat Mar 10 18:13:29 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/common.c TiMidity++-2.10.3/timidity/common.c --- TiMidity++-2.10.2/timidity/common.c Tue Aug 8 11:12:47 2000 +++ TiMidity++-2.10.3/timidity/common.c Sat Mar 10 18:13:26 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -459,10 +459,19 @@ "Strange, I feel like allocating %d bytes. " "This must be a bug.", count); } +#ifndef ORIGINAL + else if(count == 0) { + /* To be safe: don't ever try to allocate 0 bytes + * Different malloc's behave differently. + */ + return safe_malloc(1); + } +#endif /* Not ORIGINAL (RAKK/HIOENS) */ else if((p = (void *)malloc(count)) != NULL) return p; else { +#ifdef ORIGINAL if(count == 0) { /* Some malloc routine return NULL if count is zero, such as * malloc routine from libmalloc.a of Solaris. @@ -470,6 +479,7 @@ */ return safe_malloc(1); } +#endif /* ORIGINAL */ errflag = 1; ctl->cmsg(CMSG_FATAL, VERB_NORMAL, @@ -489,6 +499,14 @@ if(errflag) safe_exit(10); +#ifndef ORIGINAL + if(count == 0) { + /* To be safe: don't ever try to allocate 0 bytes + * Different malloc's behave differently. + */ + return safe_large_malloc(1); + } else +#endif /* Not ORIGINAL (RAKK/HIOENS) */ if((p = (void *)malloc(count)) != NULL) return p; errflag = 1; @@ -515,12 +533,23 @@ "Strange, I feel like allocating %d bytes. " "This must be a bug.", count); } +#ifndef ORIGINAL + else if(count == 0) { + /* To be safe: don't ever try to allocate 0 bytes + * Different malloc's behave differently. + */ + return safe_realloc(ptr, 1); + } +#endif /* ORIGINAL */ else if((p = (void *)realloc(ptr, count)) != NULL) return p; else { +#ifdef ORIGINAL if(count == 0) return safe_malloc(1); + /* RAKK/HIOENS: Hmm, should that have been safe_realloc(ptr,1) ? */ +#endif /* ORIGINAL */ errflag = 1; ctl->cmsg(CMSG_FATAL, VERB_NORMAL, "Sorry. Couldn't realloc %d bytes.", count); diff -ruN TiMidity++-2.10.2/timidity/common.h TiMidity++-2.10.3/timidity/common.h --- TiMidity++-2.10.2/timidity/common.h Mon Feb 7 08:00:50 2000 +++ TiMidity++-2.10.3/timidity/common.h Sat Mar 10 18:13:22 2001 @@ -1,8 +1,6 @@ -#ifndef ___COMMON_H_ -#define ___COMMON_H_ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -22,6 +20,9 @@ common.h */ + +#ifndef ___COMMON_H_ +#define ___COMMON_H_ #include "url.h" #include "mblock.h" diff -ruN TiMidity++-2.10.2/timidity/controls.c TiMidity++-2.10.3/timidity/controls.c --- TiMidity++-2.10.2/timidity/controls.c Fri Jul 14 19:48:39 2000 +++ TiMidity++-2.10.3/timidity/controls.c Sat Mar 10 18:13:15 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/controls.h TiMidity++-2.10.3/timidity/controls.h --- TiMidity++-2.10.2/timidity/controls.h Mon Mar 20 14:32:07 2000 +++ TiMidity++-2.10.3/timidity/controls.h Sat Mar 10 18:13:10 2001 @@ -1,8 +1,6 @@ -#ifndef ___CONTROLS_H_ -#define ___CONTROLS_H_ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -21,6 +19,9 @@ controls.h */ + +#ifndef ___CONTROLS_H_ +#define ___CONTROLS_H_ #define RC_IS_SKIP_FILE(rc) ((rc) == RC_QUIT || (rc) == RC_LOAD_FILE || \ (rc) == RC_NEXT || (rc) == RC_REALLY_PREVIOUS || \ diff -ruN TiMidity++-2.10.2/timidity/dl_dld.c TiMidity++-2.10.3/timidity/dl_dld.c --- TiMidity++-2.10.2/timidity/dl_dld.c Mon Feb 7 08:00:35 2000 +++ TiMidity++-2.10.3/timidity/dl_dld.c Sat Mar 10 18:13:03 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/dl_dlopen.c TiMidity++-2.10.3/timidity/dl_dlopen.c --- TiMidity++-2.10.2/timidity/dl_dlopen.c Mon Feb 7 08:00:29 2000 +++ TiMidity++-2.10.3/timidity/dl_dlopen.c Sat Mar 10 18:12:59 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/dl_hpux.c TiMidity++-2.10.3/timidity/dl_hpux.c --- TiMidity++-2.10.2/timidity/dl_hpux.c Mon Feb 7 08:00:18 2000 +++ TiMidity++-2.10.3/timidity/dl_hpux.c Sat Mar 10 18:12:55 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/dl_w32.c TiMidity++-2.10.3/timidity/dl_w32.c --- TiMidity++-2.10.2/timidity/dl_w32.c Mon Feb 7 08:00:14 2000 +++ TiMidity++-2.10.3/timidity/dl_w32.c Sat Mar 10 18:12:52 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/dlutils.h TiMidity++-2.10.3/timidity/dlutils.h --- TiMidity++-2.10.2/timidity/dlutils.h Mon Feb 7 08:00:11 2000 +++ TiMidity++-2.10.3/timidity/dlutils.h Sat Mar 10 18:12:48 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/effect.c TiMidity++-2.10.3/timidity/effect.c --- TiMidity++-2.10.2/timidity/effect.c Wed Aug 30 12:15:19 2000 +++ TiMidity++-2.10.3/timidity/effect.c Sat Mar 10 18:12:45 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/esd_a.c TiMidity++-2.10.3/timidity/esd_a.c --- TiMidity++-2.10.2/timidity/esd_a.c Sat Jul 15 02:53:30 2000 +++ TiMidity++-2.10.3/timidity/esd_a.c Sat Mar 10 18:12:42 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/filter.c TiMidity++-2.10.3/timidity/filter.c --- TiMidity++-2.10.2/timidity/filter.c Mon Feb 7 08:00:00 2000 +++ TiMidity++-2.10.3/timidity/filter.c Sat Mar 10 18:12:38 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/filter.h TiMidity++-2.10.3/timidity/filter.h --- TiMidity++-2.10.2/timidity/filter.h Mon Feb 7 07:59:57 2000 +++ TiMidity++-2.10.3/timidity/filter.h Sat Mar 10 18:12:34 2001 @@ -1,8 +1,6 @@ -#ifndef ___FILTER_H_ -#define ___FILTER_H_ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -25,6 +23,9 @@ rates as low as 8Khz. */ + +#ifndef ___FILTER_H_ +#define ___FILTER_H_ /* Order of the FIR filter = 20 should be enough ! */ #define ORDER 20 diff -ruN TiMidity++-2.10.2/timidity/hpux_a.c TiMidity++-2.10.3/timidity/hpux_a.c --- TiMidity++-2.10.2/timidity/hpux_a.c Mon Feb 7 07:59:53 2000 +++ TiMidity++-2.10.3/timidity/hpux_a.c Sat Mar 10 18:12:27 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/hpux_d_a.c TiMidity++-2.10.3/timidity/hpux_d_a.c --- TiMidity++-2.10.2/timidity/hpux_d_a.c Mon Feb 7 07:59:49 2000 +++ TiMidity++-2.10.3/timidity/hpux_d_a.c Sat Mar 10 18:12:23 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/instrum.c TiMidity++-2.10.3/timidity/instrum.c --- TiMidity++-2.10.2/timidity/instrum.c Wed May 17 13:17:32 2000 +++ TiMidity++-2.10.3/timidity/instrum.c Sat Mar 10 18:12:20 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/instrum.h TiMidity++-2.10.3/timidity/instrum.h --- TiMidity++-2.10.2/timidity/instrum.h Sat Feb 19 19:52:36 2000 +++ TiMidity++-2.10.3/timidity/instrum.h Sat Mar 10 18:12:16 2001 @@ -1,8 +1,6 @@ -#ifndef ___INSTRUM_H_ -#define ___INSTRUM_H_ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -22,6 +20,9 @@ instrum.h */ + +#ifndef ___INSTRUM_H_ +#define ___INSTRUM_H_ typedef struct _Sample { int32 diff -ruN TiMidity++-2.10.2/timidity/list_a.c TiMidity++-2.10.3/timidity/list_a.c --- TiMidity++-2.10.2/timidity/list_a.c Mon Feb 7 07:59:33 2000 +++ TiMidity++-2.10.3/timidity/list_a.c Sat Mar 10 18:12:09 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/loadtab.c TiMidity++-2.10.3/timidity/loadtab.c --- TiMidity++-2.10.2/timidity/loadtab.c Mon Feb 7 07:59:12 2000 +++ TiMidity++-2.10.3/timidity/loadtab.c Sat Mar 10 18:12:06 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/mac_a.c TiMidity++-2.10.3/timidity/mac_a.c --- TiMidity++-2.10.2/timidity/mac_a.c Fri Jul 14 19:51:01 2000 +++ TiMidity++-2.10.3/timidity/mac_a.c Sat Mar 10 18:12:02 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/mac_com.h TiMidity++-2.10.3/timidity/mac_com.h --- TiMidity++-2.10.2/timidity/mac_com.h Mon Feb 7 08:02:54 2000 +++ TiMidity++-2.10.3/timidity/mac_com.h Sat Mar 10 18:11:58 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/mac_dlog.c TiMidity++-2.10.3/timidity/mac_dlog.c --- TiMidity++-2.10.2/timidity/mac_dlog.c Mon Feb 7 08:03:38 2000 +++ TiMidity++-2.10.3/timidity/mac_dlog.c Sat Mar 10 18:11:55 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/mac_main.c TiMidity++-2.10.3/timidity/mac_main.c --- TiMidity++-2.10.2/timidity/mac_main.c Mon Feb 7 08:03:32 2000 +++ TiMidity++-2.10.3/timidity/mac_main.c Sat Mar 10 18:11:51 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/mac_main.h TiMidity++-2.10.3/timidity/mac_main.h --- TiMidity++-2.10.2/timidity/mac_main.h Mon Feb 7 08:02:50 2000 +++ TiMidity++-2.10.3/timidity/mac_main.h Sat Mar 10 18:11:48 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/mac_qt_a.c TiMidity++-2.10.3/timidity/mac_qt_a.c --- TiMidity++-2.10.2/timidity/mac_qt_a.c Mon Feb 7 08:03:11 2000 +++ TiMidity++-2.10.3/timidity/mac_qt_a.c Sat Mar 10 18:11:44 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/mac_soundspec.c TiMidity++-2.10.3/timidity/mac_soundspec.c --- TiMidity++-2.10.2/timidity/mac_soundspec.c Mon Feb 7 08:03:21 2000 +++ TiMidity++-2.10.3/timidity/mac_soundspec.c Sat Mar 10 18:11:40 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/mfnode.c TiMidity++-2.10.3/timidity/mfnode.c --- TiMidity++-2.10.2/timidity/mfnode.c Mon Feb 7 07:58:44 2000 +++ TiMidity++-2.10.3/timidity/mfnode.c Sat Mar 10 18:11:37 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/mfnode.h TiMidity++-2.10.3/timidity/mfnode.h --- TiMidity++-2.10.2/timidity/mfnode.h Mon Feb 7 07:58:40 2000 +++ TiMidity++-2.10.3/timidity/mfnode.h Sat Mar 10 18:11:33 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/mid-j.defs TiMidity++-2.10.3/timidity/mid-j.defs --- TiMidity++-2.10.2/timidity/mid-j.defs Mon Nov 30 17:40:26 1998 +++ TiMidity++-2.10.3/timidity/mid-j.defs Sat Mar 10 18:11:29 2001 @@ -1,8 +1,7 @@ /* -*- c -*- */ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/mid.defs TiMidity++-2.10.3/timidity/mid.defs --- TiMidity++-2.10.2/timidity/mid.defs Mon Nov 30 17:40:50 1998 +++ TiMidity++-2.10.3/timidity/mid.defs Sat Mar 10 18:11:17 2001 @@ -1,8 +1,7 @@ /* -*- c -*- */ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/miditrace.c TiMidity++-2.10.3/timidity/miditrace.c --- TiMidity++-2.10.2/timidity/miditrace.c Mon Jul 24 13:24:48 2000 +++ TiMidity++-2.10.3/timidity/miditrace.c Sat Mar 10 18:11:11 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/miditrace.h TiMidity++-2.10.3/timidity/miditrace.h --- TiMidity++-2.10.2/timidity/miditrace.h Mon Feb 7 07:58:32 2000 +++ TiMidity++-2.10.3/timidity/miditrace.h Sat Mar 10 18:11:07 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/mix.c TiMidity++-2.10.3/timidity/mix.c --- TiMidity++-2.10.2/timidity/mix.c Wed Aug 30 13:22:04 2000 +++ TiMidity++-2.10.3/timidity/mix.c Sat Mar 10 18:11:03 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen Suddenly, you realize that this program is free software; you get diff -ruN TiMidity++-2.10.2/timidity/mix.h TiMidity++-2.10.3/timidity/mix.h --- TiMidity++-2.10.2/timidity/mix.h Mon Feb 7 07:58:24 2000 +++ TiMidity++-2.10.3/timidity/mix.h Sat Mar 10 18:11:00 2001 @@ -1,8 +1,6 @@ -#ifndef ___MIX_H_ -#define ___MIX_H_ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen In case you haven't heard, this program is free software; @@ -23,6 +21,9 @@ mix.h */ + +#ifndef ___MIX_H_ +#define ___MIX_H_ extern void mix_voice(int32 *buf, int v, int32 c); extern int recompute_envelope(int v); diff -ruN TiMidity++-2.10.2/timidity/mod.c TiMidity++-2.10.3/timidity/mod.c --- TiMidity++-2.10.2/timidity/mod.c Sun Oct 22 17:43:53 2000 +++ TiMidity++-2.10.3/timidity/mod.c Sat Mar 10 18:10:52 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen Most of this file is taken from the MikMod sound library, which is diff -ruN TiMidity++-2.10.2/timidity/mod.h TiMidity++-2.10.3/timidity/mod.h --- TiMidity++-2.10.2/timidity/mod.h Mon Mar 20 15:47:33 2000 +++ TiMidity++-2.10.3/timidity/mod.h Sat Mar 10 18:10:48 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/mod2midi.c TiMidity++-2.10.3/timidity/mod2midi.c --- TiMidity++-2.10.2/timidity/mod2midi.c Sun Oct 22 17:41:07 2000 +++ TiMidity++-2.10.3/timidity/mod2midi.c Sat Mar 10 18:10:44 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/mod2midi.h TiMidity++-2.10.3/timidity/mod2midi.h --- TiMidity++-2.10.2/timidity/mod2midi.h Sun Oct 22 17:10:12 2000 +++ TiMidity++-2.10.3/timidity/mod2midi.h Sat Mar 10 18:10:41 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/nas_a.c TiMidity++-2.10.3/timidity/nas_a.c --- TiMidity++-2.10.2/timidity/nas_a.c Mon Feb 7 07:58:02 2000 +++ TiMidity++-2.10.3/timidity/nas_a.c Sat Mar 10 18:10:37 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen nas_a.c - Copyright (C) 1999 Michael Haardt diff -ruN TiMidity++-2.10.2/timidity/oss_a.c TiMidity++-2.10.3/timidity/oss_a.c --- TiMidity++-2.10.2/timidity/oss_a.c Mon Jul 24 16:43:27 2000 +++ TiMidity++-2.10.3/timidity/oss_a.c Sat Mar 10 18:10:33 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/output.c TiMidity++-2.10.3/timidity/output.c --- TiMidity++-2.10.2/timidity/output.c Mon Jul 24 16:58:58 2000 +++ TiMidity++-2.10.3/timidity/output.c Sat Mar 10 18:10:30 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/output.h TiMidity++-2.10.3/timidity/output.h --- TiMidity++-2.10.2/timidity/output.h Mon Jul 24 09:59:26 2000 +++ TiMidity++-2.10.3/timidity/output.h Sat Mar 10 18:10:26 2001 @@ -1,8 +1,6 @@ -#ifndef ___OUTPUT_H_ -#define ___OUTPUT_H_ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -22,6 +20,9 @@ output.h */ + +#ifndef ___OUTPUT_H_ +#define ___OUTPUT_H_ /* Data format encoding bits */ /* {PE_16BIT,PE_ULAW,PE_ALAW} is alternative flag */ diff -ruN TiMidity++-2.10.2/timidity/playmidi.c TiMidity++-2.10.3/timidity/playmidi.c --- TiMidity++-2.10.2/timidity/playmidi.c Mon Jul 24 16:12:53 2000 +++ TiMidity++-2.10.3/timidity/playmidi.c Sat Mar 10 18:10:19 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/playmidi.h TiMidity++-2.10.3/timidity/playmidi.h --- TiMidity++-2.10.2/timidity/playmidi.h Fri Jul 14 19:51:12 2000 +++ TiMidity++-2.10.3/timidity/playmidi.h Sat Mar 10 18:10:15 2001 @@ -1,8 +1,6 @@ -#ifndef ___PLAYMIDI_H_ -#define ___PLAYMIDI_H_ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -22,6 +20,9 @@ playmidi.h */ + +#ifndef ___PLAYMIDI_H_ +#define ___PLAYMIDI_H_ typedef struct { int32 time; diff -ruN TiMidity++-2.10.2/timidity/raw_a.c TiMidity++-2.10.3/timidity/raw_a.c --- TiMidity++-2.10.2/timidity/raw_a.c Mon Jul 24 15:56:10 2000 +++ TiMidity++-2.10.3/timidity/raw_a.c Sat Mar 10 18:10:07 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/rcp.c TiMidity++-2.10.3/timidity/rcp.c --- TiMidity++-2.10.2/timidity/rcp.c Mon Feb 7 07:57:13 2000 +++ TiMidity++-2.10.3/timidity/rcp.c Sat Mar 10 18:10:04 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/readmidi.c TiMidity++-2.10.3/timidity/readmidi.c --- TiMidity++-2.10.2/timidity/readmidi.c Tue Jul 4 16:53:35 2000 +++ TiMidity++-2.10.3/timidity/readmidi.c Sat Mar 10 18:10:00 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -542,6 +542,8 @@ current_file_info->mid = val[0]; /* XG Multi Part Data parameter change */ + /* There are two ways to do this, neither of which match the XG spec... */ + /* All variables given in a single big block */ if(len >= 10 && val[0] == 0x43 && /* Yamaha ID */ val[2] == 0x4C && /* XG Model ID */ @@ -606,6 +608,61 @@ } num_events++; } + } + /* Or you can specify them one SYSEX event at a time... */ + else if(len == 8 && + val[0] == 0x43 && /* Yamaha ID */ + val[2] == 0x4C && /* XG Model ID */ + val[3] == 0x08) /* Multi Part Data parameter change */ + { + uint8 p; /* Channel part number [0..15] */ + int ent; /* Entry # of sub-event */ + + p = val[4]; + ent = val[5]; + + switch(ent) { + + case 0x01: /* bank select MSB */ + MIDIEVENT(at, ME_TONE_BANK_MSB, p, val[6], 0); + break; + + case 0x02: /* bank select LSB */ + MIDIEVENT(at, ME_TONE_BANK_LSB, p, val[6], 0); + break; + + case 0x03: /* program number */ + MIDIEVENT(at, ME_PROGRAM, p, val[6], 0); + break; + + case 0x08: /* note shift ? */ + MIDIEVENT(at, ME_KEYSHIFT, p, val[6], 0); + + case 0x0B: /* volume */ + MIDIEVENT(at, ME_MAINVOLUME, p, val[6], 0); + break; + + case 0x0E: /* pan */ + if(val[6] == 0) { + MIDIEVENT(at, ME_RANDOM_PAN, p, 0, 0); + } + else { + MIDIEVENT(at, ME_PAN, p, val[6], 0); + } + break; + + case 0x12: /* chorus send */ + MIDIEVENT(at, ME_CHORUS_EFFECT, p, val[6], 0); + break; + + case 0x13: /* reverb send */ + MIDIEVENT(at, ME_REVERB_EFFECT, p, val[6], 0); + break; + + default: + break; + } + num_events++; } /* GS bank+program change */ diff -ruN TiMidity++-2.10.2/timidity/readmidi.h TiMidity++-2.10.3/timidity/readmidi.h --- TiMidity++-2.10.2/timidity/readmidi.h Mon Mar 20 15:48:09 2000 +++ TiMidity++-2.10.3/timidity/readmidi.h Sat Mar 10 18:09:57 2001 @@ -1,8 +1,6 @@ -#ifndef ___READMIDI_H_ -#define ___READMIDI_H_ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -22,6 +20,9 @@ readmidi.h */ + +#ifndef ___READMIDI_H_ +#define ___READMIDI_H_ /* MIDI file types */ #define IS_ERROR_FILE -1 /* Error file */ diff -ruN TiMidity++-2.10.2/timidity/recache.c TiMidity++-2.10.3/timidity/recache.c --- TiMidity++-2.10.2/timidity/recache.c Wed Apr 26 15:08:05 2000 +++ TiMidity++-2.10.3/timidity/recache.c Sat Mar 10 18:09:49 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/recache.h TiMidity++-2.10.3/timidity/recache.h --- TiMidity++-2.10.2/timidity/recache.h Mon Feb 7 07:56:58 2000 +++ TiMidity++-2.10.3/timidity/recache.h Sat Mar 10 18:09:46 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/resample.c TiMidity++-2.10.3/timidity/resample.c --- TiMidity++-2.10.2/timidity/resample.c Wed May 17 13:15:30 2000 +++ TiMidity++-2.10.3/timidity/resample.c Sat Mar 10 18:09:42 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/resample.h TiMidity++-2.10.3/timidity/resample.h --- TiMidity++-2.10.2/timidity/resample.h Mon Feb 7 07:56:50 2000 +++ TiMidity++-2.10.3/timidity/resample.h Sat Mar 10 18:09:39 2001 @@ -1,8 +1,6 @@ -#ifndef ___RESAMPLE_H_ -#define ___RESAMPLE_H_ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -21,6 +19,9 @@ resample.h */ + +#ifndef ___RESAMPLE_H_ +#define ___RESAMPLE_H_ extern sample_t *resample_voice(int v, int32 *countptr); extern void pre_resample(Sample *sp); diff -ruN TiMidity++-2.10.2/timidity/reverb.c TiMidity++-2.10.3/timidity/reverb.c --- TiMidity++-2.10.2/timidity/reverb.c Mon Feb 7 07:56:45 2000 +++ TiMidity++-2.10.3/timidity/reverb.c Sat Mar 10 18:09:29 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/reverb.h TiMidity++-2.10.3/timidity/reverb.h --- TiMidity++-2.10.2/timidity/reverb.h Mon Feb 7 07:56:42 2000 +++ TiMidity++-2.10.3/timidity/reverb.h Sat Mar 10 18:09:25 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/sbkconv.c TiMidity++-2.10.3/timidity/sbkconv.c --- TiMidity++-2.10.2/timidity/sbkconv.c Mon Feb 7 07:56:38 2000 +++ TiMidity++-2.10.3/timidity/sbkconv.c Sat Mar 10 18:09:21 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen */ diff -ruN TiMidity++-2.10.2/timidity/sffile.c TiMidity++-2.10.3/timidity/sffile.c --- TiMidity++-2.10.2/timidity/sffile.c Mon Feb 7 07:56:34 2000 +++ TiMidity++-2.10.3/timidity/sffile.c Sat Mar 10 18:09:18 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen */ diff -ruN TiMidity++-2.10.2/timidity/sffile.h TiMidity++-2.10.3/timidity/sffile.h --- TiMidity++-2.10.2/timidity/sffile.h Mon Feb 7 07:56:31 2000 +++ TiMidity++-2.10.3/timidity/sffile.h Sat Mar 10 18:09:14 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen */ diff -ruN TiMidity++-2.10.2/timidity/sfitem.c TiMidity++-2.10.3/timidity/sfitem.c --- TiMidity++-2.10.2/timidity/sfitem.c Mon Feb 7 07:56:27 2000 +++ TiMidity++-2.10.3/timidity/sfitem.c Sat Mar 10 18:09:11 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen */ diff -ruN TiMidity++-2.10.2/timidity/sfitem.h TiMidity++-2.10.3/timidity/sfitem.h --- TiMidity++-2.10.2/timidity/sfitem.h Mon Feb 7 07:56:23 2000 +++ TiMidity++-2.10.3/timidity/sfitem.h Sat Mar 10 18:09:07 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen */ diff -ruN TiMidity++-2.10.2/timidity/sflayer.h TiMidity++-2.10.3/timidity/sflayer.h --- TiMidity++-2.10.2/timidity/sflayer.h Mon Feb 7 07:56:19 2000 +++ TiMidity++-2.10.3/timidity/sflayer.h Sat Mar 10 18:09:03 2001 @@ -2,7 +2,7 @@ #define ___SFLAYER_H_ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen */ diff -ruN TiMidity++-2.10.2/timidity/smfconv.c TiMidity++-2.10.3/timidity/smfconv.c --- TiMidity++-2.10.2/timidity/smfconv.c Mon Feb 7 07:56:14 2000 +++ TiMidity++-2.10.3/timidity/smfconv.c Sat Mar 10 18:08:58 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/smfconv.h TiMidity++-2.10.3/timidity/smfconv.h --- TiMidity++-2.10.2/timidity/smfconv.h Mon Feb 7 07:56:11 2000 +++ TiMidity++-2.10.3/timidity/smfconv.h Sat Mar 10 18:08:54 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/sndfont.c TiMidity++-2.10.3/timidity/sndfont.c --- TiMidity++-2.10.2/timidity/sndfont.c Tue Jul 4 16:54:42 2000 +++ TiMidity++-2.10.3/timidity/sndfont.c Sat Mar 10 18:08:41 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen */ diff -ruN TiMidity++-2.10.2/timidity/sun_a.c TiMidity++-2.10.3/timidity/sun_a.c --- TiMidity++-2.10.2/timidity/sun_a.c Wed Nov 1 13:20:33 2000 +++ TiMidity++-2.10.3/timidity/sun_a.c Sat Mar 10 18:08:37 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/tables.c TiMidity++-2.10.3/timidity/tables.c --- TiMidity++-2.10.2/timidity/tables.c Mon Feb 7 07:55:56 2000 +++ TiMidity++-2.10.3/timidity/tables.c Sat Mar 10 18:08:34 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/tables.h TiMidity++-2.10.3/timidity/tables.h --- TiMidity++-2.10.2/timidity/tables.h Mon Feb 7 07:55:52 2000 +++ TiMidity++-2.10.3/timidity/tables.h Sat Mar 10 18:08:29 2001 @@ -1,8 +1,6 @@ -#ifndef ___TABLES_H_ -#define ___TABLES_H_ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -21,6 +19,9 @@ tables.h */ + +#ifndef ___TABLES_H_ +#define ___TABLES_H_ #ifdef LOOKUP_SINE extern FLOAT_T lookup_sine(int x); diff -ruN TiMidity++-2.10.2/timidity/timidity.c TiMidity++-2.10.3/timidity/timidity.c --- TiMidity++-2.10.2/timidity/timidity.c Wed Aug 30 13:58:01 2000 +++ TiMidity++-2.10.3/timidity/timidity.c Sat Mar 10 20:00:32 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -308,7 +308,7 @@ static char *help_args[3]; FILE *fp; static char *help_list[] = { -" TiMidity++ version %s (C) 1999 Masanao Izumo ", +" TiMidity++ version %s (C) 1999-2001 Masanao Izumo ", " The original version (C) 1995 Tuukka Toivonen ", " TiMidity is free software and comes with ABSOLUTELY NO WARRANTY.", "", @@ -564,7 +564,7 @@ printf( NLS " TiMidity++ version %s -- MIDI to WAVE converter and player" NLS -" Copyright (C) 1999 Masanao Izumo " NLS +" Copyright (C) 1999-2001 Masanao Izumo " NLS " Copyright (C) 1995 Tuukka Toivonen " NLS NLS #ifdef __W32__ diff -ruN TiMidity++-2.10.2/timidity/timidity.h TiMidity++-2.10.3/timidity/timidity.h --- TiMidity++-2.10.2/timidity/timidity.h Fri Jul 14 19:14:14 2000 +++ TiMidity++-2.10.3/timidity/timidity.h Sat Mar 10 18:08:18 2001 @@ -1,8 +1,6 @@ -#ifndef ___TIMIDITY_H_ -#define ___TIMIDITY_H_ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -20,6 +18,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#ifndef ___TIMIDITY_H_ +#define ___TIMIDITY_H_ #if defined(__WIN32__) && !defined(__W32__) #define __W32__ diff -ruN TiMidity++-2.10.2/timidity/version.c TiMidity++-2.10.3/timidity/version.c --- TiMidity++-2.10.2/timidity/version.c Mon Feb 7 07:55:32 2000 +++ TiMidity++-2.10.3/timidity/version.c Sat Mar 10 18:08:09 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/vorbis_a.c TiMidity++-2.10.3/timidity/vorbis_a.c --- TiMidity++-2.10.2/timidity/vorbis_a.c Tue Aug 8 10:44:01 2000 +++ TiMidity++-2.10.3/timidity/vorbis_a.c Sat Mar 10 18:08:06 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/w32_a.c TiMidity++-2.10.3/timidity/w32_a.c --- TiMidity++-2.10.2/timidity/w32_a.c Tue Aug 8 12:39:07 2000 +++ TiMidity++-2.10.3/timidity/w32_a.c Sat Mar 10 18:40:06 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -42,10 +42,12 @@ /*****************************************************************************************************************************/ #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 +#ifdef HAVE_NEW_MMSYSTEM +#include +#else +/* 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 @@ -115,6 +117,7 @@ #define waveOutGetDevCaps waveOutGetDevCapsA MMRESULT WINAPI waveOutGetID(HWAVEOUT, UINT*); +#endif #endif /* __CYGWIN32__ */ /*****************************************************************************************************************************/ diff -ruN TiMidity++-2.10.2/timidity/w32g_a.c TiMidity++-2.10.3/timidity/w32g_a.c --- TiMidity++-2.10.2/timidity/w32g_a.c Tue Aug 8 12:39:07 2000 +++ TiMidity++-2.10.3/timidity/w32g_a.c Sat Mar 10 18:40:11 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -42,6 +42,9 @@ // #define USE_WAVEOUT_EVENT #if defined(__CYGWIN32__) || defined(__MINGW32__) +#ifdef HAVE_NEW_MMSYSTEM +#include +#else /* 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. @@ -113,6 +116,7 @@ MMRESULT WINAPI waveOutGetDevCapsA(UINT, LPWAVEOUTCAPS, UINT); #define waveOutGetDevCaps waveOutGetDevCapsA MMRESULT WINAPI waveOutGetID(HWAVEOUT, UINT*); +#endif #else #include #ifdef HAVE_MMSYSTEM_H diff -ruN TiMidity++-2.10.2/timidity/wave_a.c TiMidity++-2.10.3/timidity/wave_a.c --- TiMidity++-2.10.2/timidity/wave_a.c Mon Jul 24 16:54:53 2000 +++ TiMidity++-2.10.3/timidity/wave_a.c Sat Mar 10 18:07:53 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/wrd.h TiMidity++-2.10.3/timidity/wrd.h --- TiMidity++-2.10.2/timidity/wrd.h Mon Feb 7 07:55:17 2000 +++ TiMidity++-2.10.3/timidity/wrd.h Sat Mar 10 18:07:47 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/wrd_read.c TiMidity++-2.10.3/timidity/wrd_read.c --- TiMidity++-2.10.2/timidity/wrd_read.c Mon Feb 7 07:55:08 2000 +++ TiMidity++-2.10.3/timidity/wrd_read.c Sat Mar 10 18:07:39 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/timidity/wrdt.c TiMidity++-2.10.3/timidity/wrdt.c --- TiMidity++-2.10.2/timidity/wrdt.c Mon Mar 20 16:20:56 2000 +++ TiMidity++-2.10.3/timidity/wrdt.c Sat Mar 10 18:07:44 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/utils/Makefile.am TiMidity++-2.10.3/utils/Makefile.am --- TiMidity++-2.10.2/utils/Makefile.am Wed Jul 5 22:51:48 2000 +++ TiMidity++-2.10.3/utils/Makefile.am Sat Mar 10 17:52:53 2001 @@ -1,5 +1,5 @@ # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999,2000 Masanao Izumo +# Copyright (C) 1999-2001 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/utils/Makefile.in TiMidity++-2.10.3/utils/Makefile.in --- TiMidity++-2.10.2/utils/Makefile.in Thu Nov 2 17:55:27 2000 +++ TiMidity++-2.10.3/utils/Makefile.in Sat Mar 10 20:03:00 2001 @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. # TiMidity++ -- MIDI to WAVE converter and player -# Copyright (C) 1999,2000 Masanao Izumo +# Copyright (C) 1999-2001 Masanao Izumo # Copyright (C) 1995 Tuukka Toivonen # # This program is free software; you can redistribute it and/or modify @@ -245,7 +245,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ diff -ruN TiMidity++-2.10.2/utils/bitset.c TiMidity++-2.10.3/utils/bitset.c --- TiMidity++-2.10.2/utils/bitset.c Mon Feb 7 07:33:51 2000 +++ TiMidity++-2.10.3/utils/bitset.c Sat Mar 10 18:17:09 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/utils/bitset.h TiMidity++-2.10.3/utils/bitset.h --- TiMidity++-2.10.2/utils/bitset.h Mon Feb 7 07:33:46 2000 +++ TiMidity++-2.10.3/utils/bitset.h Sat Mar 10 18:17:06 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/utils/fft.c TiMidity++-2.10.3/utils/fft.c --- TiMidity++-2.10.2/utils/fft.c Mon Feb 7 07:33:42 2000 +++ TiMidity++-2.10.3/utils/fft.c Sat Mar 10 18:17:02 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/utils/fft.h TiMidity++-2.10.3/utils/fft.h --- TiMidity++-2.10.2/utils/fft.h Mon Feb 7 07:33:38 2000 +++ TiMidity++-2.10.3/utils/fft.h Sat Mar 10 18:16:59 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/utils/mac_readdir.c TiMidity++-2.10.3/utils/mac_readdir.c --- TiMidity++-2.10.2/utils/mac_readdir.c Mon Feb 7 07:33:33 2000 +++ TiMidity++-2.10.3/utils/mac_readdir.c Sat Mar 10 18:16:56 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/utils/mac_readdir.h TiMidity++-2.10.3/utils/mac_readdir.h --- TiMidity++-2.10.2/utils/mac_readdir.h Mon Feb 7 07:33:29 2000 +++ TiMidity++-2.10.3/utils/mac_readdir.h Sat Mar 10 18:16:52 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/utils/mac_util.c TiMidity++-2.10.3/utils/mac_util.c --- TiMidity++-2.10.2/utils/mac_util.c Mon Feb 7 07:33:25 2000 +++ TiMidity++-2.10.3/utils/mac_util.c Sat Mar 10 18:16:48 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/utils/mac_util.h TiMidity++-2.10.3/utils/mac_util.h --- TiMidity++-2.10.2/utils/mac_util.h Mon Feb 7 07:33:22 2000 +++ TiMidity++-2.10.3/utils/mac_util.h Sat Mar 10 18:16:44 2001 @@ -1,6 +1,6 @@ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/utils/mblock.c TiMidity++-2.10.3/utils/mblock.c --- TiMidity++-2.10.2/utils/mblock.c Mon Feb 7 07:33:18 2000 +++ TiMidity++-2.10.3/utils/mblock.c Sat Mar 10 18:16:40 2001 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/utils/mblock.h TiMidity++-2.10.3/utils/mblock.h --- TiMidity++-2.10.2/utils/mblock.h Mon Feb 7 07:33:15 2000 +++ TiMidity++-2.10.3/utils/mblock.h Sat Mar 10 18:16:37 2001 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/utils/memb.c TiMidity++-2.10.3/utils/memb.c --- TiMidity++-2.10.2/utils/memb.c Mon Feb 7 07:33:11 2000 +++ TiMidity++-2.10.3/utils/memb.c Sat Mar 10 18:16:33 2001 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/utils/memb.h TiMidity++-2.10.3/utils/memb.h --- TiMidity++-2.10.2/utils/memb.h Mon Feb 7 07:33:08 2000 +++ TiMidity++-2.10.3/utils/memb.h Sat Mar 10 18:16:30 2001 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/utils/net.c TiMidity++-2.10.3/utils/net.c --- TiMidity++-2.10.2/utils/net.c Mon Feb 7 07:33:04 2000 +++ TiMidity++-2.10.3/utils/net.c Sat Mar 10 18:16:26 2001 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/utils/net.h TiMidity++-2.10.3/utils/net.h --- TiMidity++-2.10.2/utils/net.h Mon Feb 7 07:33:00 2000 +++ TiMidity++-2.10.3/utils/net.h Sat Mar 10 18:16:22 2001 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/utils/nkflib.c TiMidity++-2.10.3/utils/nkflib.c --- TiMidity++-2.10.2/utils/nkflib.c Wed Oct 18 08:42:18 2000 +++ TiMidity++-2.10.3/utils/nkflib.c Sat Mar 10 18:16:18 2001 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/utils/nkflib.h TiMidity++-2.10.3/utils/nkflib.h --- TiMidity++-2.10.2/utils/nkflib.h Mon Feb 7 07:32:53 2000 +++ TiMidity++-2.10.3/utils/nkflib.h Sat Mar 10 18:16:14 2001 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/utils/readdir.h TiMidity++-2.10.3/utils/readdir.h --- TiMidity++-2.10.2/utils/readdir.h Mon Feb 7 07:32:49 2000 +++ TiMidity++-2.10.3/utils/readdir.h Sat Mar 10 18:16:10 2001 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/utils/readdir_win.c TiMidity++-2.10.3/utils/readdir_win.c --- TiMidity++-2.10.2/utils/readdir_win.c Mon Feb 7 07:32:45 2000 +++ TiMidity++-2.10.3/utils/readdir_win.c Sat Mar 10 18:16:07 2001 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/utils/strtab.c TiMidity++-2.10.3/utils/strtab.c --- TiMidity++-2.10.2/utils/strtab.c Mon Feb 7 07:32:35 2000 +++ TiMidity++-2.10.3/utils/strtab.c Sat Mar 10 18:16:03 2001 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/utils/strtab.h TiMidity++-2.10.3/utils/strtab.h --- TiMidity++-2.10.2/utils/strtab.h Mon Feb 7 07:32:28 2000 +++ TiMidity++-2.10.3/utils/strtab.h Sat Mar 10 18:15:59 2001 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/utils/support.c TiMidity++-2.10.3/utils/support.c --- TiMidity++-2.10.2/utils/support.c Mon Feb 7 07:32:24 2000 +++ TiMidity++-2.10.3/utils/support.c Sat Mar 10 18:15:55 2001 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/utils/support.h TiMidity++-2.10.3/utils/support.h --- TiMidity++-2.10.2/utils/support.h Mon Feb 7 07:32:19 2000 +++ TiMidity++-2.10.3/utils/support.h Sat Mar 10 18:15:51 2001 @@ -1,8 +1,6 @@ -#ifndef ___SUPPORT_H_ -#define ___SUPPORT_H_ /* TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify @@ -20,6 +18,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#ifndef ___SUPPORT_H_ +#define ___SUPPORT_H_ #ifndef HAVE_VSNPRINTF #include /* for va_list */ diff -ruN TiMidity++-2.10.2/utils/timer.c TiMidity++-2.10.3/utils/timer.c --- TiMidity++-2.10.2/utils/timer.c Mon Feb 7 07:31:24 2000 +++ TiMidity++-2.10.3/utils/timer.c Sat Mar 10 18:15:40 2001 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify diff -ruN TiMidity++-2.10.2/utils/timer.h TiMidity++-2.10.3/utils/timer.h --- TiMidity++-2.10.2/utils/timer.h Mon Feb 7 07:31:31 2000 +++ TiMidity++-2.10.3/utils/timer.h Sat Mar 10 18:15:44 2001 @@ -1,7 +1,6 @@ /* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999,2000 Masanao Izumo + Copyright (C) 1999-2001 Masanao Izumo Copyright (C) 1995 Tuukka Toivonen This program is free software; you can redistribute it and/or modify