diff -ruN TiMidity++-2.0.1/ChangeLog TiMidity++-2.0.2/ChangeLog --- TiMidity++-2.0.1/ChangeLog Sun Apr 25 08:20:47 1999 +++ TiMidity++-2.0.2/ChangeLog Wed Apr 28 08:13:31 1999 @@ -1,3 +1,25 @@ +1999-04-28 Masanao Izumo + + * Version 2.0.2 released. + +1999-04-28 Masanao Izumo + + * README, README.jp, INSTALL, INSTALL.jp: Update + +1999-04-27 Masanao Izumo + + * configure.in(*-sgi-irix6.2): Define SGI_OLDAL. + * timidity/{sndfont.c,sun_a.cwrd_read.c,timidity.c}, + interface/{motif_i.c,x_sherry.c}: Remove c++ comment style "//" + +1999-04-26 Masanao Izumo + + * timidity/audriv_a.c: Bug fix. + +1999-04-18 Eric A. Welsh + + * interface/ncurs_c.c (lastbends, ctl_pitch_bend): Bug fix. + 1999-04-25 Masanao Izumo * Version 2.0.1 released. diff -ruN TiMidity++-2.0.1/INSTALL TiMidity++-2.0.2/INSTALL --- TiMidity++-2.0.1/INSTALL Sun Apr 25 07:08:07 1999 +++ TiMidity++-2.0.2/INSTALL Tue Apr 27 23:42:23 1999 @@ -3,19 +3,18 @@ Installation guide Masanao Izumo - Last updated on Feb.4.1999 + Last updated on Apr.28.1999 ============================================================================== - This document describes how to install TiMidity++(version 1.3.0 or + This document describes how to install TiMidity++(version 2.0.0 or later) for your UNIX-like machine. Methods for Macintosh are not described in this document. - This version or later, It is enabled to configure and make -timidity.exe on CYGNUS + egcs-compiler(gcc) environment of -Windows98/95/NT. If you are in Windows, install cygnus and egcs (or -mingw) if you don't have them (which is available from -http://www.cygnus.com), and run `cygnus' on MS-DOS console, and make -symbolik link /bin/sh to bash. + It is enabled to configure and make timidity.exe on CYGNUS + +egcs-compiler(gcc) environment of Windows98/95/NT. If you are in +Windows, install cygnus and egcs (or mingw) if you don't have them +(which is available from http://www.cygnus.com/), and run `cygnus', +and make symbolik link /bin/sh to bash. Installing process: @@ -32,7 +31,7 @@ ------------ First, execute the following command: -% sh configure --help +% /bin/sh configure --help Many options of configure will be displayed. Main of these are the following: @@ -55,7 +54,7 @@ --x-includes=DIR Specifies include directory of X library. - --x-libraries=DIR X library files are in DIR + --x-libraries=DIR Specifies library directory of X library. --enable-debug @@ -162,11 +161,10 @@ For example: -% sh configure --with-x --enable-audio \ - --enable-ncurses --enable-slang --enable-motif \ +% sh configure --enable-ncurses --enable-slang --enable-motif \ --enable-tcltk --enable-emacs --enable-vt100 --enable-xaw \ --enable-xskin --enable-gtk \ - --enable-network --enable-spectrogram --enable-wrd --enable-nas + --enable-network --enable-spectrogram --enable-wrd Some of MIDI file eats too much CPU power. If you choose correct @@ -176,10 +174,10 @@ (for example : super-sparc/gcc) (csh, tcsh) -% env CFLAGS='-O3 -Wall -mv8 -funroll-all-loops -fomit-frame-pointer -msupersparc sh configure [configure-options]... +% env CFLAGS='-O3 -Wall -mv8 -funroll-all-loops -fomit-frame-pointer -msupersparc /bin/sh configure [configure-options]... (sh, bash) -% CFLAGS='-O3 -Wall -mv8 -funroll-all-loops -fomit-frame-pointer -msupersparc sh configure [configure-options]... +% CFLAGS='-O3 -Wall -mv8 -funroll-all-loops -fomit-frame-pointer -msupersparc /bin/sh configure [configure-options]... @@ -203,7 +201,7 @@ vendorShellClassRec vendorShellWidgetClass -in linking XAW. But it makes no matter. Don't worry. +in linking XAW. But it makes no matter. Don't worry. 4. install @@ -221,9 +219,6 @@ % make -n ... - On Windows, `make install' is not worked in current version -(v1.3.0). So please copy timidity/timidity.exe to any where by hand. - 5. Search for various voice data @@ -234,9 +229,8 @@ C:\WINDOWS\TIMIDITY.CFG on Windows). And please check the following sites for many voice(patch) data: - -http://www.goice.co.jp/timidity/gus/ (33M patch) -http://www.goice.co.jp/timidity/dist/cfg/ (Some samples of *.cfg) +http://www.goice.co.jp/member/mo/timidity/link.html#gus +http://www.goice.co.jp/member/mo/timidity/dist/cfg/ (Some samples of *.cfg) http://www.i.h.kyoto-u.ac.jp/~shom/timidity/ (10M or 4M patch) ftp://ftp.cdrom.com/pub/gus/sound/patches/files/ (GUS site) diff -ruN TiMidity++-2.0.1/INSTALL.jp TiMidity++-2.0.2/INSTALL.jp --- TiMidity++-2.0.1/INSTALL.jp Fri Mar 12 21:48:14 1999 +++ TiMidity++-2.0.2/INSTALL.jp Wed Apr 28 00:10:15 1999 @@ -6,14 +6,14 @@ $B:G=*=$@5F|(B 1999$BG/(B2$B7n(B4$BF|(B ============================================================================== -$B$3$N%I%-%e%a%s%H$O(B TiMidity++ ($B%P!<%8%g%s$O(B 1.3.0 $B0J9_(B) $B$N(B UNIX $B>e$G$N(B +$B$3$N%I%-%e%a%s%H$O(B TiMidity++ ($B%P!<%8%g%s$O(B 2.0.0 $B0J9_(B) $B$N(B UNIX $B>e$G$N(B $B%$%s%9%H!<%kJ}K!$r@bL@$7$F$$$^$9!#(BMacintosh $B$N%$%s%9%H!<%kJ}K!$O!"(B $BK\%I%-%e%a%s%H$G$O@bL@$5$l$F$$$^$;$s!#(B -$BK\%P!<%8%g%s$+$i$O!"(BWindows $B>e$N(B CYGNUS + egcs(gcc) $B4D6-$G(B configure $B$,F0:n$7!"(B +TiMidity++ $B$O!"(BWindows $B>e$N(B CYGNUS + egcs(gcc) $B4D6-$G(B configure $B$,F0:n$7!"(B timidity.exe $B$r:n@.$9$k$3$H$,2DG=$G$9!#$b$7!"(Bcygnus $B$,$J$$>l9g$O!"(B -http://www.cygnus.com $BEy$+$iF~e$G(B cygnus $B$r5/F0$7!"(B/bin/sh $B$K(B bash $B$X$N(B +http://www.cygnus.com/ $BEy$+$iF~J}$,%$%s%9%H!<%k$5$l$F$$$k(B $B4D6-$G$O!"$I$A$i$r;H$&$+$rL@<(E*$K;XDj$7$?$[$&$,3NJ}$,%$%s%9%H!<%k$5$l$F$$$k(B @@ -65,12 +65,12 @@ --enable-debug $B%G%P%C%0MQ$K%3%s%Q%$%k$7$^$9!#(B - --disable-dynamic - $B%@%$%J%_%C%/%m!<%I$K$h$k%$%s%?!<%U%'!<%9$r;HMQ$7$J$$$h$&$K$7$^$9!#(B - --with-x X Window $B4D6-$,$"$k>l9g$O;XDj$7$F$/$@$5$$!#(B + --without-x + X Window $B4D6-$,$J$$>l9g$O;XDj$7$F$/$@$5$$!#(B + --with-tcl-includes=dir Tcl $B$N%$%s%/%k!<%I%U%!%$%k$N$"$k%G%#%l%/%H%j$r;XDj$7$F2<$5$$!#(B ($B$3$l$O!"(BTcl/Tk $B$^$o$j$N(B configure $B$K<:GT$7$?;~$N$_;n$7$F$_$F2<$5$$(B) @@ -89,9 +89,18 @@ --enable-audio TiMidity $B$G(B MIDI $B%U%!%$%k$r1iAU$G$-$k$h$&$K$7$^$9!#(B - $B$3$N%*%W%7%g%s$,$J$$$H!"(BTiMidity $B$O$?$@C1$J$k(B MIDI to WAVE converter - $B$K$J$j$^$9!#2;8;$,%5%]!<%H$5$l$F$$$J$$>l9g$O!"$3$N%*%W%7%g%s$r;XDj(B - $B$7$J$$$G$/$@$5$$!#(B + $B$?$@C1$J$k(B MIDI to WAVE converter $B$H$7$F9=C[$9$k>l9g$O!"(B + --enable-audio=no $B$H$7$F$/$@$5$$!#(B + + --enable-nas + NAS (Network Audio System) $B=PNO$rM-8z$K$7$^$9!#(B + + --enable-esd + EsounD $B=PNO$rM-8z$K$7$^$9!#(B + + --enable-dynamic + $B%7%'%"!<%I%i%$%V%i%j7A<0$G:n@.$7$?%f!<%6%$%s%?!<%U%'!<%9$r(B + $B%@%$%J%_%C%/%m!<%G%#%s%0$K$h$j;HMQ$9$k$3$H$r2DG=$K$7$^$9!#(B --enable-ncurses Ncurses $B%$%s%?!<%U%'!<%9$rAH$_9~$_$^$9!#(B--enable-ncurses=dynamic @@ -162,16 +171,13 @@ timidity $B$N(B -Wx $B%*%W%7%g%s$G5/F0$7$^$9!#(B -$B$J$*!"A4$F$N5!G=$rAH$_9~$s$@%*%W%7%g%s$O!"(B +$BNc$($P!"0J2<$N$h$&$Kl9g(B) -% env CFLAGS='-O3 -Wall -mv8 -funroll-all-loops -fomit-frame-pointer -msupersparc -DAUDIO_FILLING_MILSEC=5000' sh configure [$B0J2l9g(B) -% CFLAGS='-O3 -Wall -mv8 -funroll-all-loops -fomit-frame-pointer -msupersparc -DAUDIO_FILLING_MILSEC=5000' sh configure [$B0J2e$G$O(B install $B%3%^%s%I$O$&$^$/F0:n$7$J$$$N$G!"(B -$Be$G$O!"(B (C:/WINDOWS/TIMIDITY.CFG)$B!#%Q%C%A$rC5$9$N$K!"0J2<$N%5%$%H$rK,$l$F$_$F2<$5$$!#(B - -http://www.goice.co.jp/timidity/gus/ (33M patch) -http://www.goice.co.jp/timidity/dist/cfg/ (Some samples of *.cfg) +http://www.goice.co.jp/member/mo/timidity/link.html#gus +http://www.goice.co.jp/member/mo/timidity/dist/cfg/ (Some samples of *.cfg) http://www.i.h.kyoto-u.ac.jp/~shom/timidity/ (10M or 4M patch) ftp://ftp.cdrom.com/pub/gus/sound/patches/files/ (GUS $B%5%$%H$N0\E>@h(B) @@ -435,6 +434,7 @@ #define FRACTION_BITS 12 $B$H$J$C$F$$$^$9!#$3$l$O$3$N$^$^$G$$$$$G$7$g$&!#(B +$BJdB-(B: TiMidity $B$G$O!"2;$N2;DxJQ49$KIbF0>.?tE@?t$rMQ$$$:$K!"(B32 bit $B8GDj>.?tE@?t(B $B - Jan.5.1999 - version 1.0.0 or lator + Apr.28.1999 + version 2.0.0 or lator ============================================================================== This program is free software; you can redistribute it and/or @@ -30,13 +30,13 @@ *Features of TiMidity++: - Plays MIDI files without external MIDI instruments - - Converts MIDI file to various formatted audio file - (ex. wav, au, etc..) + - Converts MIDI file to various formatted audio file (ex. wav, au, etc..) - Uses GUS/patch and SoundFont for voice data - Displays some of information of Music data during the playing - Various user interface are available (ncurses, motif, xaw, etc..) + - Can load dynamic shared user interface - Plays the MIDI file via network - - Plays the MIDI file in archive file + - Plays the MIDI file in archive file (zip, lzh, tar, tgz) - Plays not only SMF file but also MOD, RCP/R36/G18/G36 - Can handle 32 channel data - Can handle user interfaces as dynamic link modules @@ -45,6 +45,10 @@ - Automatically detects drum channels (GS/XG) - Trace playing - Low load + - Supports durm alternate assignment. + - Automatically reduce voices if there is no enough CPU power to play MIDI + in realtime. + - Can play the streamed MIDI via TCP/IP - The following MIDI events are supported: NoteOn/Off, KeyPressure, Program, ChannelPressure, Pitchwheel, ToneBank, ModulationWheel, MainVolume, Panning, Expression, diff -ruN TiMidity++-2.0.1/README.jp TiMidity++-2.0.2/README.jp --- TiMidity++-2.0.1/README.jp Wed Jan 20 18:17:12 1999 +++ TiMidity++-2.0.2/README.jp Tue Apr 27 23:22:25 1999 @@ -3,10 +3,10 @@ 出雲正尚 - 1999年1月6日 - バージョン 1.0.0 + 1999年4月28日 + バージョン 2.0.0 ============================================================================== - 本ドキュメントは TiMidity++ 1.0.0 以降の説明を記述しています。 + 本ドキュメントは TiMidity++ 2.0.0 以降の説明を記述しています。 本プログラムは全く無保証のフリーです。GPL に従い、自由に再配布／修正 することができます。ただし再配布する場合は、付属の COPYING、あるいは @@ -47,6 +47,10 @@ - 音と表示の同期 (trace plaing) - 低負荷 (trace plaing でない時) - メモリを喰う (最低 20M bytes の空き容量は欲しい) + - オルタネートアサインをサポート + - リアルタイムに演奏することが困難になると、音数を自動的に減らし、 + 処理の軽減を図る + - ストリーム形式の MIDI を演奏できる。 - 以下の MIDI イベントをサポート： NoteOn/Off, KeyPressure, Program, ChannelPressure, Pitchwheel, ToneBank, ModulationWheel, MainVolume, Panning, Expression, diff -ruN TiMidity++-2.0.1/configure TiMidity++-2.0.2/configure --- TiMidity++-2.0.1/configure Sun Apr 25 07:10:31 1999 +++ TiMidity++-2.0.2/configure Wed Apr 28 05:34:10 1999 @@ -854,7 +854,7 @@ PACKAGE=TiMidity++ -VERSION=2.0.1 +VERSION=2.0.2 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -5425,11 +5425,11 @@ EXTRALIBS="$EXTRALIBS /usr/opt/MME220/lib/libmme.a" echo "$ac_t""yes dec" 1>&6 ;; - *-sgi-irix5*) + *-sgi-irix5*|*-sgi-irix6.2) EXTRADEFS="$EXTRADEFS -DAU_AUDRIV -DSGI_OLDAL" SYSEXTRAS="$SYSEXTRAS audriv_a.c audriv_al.c" EXTRALIBS="$EXTRALIBS -laudio" - echo "$ac_t""yes irix5" 1>&6 + echo "$ac_t""yes irix5.x or irix6.2" 1>&6 ;; *-sgi-irix6*) EXTRADEFS="$EXTRADEFS -DAU_AUDRIV -DSGI_NEWAL" diff -ruN TiMidity++-2.0.1/configure.in TiMidity++-2.0.2/configure.in --- TiMidity++-2.0.1/configure.in Sun Apr 25 07:06:37 1999 +++ TiMidity++-2.0.2/configure.in Wed Apr 28 05:18:44 1999 @@ -53,7 +53,7 @@ AC_INIT(timidity/timidity.c) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(TiMidity++, 2.0.1, no-define) +AM_INIT_AUTOMAKE(TiMidity++, 2.0.2, no-define) dnl To use CONTAINS() macro (See acinclude.m4) CONTAINS_INIT @@ -474,11 +474,11 @@ EXTRALIBS="$EXTRALIBS /usr/opt/MME220/lib/libmme.a" AC_MSG_RESULT(yes dec) ;; - *-sgi-irix5*) + *-sgi-irix5*|*-sgi-irix6.2) EXTRADEFS="$EXTRADEFS -DAU_AUDRIV -DSGI_OLDAL" SYSEXTRAS="$SYSEXTRAS audriv_a.c audriv_al.c" EXTRALIBS="$EXTRALIBS -laudio" - AC_MSG_RESULT(yes irix5) + AC_MSG_RESULT(yes irix5.x or irix6.2) ;; *-sgi-irix6*) EXTRADEFS="$EXTRADEFS -DAU_AUDRIV -DSGI_NEWAL" diff -ruN TiMidity++-2.0.1/interface/motif_i.c TiMidity++-2.0.2/interface/motif_i.c --- TiMidity++-2.0.1/interface/motif_i.c Tue Feb 9 13:09:38 1999 +++ TiMidity++-2.0.2/interface/motif_i.c Tue Apr 27 04:35:10 1999 @@ -1059,7 +1059,7 @@ XtSetArg(al[ac], XmNtopOffset, 10); ac++; XtSetArg(al[ac], XmNbottomOffset, 10); ac++; XtSetArg(al[ac], XmNleftAttachment, XmATTACH_FORM); ac++; -// XtSetArg(al[ac], XmNrightAttachment, XmATTACH_FORM); ac++; +/* XtSetArg(al[ac], XmNrightAttachment, XmATTACH_FORM); ac++; */ XtSetArg(al[ac],XmNtopAttachment,XmATTACH_WIDGET); ac++; XtSetArg(al[ac], XmNtopWidget, locator_scale); ac++; btnForm = XmCreateForm(mainForm,"btnForm", al, ac); diff -ruN TiMidity++-2.0.1/interface/ncurs_c.c TiMidity++-2.0.2/interface/ncurs_c.c --- TiMidity++-2.0.1/interface/ncurs_c.c Thu Apr 15 11:45:39 1999 +++ TiMidity++-2.0.2/interface/ncurs_c.c Tue Apr 27 22:37:50 1999 @@ -509,7 +509,7 @@ ctl_sustain(ch, channel[ch].sustain); ctl_pitch_bend(ch, CTL_STATUS_INIT); if(channel[ch].pitchbend == 0x2000 && channel[ch].modulation_wheel > 0) - ctl_pitch_bend(ch, -1); + ctl_pitch_bend(ch, -2); else ctl_pitch_bend(ch, channel[ch].pitchbend); clear_bitset(channel_program_flags + ch, 0, 128); @@ -1376,7 +1376,8 @@ if(val == CTL_LAST_STATUS) { restore = 1; - if((val = lastbends[ch]) == 0) + val = lastbends[ch]; + if(!val || (val != '<' && val != '>')) val = ' '; } else @@ -1392,6 +1393,7 @@ { if(val != '=') lastbends[ch] = val; + else lastbends[ch] = ' '; wmove(dftwin, NOTE_LINE+ch, COLS-2); waddch(dftwin, val); scr_modified_flag = 1; diff -ruN TiMidity++-2.0.1/interface/x_sherry.c TiMidity++-2.0.2/interface/x_sherry.c --- TiMidity++-2.0.1/interface/x_sherry.c Sat Mar 13 15:49:23 1999 +++ TiMidity++-2.0.2/interface/x_sherry.c Tue Apr 27 04:31:15 1999 @@ -136,7 +136,6 @@ static int currentPalette; static SherryPalette **virtualPalette; /* MAX_VIRTUAL_PALETTES, 仮想パレット */ -//static SherryPalette *realPalette = NULL; static SherryPaletteEntry realPalette[MAX_PALETTES]; static uint8 *pseudoImage; /* For TrueColor */ @@ -876,9 +875,11 @@ else { screenGamma = 2.2; - //screenGamms = 2.0; - //screenGamms = 1.7; - //screenGamms = 1.0; +/* + screenGamms = 2.0; + screenGamms = 1.7; + screenGamms = 1.0; +*/ } if (png_get_gAMA (pngPtr, infoPtr, &gamma)) diff -ruN TiMidity++-2.0.1/timidity/audriv_a.c TiMidity++-2.0.2/timidity/audriv_a.c --- TiMidity++-2.0.1/timidity/audriv_a.c Fri Feb 19 16:50:50 1999 +++ TiMidity++-2.0.2/timidity/audriv_a.c Sun Apr 25 21:58:50 1999 @@ -47,12 +47,6 @@ #include "playmidi.h" #include "miditrace.h" -/* Define if you want to use soft audio buffering (AUDIO_FILLING_SEC sec.) */ -/* #define AUDIO_FILLING_MILSEC 3000 */ - -/* Defined if you want to use initial audio buffering */ -/* #define INITIAL_FILLING */ - static int open_output(void); /* 0=success, 1=warning, -1=fatal error */ static void close_output(void); static int output_data(char *buf, int32 nbytes); @@ -77,14 +71,10 @@ #endif 'd', "", - default_play_event, open_output, close_output, output_data, - flush_output, - purge_output, - current_samples, - play_loop + acntl }; /********** Audio_Init ********************** diff -ruN TiMidity++-2.0.1/timidity/playmidi.c TiMidity++-2.0.2/timidity/playmidi.c --- TiMidity++-2.0.1/timidity/playmidi.c Tue Apr 20 02:55:32 1999 +++ TiMidity++-2.0.2/timidity/playmidi.c Tue Apr 27 23:19:12 1999 @@ -2940,7 +2940,7 @@ { if(i > 1) ctl->cmsg(CMSG_INFO, VERB_VERBOSE, - "%d MIDI events are ignored", i - 1); + "Last %d MIDI events are ignored", i - 1); return midi_play_end(); } } diff -ruN TiMidity++-2.0.1/timidity/resample.c TiMidity++-2.0.2/timidity/resample.c --- TiMidity++-2.0.1/timidity/resample.c Sun Apr 18 15:31:54 1999 +++ TiMidity++-2.0.2/timidity/resample.c Tue Apr 27 22:59:22 1999 @@ -874,10 +874,18 @@ return; } newlen = (int32)(sp->data_length / a); - dest = newdata = (int16 *)safe_malloc((newlen >> (FRACTION_BITS - 1)) + 2); - count = (newlen >> FRACTION_BITS) - 1; ofs = incr = (sp->data_length - (1 << FRACTION_BITS)) / count; + + if((double)newlen + incr >= 0x7fffffffL) + { + /* Too large to compute */ + ctl->cmsg(CMSG_INFO, VERB_DEBUG, " *** Can't pre-resampling for note %d", + sp->note_to_use); + return; + } + + dest = newdata = (int16 *)safe_malloc((newlen >> (FRACTION_BITS - 1)) + 2); if (--count) *dest++ = src[0]; diff -ruN TiMidity++-2.0.1/timidity/sndfont.c TiMidity++-2.0.2/timidity/sndfont.c --- TiMidity++-2.0.1/timidity/sndfont.c Mon Apr 12 04:50:41 1999 +++ TiMidity++-2.0.2/timidity/sndfont.c Sun Apr 25 22:03:59 1999 @@ -137,7 +137,6 @@ uint16 version, minorversion; int32 samplepos, samplesize; InstList *instlist[INSTHASHSIZE]; -// int npresets; char **inst_namebuf; SFExclude *sfexclude; SFOrder *sforder; @@ -339,7 +338,6 @@ rec->minorversion = sfinfo.minorversion; rec->samplepos = sfinfo.samplepos; rec->samplesize = sfinfo.samplesize; -// rec->npresets = sfinfo.npresets; rec->inst_namebuf = (char **)SFMalloc(rec, sfinfo.npresets * sizeof(char *)); for(i = 0; i < sfinfo.npresets; i++) diff -ruN TiMidity++-2.0.1/timidity/sun_a.c TiMidity++-2.0.2/timidity/sun_a.c --- TiMidity++-2.0.1/timidity/sun_a.c Thu Apr 15 14:28:02 1999 +++ TiMidity++-2.0.2/timidity/sun_a.c Sun Apr 25 23:15:44 1999 @@ -301,9 +301,6 @@ { switch(request) { -// case PM_REQ_GETQSIZ: -// return *(int *)arg = 8192; - case PM_REQ_DISCARD: return sun_discard_playing(); diff -ruN TiMidity++-2.0.1/timidity/timidity.c TiMidity++-2.0.2/timidity/timidity.c --- TiMidity++-2.0.1/timidity/timidity.c Wed Apr 21 17:38:58 1999 +++ TiMidity++-2.0.2/timidity/timidity.c Sun Apr 25 23:17:45 1999 @@ -2826,7 +2826,6 @@ init_load_soundfont(); aq_setup(); aq_set_soft_queue(5.0, 1.0); -// aq_set_soft_queue(1.0, 1.0); if(allocate_cache_size > 0) resamp_cache_reset(); diff -ruN TiMidity++-2.0.1/timidity/wrd_read.c TiMidity++-2.0.2/timidity/wrd_read.c --- TiMidity++-2.0.1/timidity/wrd_read.c Sun Mar 28 18:16:10 1999 +++ TiMidity++-2.0.2/timidity/wrd_read.c Sun Apr 25 23:17:10 1999 @@ -1918,7 +1918,7 @@ wrdstep->last_at = readmidi_set_track(0, 0); readmidi_set_track(0, 1); - //wrdstep.step_inc = wrdstep.timebase; + /* wrdstep.step_inc = wrdstep.timebase; */ #ifdef DEBUG printf("Timebase: %d, divisions:%d\n", @@ -1964,7 +1964,7 @@ } else if( (packet.data[0]&0x70) == 0x70) { sry_show_debug(packet.data); } - if( packet.data[0] == 0x00 ) break; //end of header + if( packet.data[0] == 0x00 ) break; /* end of header */ } } @@ -1987,8 +1987,8 @@ err= sry_read_datapacket(tf, &packet); if( err ) break; /* cur_time =+ delta_time;*/ - //wrdstep_wait(wrdstep, delta_time,0); - //wrdstep_setstep(wrdstep, delta_time); + /* wrdstep_wait(wrdstep, delta_time,0); */ + /* wrdstep_setstep(wrdstep, delta_time); */ if( sherry_started && delta_time ){ wrdstep_inc(wrdstep, @@ -2020,14 +2020,10 @@ static int import_sherrywrd_file(const char * fn) { - //int i; char sry_fn[256]; char *cp; struct timidity_file *tf; - //char *args[WRD_MAXPARAM], *arg0; - //int argc; struct wrd_step_tracer wrdstep; -//#define step_at wrdstep.at strcpy(sry_fn, fn); cp=strrchr(sry_fn, '.'); @@ -2044,7 +2040,7 @@ memset(&wrdstep, 0, sizeof(wrdstep)); /**********************/ -// MIDIEVENT(0, ME_SHERRY_START, 0, 0, 0); +/* MIDIEVENT(0, ME_SHERRY_START, 0, 0, 0); */ sry_read_headerblock( &wrdstep, tf); sry_read_datablock( &wrdstep, tf); @@ -2059,8 +2055,6 @@ fflush(stdout); #endif /* DEBUG */ return 1; -//#undef step_at - }