diff -ruN TiMidity++-2.1.0/ChangeLog TiMidity++-2.1.1/ChangeLog --- TiMidity++-2.1.0/ChangeLog Thu Jun 10 22:01:28 1999 +++ TiMidity++-2.1.1/ChangeLog Fri Jul 9 18:17:34 1999 @@ -1,3 +1,25 @@ +1999-06-09 Masanao Izumo + + * Version 2.1.1 released. + +1999-07-09 Masanao Izumo + + * interface/xaw_i.c (redrawAction): Redraw once at last expose event. + +1999-06-23 Masanao Izumo + + * utils/{support.c,support.h} (sleep, usleep): Modify the implementation. + +1999-06-22 Masanao Izumo + + * libarc/arc_tar.c: Use checksum wheather the tar file is valid or not. + "ustar" magic is ignored. + +1999-06-14 Masanao Izumo + + * Makefile.am(tools): Add new Makefile target to build timidity-tools. + * Makefile.am(ump): Add new Makefile target to build UMP. + 1999-06-10 Masanao Izumo * Version 2.1.0 released. @@ -79,8 +101,8 @@ * configure.in (HAVE_XMUREGISTEREXTERNALAGENT): Test for XmuRegisterExternalAgent() * configure.in (HAVE_X11_XMU_EXTAGENT_H): Test for - * interface/xaw_redef.c: Don't use if XmuRegisterExternalAgent is - not undefined. + * interface/xaw_redef.c(XmuRegisterExternalAgent): Don't use + XmuRegisterExternalAgent if it is not defined. * xaw_i.c: Fix bug about directory browsing. * timidity/timidity.c (read_config_file): Avoid compiler warnings. timidity/aq.c (do_effect): Likewise. diff -ruN TiMidity++-2.1.0/Makefile.am TiMidity++-2.1.1/Makefile.am --- TiMidity++-2.1.0/Makefile.am Mon Mar 8 11:48:31 1999 +++ TiMidity++-2.1.1/Makefile.am Mon Jun 14 10:34:49 1999 @@ -40,6 +40,9 @@ timidity.ide \ timidity.mak +TOOLSDIR = timidity-tools +UMPDIR = ump + dynamics: cd interface; $(MAKE) $@ @@ -58,3 +61,37 @@ dist-hook: chmod -R a+r $(distdir) $(TAR) chof - $(distdir) | bzip2 -9 --repetitive-best - > $(distdir).tar.bz2 + +## +## Targets for timidity-tools +## +tools:: tools-targets + cd $(TOOLSDIR); $(MAKE) + +tools-targets: $(TOOLSDIR)/Makefile + +install.tools: + cd $(TOOLSDIR); $(MAKE) install + +$(TOOLSDIR)/Makefile: $(TOOLSDIR)/Makefile.in config.status + CONFIG_HEADERS='' CONFIG_FILES=$(TOOLSDIR)/Makefile $(SHELL) ./config.status + +## for developers +#$(TOOLSDIR)/Makefile.in: $(TOOLSDIR)/Makefile.am +# $(AUTOMAKE) --gnu $(TOOLSDIR)/Makefile + + +## +## Targets for UMP +## +ump: ump-targets + cd $(UMPDIR); $(MAKE) ump + +ump-targets: $(UMPDIR)/Makefile + +$(UMPDIR)/Makefile: $(UMPDIR)/Makefile.in config.status + CONFIG_HEADERS='' CONFIG_FILES=ump/Makefile $(SHELL) ./config.status + +## for developers +#$(UMPDIR)/Makefile.in: $(UMPDIR)/Makefile.am +# $(AUTOMAKE) --gnu $(UMPSDIR)/Makefile diff -ruN TiMidity++-2.1.0/Makefile.in TiMidity++-2.1.1/Makefile.in --- TiMidity++-2.1.0/Makefile.in Thu Jun 10 22:01:35 1999 +++ TiMidity++-2.1.1/Makefile.in Fri Jul 9 18:20:04 1999 @@ -118,6 +118,9 @@ EXTRA_DIST = AUTHORS COPYING ChangeLog ChangeLog.1 INSTALL INSTALL.jp NEWS README README.jp timidity.ide timidity.mak + +TOOLSDIR = timidity-tools +UMPDIR = ump ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h interface.h @@ -440,6 +443,31 @@ dist-hook: chmod -R a+r $(distdir) $(TAR) chof - $(distdir) | bzip2 -9 --repetitive-best - > $(distdir).tar.bz2 + +tools:: tools-targets + cd $(TOOLSDIR); $(MAKE) + +tools-targets: $(TOOLSDIR)/Makefile + +install.tools: + cd $(TOOLSDIR); $(MAKE) install + +$(TOOLSDIR)/Makefile: $(TOOLSDIR)/Makefile.in config.status + CONFIG_HEADERS='' CONFIG_FILES=$(TOOLSDIR)/Makefile $(SHELL) ./config.status + +#$(TOOLSDIR)/Makefile.in: $(TOOLSDIR)/Makefile.am +# $(AUTOMAKE) --gnu $(TOOLSDIR)/Makefile + +ump: ump-targets + cd $(UMPDIR); $(MAKE) ump + +ump-targets: $(UMPDIR)/Makefile + +$(UMPDIR)/Makefile: $(UMPDIR)/Makefile.in config.status + CONFIG_HEADERS='' CONFIG_FILES=ump/Makefile $(SHELL) ./config.status + +#$(UMPDIR)/Makefile.in: $(UMPDIR)/Makefile.am +# $(AUTOMAKE) --gnu $(UMPSDIR)/Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -ruN TiMidity++-2.1.0/configure TiMidity++-2.1.1/configure --- TiMidity++-2.1.0/configure Thu Jun 10 21:49:15 1999 +++ TiMidity++-2.1.1/configure Fri Jul 9 16:52:57 1999 @@ -854,7 +854,7 @@ PACKAGE=TiMidity++ -VERSION=2.1.0 +VERSION=2.1.1 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; } diff -ruN TiMidity++-2.1.0/configure.in TiMidity++-2.1.1/configure.in --- TiMidity++-2.1.0/configure.in Tue May 18 19:40:49 1999 +++ TiMidity++-2.1.1/configure.in Fri Jul 9 16:52:33 1999 @@ -53,7 +53,7 @@ AC_INIT(timidity/timidity.c) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(TiMidity++, 2.1.0, no-define) +AM_INIT_AUTOMAKE(TiMidity++, 2.1.1, no-define) dnl To use CONTAINS() macro (See acinclude.m4) CONTAINS_INIT diff -ruN TiMidity++-2.1.0/interface/xaw_i.c TiMidity++-2.1.1/interface/xaw_i.c --- TiMidity++-2.1.0/interface/xaw_i.c Wed Apr 21 17:21:57 1999 +++ TiMidity++-2.1.1/interface/xaw_i.c Fri Jul 9 17:55:52 1999 @@ -1938,7 +1938,8 @@ /*ARGSUSED*/ static void redrawAction(Widget w,XEvent *e,String *v,Cardinal *n) { - redrawTrace(True); + if(e->xexpose.count == 0) + redrawTrace(True); } /*ARGSUSED*/ diff -ruN TiMidity++-2.1.0/libarc/arc.h TiMidity++-2.1.1/libarc/arc.h --- TiMidity++-2.1.0/libarc/arc.h Wed Jan 27 12:16:16 1999 +++ TiMidity++-2.1.1/libarc/arc.h Tue Jun 22 16:42:54 1999 @@ -5,7 +5,7 @@ #include "memb.h" -#define ARC_LIB_VERSION "1.4.11" +#define ARC_LIB_VERSION "1.4.12" #define ARC_DEFLATE_LEVEL 6 /* 1:Compress faster .. 9:Compress better */ typedef struct _ArchiveStreamURL diff -ruN TiMidity++-2.1.0/libarc/arc_tar.c TiMidity++-2.1.1/libarc/arc_tar.c --- TiMidity++-2.1.0/libarc/arc_tar.c Sun Feb 21 20:04:56 1999 +++ TiMidity++-2.1.1/libarc/arc_tar.c Tue Jun 22 16:42:44 1999 @@ -17,6 +17,7 @@ #define TARHDRSIZ 512 static long octal_value(char *s, int len); +static int tar_checksum(char *hdr); ArchiveEntryNode *next_tar_entry(ArchiveHandler archiver) { @@ -51,7 +52,7 @@ { if(hdr[0] == '\0') return NULL; - if(memcmp(hdr + 257, "ustar", 5) != 0) + if(!tar_checksum(hdr)) return NULL; } size = octal_value(hdr + 124, 12); @@ -121,4 +122,33 @@ len--; } return val; +} + +static int tar_checksum(char *hdr) +{ + int i; + + long recorded_sum; + long unsigned_sum; /* the POSIX one :-) */ + long signed_sum; /* the Sun one :-( */ + + recorded_sum = octal_value(hdr + 148, 8); + unsigned_sum = 0; + signed_sum = 0; + for(i = 0; i < TARBLKSIZ; i++) + { + unsigned_sum += 0xFF & hdr[i]; + signed_sum += hdr[i]; + } + + /* Adjust checksum to count the "chksum" field as blanks. */ + for(i = 0; i < 8; i++) + { + unsigned_sum -= 0xFF & hdr[148 + i]; + signed_sum -= hdr[i]; + } + unsigned_sum += ' ' * 8; + signed_sum += ' ' * 8; + + return unsigned_sum == recorded_sum || signed_sum == recorded_sum; } diff -ruN TiMidity++-2.1.0/timidity/playmidi.c TiMidity++-2.1.1/timidity/playmidi.c --- TiMidity++-2.1.0/timidity/playmidi.c Tue Apr 27 23:19:12 1999 +++ TiMidity++-2.1.1/timidity/playmidi.c Sun Jun 13 12:16:05 1999 @@ -3339,7 +3339,6 @@ return RC_NONE; } -/* parameter "events" was declared but never referenced */ static int play_midi(MidiEvent *eventlist, int32 samples) { int rc; diff -ruN TiMidity++-2.1.0/utils/support.c TiMidity++-2.1.1/utils/support.c --- TiMidity++-2.1.0/utils/support.c Fri Mar 12 19:33:36 1999 +++ TiMidity++-2.1.1/utils/support.c Wed Jun 23 12:47:14 1999 @@ -740,29 +740,24 @@ #endif /* HAVE_ERRNO_H */ #endif /* HAVE_STRERROR */ +#ifndef HAVE_USLEEP #ifdef __W32__ -void xsleep(unsigned int sec) -{ - Sleep(sec * 1000); -} -void xusleep(unsigned int usec) +int usleep(unsigned int usec) { Sleep(usec / 1000); + return 0; } #else -#ifndef HAVE_USLEEP int usleep(unsigned int usec) { -#if defined(HAVE_SELECT) struct timeval tv; tv.tv_sec = usec / 1000000; tv.tv_usec = usec % 1000000; select(0, NULL, NULL, NULL, &tv); -#endif /* HAVE_SELECT */ return 0; } -#endif /* HAVE_USLEEP */ #endif /* __W32__ */ +#endif /* HAVE_USLEEP */ #ifndef HAVE_STRDUP char *strdup(const char *s) diff -ruN TiMidity++-2.1.0/utils/support.h TiMidity++-2.1.1/utils/support.h --- TiMidity++-2.1.0/utils/support.h Mon Mar 29 15:00:40 1999 +++ TiMidity++-2.1.1/utils/support.h Wed Jun 23 12:47:27 1999 @@ -23,18 +23,14 @@ extern char *strerror(int errnum); #endif /* HAVE_STRERROR */ -#ifdef __W32__ -#define sleep xsleep -#define usleep xusleep -#else /* There is no prototype of usleep() on Solaris. Why? */ #if !defined(HAVE_USLEEP) || defined(SOLARIS) extern int usleep(unsigned int usec); #endif + #ifndef HAVE_SLEEP -#define sleep(sec) usleep(sec * 1000000) +#define sleep(s) usleep((s) * 1000000) #endif /* HAVE_SLEEP */ -#endif #ifndef HAVE_STRDUP extern char *strdup(const char *s);