diff -ruN TiMidity++-1.3.0/ChangeLog TiMidity++-1.3.1/ChangeLog --- TiMidity++-1.3.0/ChangeLog Wed Feb 3 07:27:12 1999 +++ TiMidity++-1.3.1/ChangeLog Fri Feb 5 14:39:00 1999 @@ -1,3 +1,36 @@ +-- 1.3.1 +Fri Feb 5 1999 +Summary: + * Fixed some bugs. + * Enabled compile with gcc from MINGW32. + (This package has not dir.h which is included and , + so configure of AC_HEADER_DIRENT section is failed all. Where is it + gone?) + +Date: Fri Feb 5 1999 +From: Masanao Izumo +Files: interface/Makefile.am + Linked support.$(so) to each dynamic interfaces. +Date: Thu Feb 4 1999 +From: Masanao Izumo +Files: timidity.c + Fixed bug that core dummped if specified out of range of program number + in *.cfg. This bug is reported by Erik Inge Bolso. Thank you. +about error message for out of range of program number in *.cfg +Files: INSTALL INSTALL.jp + Added about installation on CYGNUS. +Files: configure.in utils/{net.c,net.h} + Used WINSOCK (Windows API -lwsock32) if `AC_CHECK_FUNC(socket)' is failed, + and called WSAStartup() in open_socket() at first once. WINSOCK is needed + to compile with gcc from MINGW32 package. +Files: acinclude, configure.in + Added tests for Windows API. +Files: libarc/url_dir.c + Fixed bug & improved of url_dir.c about URL_DIR_CACHE_ENABLE + implementation. +Files: timidity/timidity.h configure.in + Fixed some compilation errors. + -- 1.3.0 Wed Feb 3 1999 Summary: diff -ruN TiMidity++-1.3.0/INSTALL TiMidity++-1.3.1/INSTALL --- TiMidity++-1.3.0/INSTALL Wed Feb 3 07:00:50 1999 +++ TiMidity++-1.3.1/INSTALL Thu Feb 4 19:32:20 1999 @@ -3,35 +3,39 @@ Installation guide Masanao Izumo - Last updated on Feb.3.1999 + Last updated on Feb.4.1999 ============================================================================== - This document describes how to install TiMidity++(version 1.0.0 or later) - for your UNIX-like machine. Methods for Windows and Macintosh are not - described in this document. + This document describes how to install TiMidity++(version 1.3.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. +Installing process: - Installing process: - - 1. ./configure + 1. configure 2. edit common.makefile, Makefile, timidity.h (not necessary) 3. make (required:GNU make) - 4. make install (required:GNU make) + 4. installation 5. search for various voice data :) - Each processes are explained in following sections. - -Note: '%' is the shell prompt. - + Each processes are explained in following sections. +(Note that '%' is the shell prompt.) 1. configure ------------ - First, execute the following command: + First, execute the following command: % sh configure --help - Many options of configure will be displayed. Main of these are the - following: + Many options of configure will be displayed. Main of these are the +following: --help Displays help messages. @@ -144,18 +148,18 @@ contents format. - For example, including all functions: + For example, including all functions: - % sh configure --with-x --enable-audio \ - --enable-ncurses --enable-slang --enable-motif \ - --enable-tcltk --enable-emacs --enable-vt100 --enable-xaw \ - --enable-xskin --enable-gtk \ - --enable-network --enable-spectrogram --enable-wrd +% sh configure --with-x --enable-audio \ + --enable-ncurses --enable-slang --enable-motif \ + --enable-tcltk --enable-emacs --enable-vt100 --enable-xaw \ + --enable-xskin --enable-gtk \ + --enable-network --enable-spectrogram --enable-wrd - Some of MIDI file eats too much CPU power. If you choose correct optimizing - method, TiMidity++ can play such MIDI files smoothly. Optimizing options - can specify in configuration: + Some of MIDI file eats too much CPU power. If you choose correct +optimizing method, TiMidity++ can play such MIDI files +smoothly. Optimizing options can specify in configuration: (for example : super-sparc/gcc) @@ -169,70 +173,81 @@ 2. edits common.makefile, Makefile, timidity.h ------------------------------ - If configure failed or compile not complete successfully, edit - common.makefile, Makefile, and timidity.h to appropriate value. + If configure failed or compile not complete successfully, edit +common.makefile, Makefile, and timidity.h to appropriate value. 3. make ------- - Once finished above setting, type + Once finished above setting, type % make - This make method requires GNU make. Some system has it as gmake. + This make method requires GNU make. Some system has it as gmake. - Note: Some system announces warnings +Note: Some system announces warnings 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 ---------- - make install.bin - installs executable files - make install.tk - installs Tcl/Tk interface - make install.el - installs Emacs interface - make install - installs all files + On UNIX, you can type `make install' to install all files. Or you +can select follows: + + make install.bin - installs executable files + make install.tk - installs Tcl/Tk interface + make install.el - installs Emacs interface + make install.man - installs man files + make install - installs all files - I recommend to check the install directories and files by executing + I recommend to check the install directories and files by executing % 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 - TiMidity++ uses GUS/patch (Glavis Ultrasound) as the voice data to play. - You must get GUS/patch files, and make the configuration file. - Please check the following sites for many voice(patch) data: + + TiMidity++ uses GUS/patch (Glavis Ultrasound) as the voice data to +play. You must get GUS/patch files, and make the configuration file. +You must make the configuration file (*.cfg). By default, +timidity.cfg is /usr/local/lib/timidity/timidity.cfg (or +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.i.h.kyoto-u.ac.jp/~shom/timidity/ (10M or 4M patch) ftp://ftp.cdrom.com/pub/gus/sound/patches/files/ (GUS site) - If you got funny voice archive, extract it to appropriate directory and - configure *.cfg files with the name and path of these voice dates. +If you got funny voice archive, extract it to appropriate directory +and configure *.cfg files with the name and path of these voice dates. ============================================================================== configuration of timidity.h ============================================================================== - Edit CONFIG_FILE to your convenience. By default, + Edit CONFIG_FILE to your convenience. By default, #define CONFIG_FILE DEFAULT_PATH "/timidity.cfg" - are recommended. DEFAULT_PATH is the same as TIMID_DIR in Makefile. - If you want to place it to another path, specify as the following: +are recommended. DEFAULT_PATH is the same as TIMID_DIR in Makefile. +If you want to place it to another path, specify as the following: #define CONFIG_FILE "/etc/timidity.cfg" - The next configuration is the file extractor (please ignore in Windows). - By default: + The next configuration is the file extractor (please ignore in Windows). +By default: #define DECOMPRESSOR_LIST { \ ".gz", "gunzip -c %s", \ @@ -244,20 +259,20 @@ ".shn", "shorten -x %s -", \ 0 } - TiMidity++ can handle some of archive format directly. But other format - will use this extractor. +TiMidity++ can handle some of archive format directly. But other format +will use this extractor. - Next, configuration of patch file converter(please ignore in Windows). - By default: + Next, configuration of patch file converter(please ignore in Windows). +By default: #define PATCH_CONVERTERS { \ ".wav", "wav2pat %s", \ 0 } - Next, configuration of extensions of GUS/patch file. If specified in - this configuration, the extension can omit in all *.cfg. By default: + Next, configuration of extensions of GUS/patch file. If specified in +this configuration, the extension can omit in all *.cfg. By default: #define PATCH_EXT_LIST { \ ".pat", \ @@ -267,94 +282,94 @@ 0 } - Next, configuration of default instrument. By default: + Next, configuration of default instrument. By default: #define DEFAULT_PROGRAM 0 - If no Program Change event, this program name are adopted. - Usually 0 is Piano. +If no Program Change event, this program name are adopted. Usually 0 +is Piano. - Next, configuration of drum channel. By default: + Next, configuration of drum channel. By default: #define DEFAULT_DRUMCHANNELS {10, -1} - Numbers is the list of drum channels, and -1 is the terminator. - For example, if you wish to default drum channel be 10 and 16, +Numbers is the list of drum channels, and -1 is the terminator. For +example, if you wish to default drum channel be 10 and 16, #define DEFAULT_DRUMCHANNELS {10, 16, -1} - This channel can change in command line option. +This channel can change in command line option. - Next, configuration of presence hack option. This option is enabled - if PRESENCE_HACK is defined. By default: + Next, configuration of presence hack option. This option is enabled +if PRESENCE_HACK is defined. By default: #define PRESENCE_HACK -1 - -1 is means that only enables if -b command line option is specified. - If defined with 0 to 2, the effect is following: +-1 is means that only enables if -b command line option is specified. +If defined with 0 to 2, the effect is following: #define PRESENCE_HACK 0 /* mainly heard from right */ #define PRESENCE_HACK 1 /* mainly heard from left */ #define PRESENCE_HACK 2 /* changes voices right and left each 10 second */ - And the following define PRESENCE_DECAY is the delay number for making - presence effects. This number can specify in command line option by - following -b? option in millisecond. +And the following define PRESENCE_DECAY is the delay number for making +presence effects. This number can specify in command line option by +following -b? option in millisecond. - Next, type of floating point number. Choose one of these: + Next, type of floating point number. Choose one of these: - typedef double FLOAT_T; - typedef float FLOAT_T; +typedef double FLOAT_T; +typedef float FLOAT_T; - Many machine which has FPU results faster operations with double - than that with float. But some machine results contrary. +Many machine which has FPU results faster operations with double than +that with float. But some machine results contrary. - Next, minimum and max range of playing sample rate. By default: + Next, minimum and max range of playing sample rate. By default: #define MIN_OUTPUT_RATE 4000 #define MAX_OUTPUT_RATE 65000 - Next, default value of master volume. By default: + Next, default value of master volume. By default: #define DEFAULT_AMPLIFICATION 70 - This number is the percentage of max volume. This default value - will be nice in any occasions. - This number can specify in command line option (-A). +This number is the percentage of max volume. This default value will +be nice in any occasions. This number can specify in command line +option (-A). - Next, default sampling rate. By default: + Next, default sampling rate. By default: #define DEFAULT_RATE 32000 - If you have much CPU power, CD quality GUS/patch and want to listen - funny sound, +If you have much CPU power, CD quality GUS/patch and want to listen +funny sound, #define DEFAULT_RATE 44100 - is good solution. +is good solution. - Next, configuration of max polyphony numbers. By default: + Next, configuration of max polyphony numbers. By default: #define DEFAULT_VOICES 32 #define MAX_VOICES 256 - DEFAULT_VOICE is the polyphony number in boot-time. This value is - configurable by the command line option (-p) from 0 to MAX_VOICES. - If your machine has much CPU power, +DEFAULT_VOICE is the polyphony number in boot-time. This value is +configurable by the command line option (-p) from 0 to MAX_VOICES. If +your machine has much CPU power, #define DEFAULT_VOICES 64 - enables good harmony. +enables good harmony. - Next, size of internal buffer. By default: + Next, size of internal buffer. By default: #ifdef __WIN32__ #define AUDIO_BUFFER_BITS 12 @@ -362,10 +377,10 @@ #define AUDIO_BUFFER_BITS 11 #endif - I guess this values no need to change. +I guess this values no need to change. - Next, value of CONTROLS_PER_SECOND. By default: + Next, value of CONTROLS_PER_SECOND. By default: #define CONTROLS_PER_SECOND 1000 @@ -374,100 +389,96 @@ #define LINEAR_INTERPOLATION - This definition cause TiMidity++ to linear interpolation in - re-sampling, and the quality of sound would be nice. But it eats - CPU powers. - I recommends define it if your machine has much power. +This definition cause TiMidity++ to linear interpolation in +re-sampling, and the quality of sound would be nice. But it eats CPU +powers. I recommends define it if your machine has much power. - Next, configuration of LOOKUP_HACK. By default, this features are - undefined like this: + Next, configuration of LOOKUP_HACK. By default, this features are +undefined like this: /* #define LOOKUP_HACK #define LOOKUP_INTERPOLATION */ - This option saves a little CPU power, but sound quality would decrease - noticeably. - If your machine suffers from lack of CPU power, enable it. +This option saves a little CPU power, but sound quality would decrease +noticeably. If your machine suffers from lack of CPU power, enable +it. - Next, configuration of FAST_DECAY. By default: + Next, configuration of FAST_DECAY. By default: /* #define FAST_DECAY */ - This option makes envelopes twice as fast and saves CPU power. - But since the release time of voices is shorten, the sound - would be poor. - This feature is controllable in command line option. +This option makes envelopes twice as fast and saves CPU power. But +since the release time of voices is shorten, the sound would be poor. +This feature is controllable in command line option. - Next, configuration of FRACTION_BITS. By default: + Next, configuration of FRACTION_BITS. By default: #define FRACTION_BITS 12 - I recommend leave this value. +I recommend leave this value. - Next, configuration of adjusting amplitude of GUS/patch. By default: + Next, configuration of adjusting amplitude of GUS/patch. By default: #define ADJUST_SAMPLE_VOLUMES - This option makes TiMidity to adjust amplitudes of each GUS/patch to - same volume. +This option makes TiMidity to adjust amplitudes of each GUS/patch to +same volume. - Next, configuration of DANGEROUS_RENICE. By default this feature - is disabled: + Next, configuration of DANGEROUS_RENICE. By default this feature +is disabled: /* #define DANGEROUS_RENICE -15 */ - If you want to increase process priority of TiMidity++ by using - setuid root enable this option. This option is only available in - UNIX. - Once you enabled this option, you should install timidity with the - following procedure: +If you want to increase process priority of TiMidity++ by using setuid +root enable this option. This option is only available in UNIX. Once +you enabled this option, you should install timidity with the +following procedure: # chown root /usr/local/bin/timidity # chmod u+s /usr/local/bin/timidity - Note: You should not set setuid to timidity if DANGEROUS_RENICE isn't - enabled. +Note: You should not set setuid to timidity if DANGEROUS_RENICE isn't + enabled. - Next, configuration of MAX_DIE_TIME. By default: + Next, configuration of MAX_DIE_TIME. By default: #define MAX_DIE_TIME 20 - If this value is too small, click noise would be come. I recommend - this value leave to this. +If this value is too small, click noise would be come. I recommend +this value leave to this. - Next, configuration of optimizing re-sampling. By default: + Next, configuration of optimizing re-sampling. By default: #define PRECALC_LOOPS - This option saves some CPU power only in some system. +This option saves some CPU power only in some system. - Next, configuration of use of ldexp(). By default this feature - if disabled: + Next, configuration of use of ldexp(). By default this feature +if disabled: /* #define USE_LDEXP */ - If your machine can multiply floating point number with ldexp() faster - than other method, enable this option. +If your machine can multiply floating point number with ldexp() faster +than other method, enable this option. - Next, configuration of size of pre-re-sampling cache. By default: + Next, configuration of size of pre-re-sampling cache. By default: #define DEFAULT_CACHE_DATA_SIZE (2*1024*1024) - Next, configuration about networks. TiMidity++ can access any files - via networks with URL. This feature are configurable in Makefile. - - If you have enabled this feature in Makefile(configure --enable-network), - configure the following macros: + Next, configuration about networks. TiMidity++ can access any files +via networks with URL. This feature are configurable in Makefile. If +you have enabled this feature in Makefile(configure --enable-network), +configure the following macros: MAIL_DOMAIN specifies domain name of your name address. If your name address is: @@ -483,8 +494,8 @@ sites. - Next, configuration of temporary directory. By default, this option - is disabled: + Next, configuration of temporary directory. By default, this option +is disabled: /* #define TMPDIR "/var/tmp" */ @@ -496,29 +507,29 @@ temporary path with this macro. - Next, recognizing GS drum part by GS exclusive message. + Next, recognizing GS drum part by GS exclusive message. #define GS_DRUMPART - enables to recognize GS exclusive message to set drum part. +enables to recognize GS exclusive message to set drum part. /* #define GS_DRUMPART */ - disables this feature. +disables this feature. - Next, output text code. If your system is in Japanese environment, - define + Next, output text code. If your system is in Japanese environment, +define #define JAPANESE - or comment out it like +or comment out it like /* #define JAPANESE */ - Next, specifies output text code (in Japanese environment). - You should specify appropriate code name to OUTPUT_TEXT_CODE macro. - The following strings are available: + Next, specifies output text code (in Japanese environment). You +should specify appropriate code name to OUTPUT_TEXT_CODE macro. The +following strings are available: "AUTO" - Auto conversion by `LANG' environment variable (UNIX only) "ASCII" - Convert unreadable characters to '.'(0x2e) @@ -527,13 +538,12 @@ "JIS" - JIS "SJIS" - shift JIS - In Japanized UNIX system, all of above are available. - In Windows, "ASCII", "NOCNV", "SJIS" are available. - If your environment cannot handle Japanese, specify "ASCII" or "NOCNV" - alternatively. +In Japanized UNIX system, all of above are available. In Windows, +"ASCII", "NOCNV", "SJIS" are available. If your environment cannot +handle Japanese, specify "ASCII" or "NOCNV" alternatively. - Next, controllers of MIDI actions. By default: + Next, controllers of MIDI actions. By default: #define MODULATION_WHEEL_ALLOW #define PORTAMENTO_ALLOW @@ -545,8 +555,8 @@ /* #define ALWAYS_TRACE_TEXT_META_EVENT */ #define OVERLAP_VOICE_ALLOW - These values are configurable in command line options. So you may leave - these in default value. + These values are configurable in command line options. So you may +leave these in default value. MODULATION_WHEEL_ALLOW Enables modulation wheel by default. diff -ruN TiMidity++-1.3.0/INSTALL.jp TiMidity++-1.3.1/INSTALL.jp --- TiMidity++-1.3.0/INSTALL.jp Wed Feb 3 06:26:31 1999 +++ TiMidity++-1.3.1/INSTALL.jp Thu Feb 4 19:15:20 1999 @@ -3,22 +3,28 @@ TiMidity++ $B$N%$%s%9%H!<%k(B $B=P1@@5>0(B - $B:G=*=$@5F|(B 1999$BG/(B2$B7n(B3$BF|(B + $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.0.0 $B0J9_(B) $B$N(B UNIX $B>e$G$N(B -$B%$%s%9%H!<%kJ}K!$r@bL@$7$F$$$^$9!#(BWindows $B$d(B Macintosh $B$N%$%s%9%H!<%kJ}K!$O!"(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%$%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 - $B%$%s%9%H!<%k$NBg$^$+$Je$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 +$B%7%s%\%j%C%/%j%s%/$r:n@.$7$F$*$$$F$/$@$5$$!#(B + +$B%$%s%9%H!<%k$NBg$^$+$Je$N@_Dj$,=*N;$7$?$i!$(Bmake $B$H%?%$%W$9$k$@$1$G$9!%(Bmake $B$K$O(B GNU $B$N(B make -$B$,I,MW$G$9!%4D6-$K$h$C$F$O!$(Bgmake $B$H$$$&%3%^%s%IL>$G%$%s%9%H!<%k$5$l$F$$$k(B -$B>l9g$,$"$j$^$9!%(B +$B0J>e$N@_Dj$,=*N;$7$?$i!"(Bmake $B$H%?%$%W$9$k$@$1$G$9!#(Bmake $B$K$O(B GNU $B$N(B make +$B$,I,MW$G$9!#4D6-$K$h$C$F$O!"(Bgmake $B$H$$$&%3%^%s%IL>$G%$%s%9%H!<%k$5$l$F$$$k(B +$B>l9g$,$"$j$^$9!#(B -$B$J$*!"(BXAW $B$r%j%s%/$9$k$H$3$m$G!$(B +$B$J$*!"(BXAW $B$r%j%s%/$9$k$H$3$m$G!"(B vendorShellClassRec vendorShellWidgetClass -$B$K4X$7$F%o!<%K%s%0$,=P$k4D6-$,$"$j$^$9$,!$$3$l$OLdBj$J$$$N$G(B -$B5$$K$7$F$/$F$b$$$$$G$9!%(B +$B$K4X$7$F%o!<%K%s%0$,=P$k4D6-$,$"$j$^$9$,!"$3$l$OLdBj$J$$$N$G(B +$B5$$K$7$F$/$F$b$$$$$G$9!#(B 4. install @@ -208,41 +214,49 @@ $B!&(Bmake install.man - Manual $B$N%$%s%9%H!<%k(B $B!&(Bmake install - $BA4$F$N%U%!%$%k$r%$%s%9%H!<%k(B -$Be$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.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) -$B$J$I$+$i2;8;$rF~l=j$KE83+$7$^$9!%I,MW$K1~$8$F!$(B*.cfg $B%U%!%$%k$N(B -dir $B$N%Q%9L>$r=$@5$7$F$/$@$5$$!%(B +$BF~l=j$KE83+$7$F$/$@$5$$!#I,MW$K1~$8$F!"(B*.cfg $B%U%!%$%k$N(B +dir $B$N%Q%9L>$r=$@5$7$F$/$@$5$$!#(B ============================================================================== timidity.h $B$NJT=8(B ============================================================================== -$BI,MW$K1~$8$F(B CONFIG_FILE $B$rDj5A$7$F$/$@$5$$!%%G%U%)%k%H$G$O(B +$BI,MW$K1~$8$F(B CONFIG_FILE $B$rDj5A$7$F$/$@$5$$!#%G%U%)%k%H$G$O(B #define CONFIG_FILE DEFAULT_PATH "/timidity.cfg" -$B$H$J$C$F$$$^$9!%(BDEFAULT_PATH $B$O(B Makefile $B$GDj5A$7$?(B TIMID_DIR $B$HF1$8$G$9!%(B -$B$b$7!$$I$&$7$F$bB>$N>l=j$KCV$-$?$$$J$i(B +$B$H$J$C$F$$$^$9!#(BDEFAULT_PATH $B$O(B Makefile $B$GDj5A$7$?(B TIMID_DIR $B$HF1$8$G$9!#(B +$B$b$7!"$I$&$7$F$bB>$N>l=j$KCV$-$?$$$J$i(B #define CONFIG_FILE "/etc/timidity.cfg" -$B$N$h$&$KDj5A$7$^$9!%(B +$B$N$h$&$KDj5A$7$^$9!#(B -$Be5-$G;XDj$7$?3HD%;R$KBP1~$7$?(B -$B%3%^%s%I$rMxMQ$7$F%U%!%$%k$rE83+$7$FFI$_9~$`$3$H$,$G$-$^$9!%(BTiMidity++ $B$G$O(B -$B4v$D$+$N7A<0$K$D$$$F$O(B TiMidity $B$,<+A0$GE83+$7$F%U%!%$%k$rFI$_9~$_$^$9!%(B -$B$7$+$7!$A4$F$N7A<0$O%5%]!<%H$7$F$$$J$$$N$G!$%5%]!<%H$5$l$F$$$J$$7A<0$K$O!$(B -$B>e5-$G;XDj$7$?%3%^%s%I$,MxMQ$5$l$^$9!%(B +$B$H$J$C$F$$$^$9!#%*%j%8%J%k$N(B TiMidity $B$G$O!">e5-$G;XDj$7$?3HD%;R$KBP1~$7$?(B +$B%3%^%s%I$rMxMQ$7$F%U%!%$%k$rE83+$7$FFI$_9~$`$3$H$,$G$-$^$9!#(BTiMidity++ $B$G$O(B +$B4v$D$+$N7A<0$K$D$$$F$O(B TiMidity $B$,<+A0$GE83+$7$F%U%!%$%k$rFI$_9~$_$^$9!#(B +$B$7$+$7!"A4$F$N7A<0$O%5%]!<%H$7$F$$$J$$$N$G!"%5%]!<%H$5$l$F$$$J$$7A<0$K$O!"(B +$B>e5-$G;XDj$7$?%3%^%s%I$,MxMQ$5$l$^$9!#(B -$B$G>JN,$G$-$^$9!%%G%U%)%k%H$G$O(B +$B$G>JN,$G$-$^$9!#%G%U%)%k%H$G$O(B #define PATCH_EXT_LIST { \ ".pat", \ @@ -281,110 +295,110 @@ ".bz2", ".pat.bz2", \ 0 } -$B$H$J$C$F$$$^$9!%(B +$B$H$J$C$F$$$^$9!#(B -$Bl9g$K(B -$B$3$NCM$,MxMQ$5$l$^$9!%DL>o(B 0 $BHV$O%T%"%N$G$9!%(B +$B$H$J$C$F$$$^$9!#(BMIDI $B$N(B Program Change $B%$%Y%s%H$,$J$$>l9g$K(B +$B$3$NCM$,MxMQ$5$l$^$9!#DL>o(B 0 $BHV$O%T%"%N$G$9!#(B -$Bl9g$O!$%I%i%`%A%c%M%k$N%j%9%H$rJ#?t;XDj$7!$(B-1 $B$G=*N;(B -$B$7$^$9!%$b$7!$(B10 $B$H(B 16 $B%A%c%M%k$r%G%U%)%k%H$G%I%i%`%A%c%M%k$K$7$?$$$J$i$P!$(B +$B$H$J$C$F$$$^$9!#$3$l$O%3%^%s%I%i%$%s%*%W%7%g%s$GJQ99$G$-$k$N$G!"$3$N$^$^$G(B +$B$$$$$H;W$$$^$9!#JQ99$9$k>l9g$O!"%I%i%`%A%c%M%k$N%j%9%H$rJ#?t;XDj$7!"(B-1 $B$G=*N;(B +$B$7$^$9!#$b$7!"(B10 $B$H(B 16 $B%A%c%M%k$r%G%U%)%k%H$G%I%i%`%A%c%M%k$K$7$?$$$J$i$P!"(B #define DEFAULT_DRUMCHANNELS {10, 16, -1} -$B$H$7$^$9!%$J$*!$%I%i%`%A%c%M%k$O%3%^%s%I%i%$%s%*%W%7%g%s$GJQ99$G$-$^$9!%(B +$B$H$7$^$9!#$J$*!"%I%i%`%A%c%M%k$O%3%^%s%I%i%$%s%*%W%7%g%s$GJQ99$G$-$^$9!#(B -$Bl46$r=P$9$?$a$N%O%C%/%*%W%7%g%s$N@_Dj$G$9!%(B -PRESENCE_HACK $B$rDj5A$9$k$H!$$3$N%O%C%/$,M-8z$K$J$j$^$9!%%G%U%)%k%H$G$O(B +$Bl46$r=P$9$?$a$N%O%C%/%*%W%7%g%s$N@_Dj$G$9!#(B +PRESENCE_HACK $B$rDj5A$9$k$H!"$3$N%O%C%/$,M-8z$K$J$j$^$9!#%G%U%)%k%H$G$O(B #define PRESENCE_HACK -1 -$B$H$J$C$F$$$^$9!%(B-1 $B$KDj5A$7$F$*$/$H!$(B-b $B%*%W%7%g%s$G;XDj$7$?>l9g$N$_(B -$BM-8z$K$J$j$^$9!%(B0$B!A(B2 $B$NCM$rDj5A$9$k$H!$%*%W%7%g%s$G;XDj$7$J$/$F$b(B -$BL5M}$d$jM-8z$K$7$F$7$^$$$^$9!%(B +$B$H$J$C$F$$$^$9!#(B-1 $B$KDj5A$7$F$*$/$H!"(B-b $B%*%W%7%g%s$G;XDj$7$?>l9g$N$_(B +$BM-8z$K$J$j$^$9!#(B0$B!A(B2 $B$NCM$rDj5A$9$k$H!"%*%W%7%g%s$G;XDj$7$J$/$F$b(B +$BL5M}$d$jM-8z$K$7$F$7$^$$$^$9!#(B -#define PRESENCE_HACK 0 /* $Bl$,F~$lBX$o$j$^$9!%(B*/ +#define PRESENCE_HACK 0 /* $Bl$,F~$lBX$o$j$^$9!#(B*/ -$B$J$*!$$3$NDj5A$N$7$?$K$"$k(B PRESENCE_DELAY $B$ONW>l46$r=P$9$?$a$N%G%#%l%$$N(B -$B%A%e!<%K%s%0CM$G!$(B-b? $B%*%W%7%g%s$N8e$m$K$D$J$2$F%_%jICC10L$G;XDj$9$k$3$H$G(B -$BJQ99$9$k$3$H$,2DG=$G$9!%(B +$B$J$*!"$3$NDj5A$N$7$?$K$"$k(B PRESENCE_DELAY $B$ONW>l46$r=P$9$?$a$N%G%#%l%$$N(B +$B%A%e!<%K%s%0CM$G!"(B-b? $B%*%W%7%g%s$N8e$m$K$D$J$2$F%_%jICC10L$G;XDj$9$k$3$H$G(B +$BJQ99$9$k$3$H$,2DG=$G$9!#(B -$B.?tE@?t$N7?$N;XDj$G$9!%(B +$B.?tE@?t$N7?$N;XDj$G$9!#(B $B!&(Btypedef double FLOAT_T; $B!&(Btypedef float FLOAT_T; -$B$N$I$A$i$+$rA*$s$G$/$@$5$$!%(B -double $B@:EY$N(B FPU $B$rEk:\$7$F$$$k%^%7%s$G$O!$(B -float $B$h$j(B double $B$NJ}$,9bB.$G$9!%(Bsparc $B$d(B SGI/IP $B$J$I$O(B double $B$NJ}$,(B -$B9bB.$G$9!%:G6a$N(B FPU $B$O$?$$$F$$$N>l9g$O(B double $B@:EY$NJ}$,9bB.$G$9!%(B -$B$?$@$7!$0lIt$N%^%7%s$d%Q%=%3%s$G$O(B float $B$NJ}$,9bB.$K$J$k$+$b$7$l$^$;$s!%(B +$B$N$I$A$i$+$rA*$s$G$/$@$5$$!#(B +double $B@:EY$N(B FPU $B$rEk:\$7$F$$$k%^%7%s$G$O!"(B +float $B$h$j(B double $B$NJ}$,9bB.$G$9!#(Bsparc $B$d(B SGI/IP $B$J$I$O(B double $B$NJ}$,(B +$B9bB.$G$9!#:G6a$N(B FPU $B$O$?$$$F$$$N>l9g$O(B double $B@:EY$NJ}$,9bB.$G$9!#(B +$B$?$@$7!"0lIt$N%^%7%s$d%Q%=%3%s$G$O(B float $B$NJ}$,9bB.$K$J$k$+$b$7$l$^$;$s!#(B -$Be8B$N@_Dj$G$9!%%G%U%)%k%H$G$O(B +$Be8B$N@_Dj$G$9!#%G%U%)%k%H$G$O(B #define MIN_OUTPUT_RATE 4000 #define MAX_OUTPUT_RATE 65000 -$B$H$J$C$F$$$^$9!%$3$l$OFC$KJQ99$9$kI,MW$O$J$$$G$7$g$&!%(B +$B$H$J$C$F$$$^$9!#$3$l$OFC$KJQ99$9$kI,MW$O$J$$$G$7$g$&!#(B -$Bl9g$O(B #define DEFAULT_RATE 44100 -$B$H$9$k$N$b$$$$$G$9!%(B +$B$H$9$k$N$b$$$$$G$9!#(B -$Be!$(B64 $B=E2;$"$l$P!$BgDq$N(B MIDI -$B%U%!%$%k$,2wE,$KJ9$1$^$9!%$^$?!$(B128 $B=E2;$r1[$($k(B MIDI $B%U%!%$%k$O$[$H$s$I(B -$BB8:_$7$J$/(B($B6K4u$K$"$j$^$9$,(B)$B!$(B128 $B=E2;0J>e$r=hM}$9$k$K$O$+$J$j9b@-G=$J(B CPU -($BNc$($P(B R10000 $B$H$+(B)$B$G$J$$$HL5M}$G$9!%$=$N$?$a!$(BMAX_VOICES $B$O6KC<$KA}$d$7$F(B -$B$b$"$^$j0UL#$,$J$$$N$G(B 256 $B$/$i$$$r>e8B$K$9$k$N$,BEEv$G$9!%(B +$B$N$h$&$K$9$k$N$b$$$$$G$9!#7P83>e!"(B64 $B=E2;$"$l$P!"BgDq$N(B MIDI +$B%U%!%$%k$,2wE,$KJ9$1$^$9!#$^$?!"(B128 $B=E2;$r1[$($k(B MIDI $B%U%!%$%k$O$[$H$s$I(B +$BB8:_$7$J$/(B($B6K4u$K$"$j$^$9$,(B)$B!"(B128 $B=E2;0J>e$r=hM}$9$k$K$O$+$J$j9b@-G=$J(B CPU +($BNc$($P(B R10000 $B$H$+(B)$B$G$J$$$HL5M}$G$9!#$=$N$?$a!"(BMAX_VOICES $B$O6KC<$KA}$d$7$F(B +$B$b$"$^$j0UL#$,$J$$$N$G(B 256 $B$/$i$$$r>e8B$K$9$k$N$,BEEv$G$9!#(B -$Be$7$^$9!%$=$NH?LL(B CPU $BIi2Y$,>e$,$j$^$9!%(B -$BHsNO$J%^%7%s$G$J$$8B$jDj5A$7$F$*$-$^$7$g$&!%(B +$B$H$J$C$F$$$^$9!#$3$l$rDj5A$9$k$H!"%j%5%s%W%k;~$K@~7AJd40$r9T$$!"2;e$7$^$9!#$=$NH?LL(B CPU $BIi2Y$,>e$,$j$^$9!#(B +$BHsNO$J%^%7%s$G$J$$8B$jDj5A$7$F$*$-$^$7$g$&!#(B -$B/9bB.$KF0:n$7$^$9!%(B -$B$?$@$7!$(B16 $B%S%C%H$N%5%s%W%k$r(B 8 $B%S%C%H$G7W;;$9$k$N$G2;/9bB.$KF0:n$7$^$9!#(B +$B$?$@$7!"(B16 $B%S%C%H$N%5%s%W%k$r(B 8 $B%S%C%H$G7W;;$9$k$N$G2;.$5$$2;$N(B GUS/patch $B$O>.$5$$$^$^$K!$(B -$BBg$-$$2;$N(B GUS/patch $B$OBg$-$$$^$^$K$7$?$$$J$iL$Dj5A$K$7$F$/$@$5$$!%(B +$B$HDj5A$5$l$F$$$^$9!#$3$l$rDj5A$7$F$*$/$H!"(BGUS/patch $B$N2;NL$r<+F0E*$K(B +$BD4@a$7$FF1$82;$NBg$-$5$K$7$^$9!#$b$7!">.$5$$2;$N(B GUS/patch $B$O>.$5$$$^$^$K!"(B +$BBg$-$$2;$N(B GUS/patch $B$OBg$-$$$^$^$K$7$?$$$J$iL$Dj5A$K$7$F$/$@$5$$!#(B $B@53N$K%A%e!<%K%s%0$5$l$F$$$k(B GUS/patch $B%;%C%H$N$_$rMQ$$$k$J$iL$Dj5A$G$b(B -$B$$$$$G$9!%$7$+$7!$B>$NMM!9$J(B GUS/patch $B$rMxMQ$9$k>l9g$K!$2;NL$,ITB7$$$K(B -$B$J$C$F$7$^$&$N$G!$$3$N%^%/%m$ODj5A$7$F$*$/$[$&$,$$$$$G$7$g$&!%(B +$B$$$$$G$9!#$7$+$7!"B>$NMM!9$J(B GUS/patch $B$rMxMQ$9$k>l9g$K!"2;NL$,ITB7$$$K(B +$B$J$C$F$7$^$&$N$G!"$3$N%^%/%m$ODj5A$7$F$*$/$[$&$,$$$$$G$7$g$&!#(B -$Be$2$Fl9g$O$3$N(B -$B%^%/%m$rDj5A$7$F$/$@$5$$!%(BUNIX $B$N$_$GM-8z$G$9!%$3$N%^%/%m$rDj5A$7$F(B TiMidity -$B$r%$%s%9%H!<%k$7$?8e$O!$(B +$B%^%/%m$rDj5A$7$F$/$@$5$$!#(BUNIX $B$N$_$GM-8z$G$9!#$3$N%^%/%m$rDj5A$7$F(B TiMidity +$B$r%$%s%9%H!<%k$7$?8e$O!"(B # chown root /usr/local/bin/timidity # chmod u+s /usr/local/bin/timidity -$B$N$h$&$K$7$^$9!%(B +$B$N$h$&$K$7$^$9!#(B $BCm!'(B -DANGEROUS_RENICE $B$rDj5A$7$F$$$J$$>l9g$O!$(Bsetuid $B%W%m%0%i%`$K$7$J$$$G$/$@$5$$!%(B +DANGEROUS_RENICE $B$rDj5A$7$F$$$J$$>l9g$O!"(Bsetuid $B%W%m%0%i%`$K$7$J$$$G$/$@$5$$!#(B -$B.$5$J?t$K$9$k$H!$%W%D$C$F$$$&%N%$%:2;(B ($B%/%j%C%/%N%$%:(B) -$B$,82Cx$K$J$j$^$9!%$3$NCM$O$3$N$^$^$G$$$$$G$7$g$&!%(B -($B%b%N%i%k%Q!<%H$N2;Dx$,(B A->B $B$H0\$k$H$-!$(BA $B$N2;$r=V;~$K>C$7$F$7$^$&$H%/%j%C%/(B - $B%N%$%:$,=P$F$7$^$$$^$9!%$3$N%Q%i%a%?$G!$=V;~$K>C$9$Y$-2;$K%/%j%C%/%N%$%:$,(B - $B=P$J$$$h$&$K%3%s%H%m!<%k$7$^$9!%(B) +$B$H$J$C$F$$$^$9!#$"$^$j>.$5$J?t$K$9$k$H!"%W%D$C$F$$$&%N%$%:2;(B ($B%/%j%C%/%N%$%:(B) +$B$,82Cx$K$J$j$^$9!#$3$NCM$O$3$N$^$^$G$$$$$G$7$g$&!#(B +($B%b%N%i%k%Q!<%H$N2;Dx$,(B A->B $B$H0\$k$H$-!"(BA $B$N2;$r=V;~$K>C$7$F$7$^$&$H%/%j%C%/(B + $B%N%$%:$,=P$F$7$^$$$^$9!#$3$N%Q%i%a%?$G!"=V;~$K>C$9$Y$-2;$K%/%j%C%/%N%$%:$,(B + $B=P$J$$$h$&$K%3%s%H%m!<%k$7$^$9!#(B) -$B.?tE@?t$N3]$1;;$,(B ldexp() $B$rMQ$$$?J}$,B.$$(B -$B%^%7%s$N>l9g$ODj5A$7$F$/$@$5$$!%(B +$B$HL$Dj5A$K$J$C$F$$$^$9!#IbF0>.?tE@?t$N3]$1;;$,(B ldexp() $B$rMQ$$$?J}$,B.$$(B +$B%^%7%s$N>l9g$ODj5A$7$F$/$@$5$$!#(B -$Be$KA}$d$7$F$b!$$"$^$j82Cx$K9bB.2=$7$J$/!$$^$?!$(B -$B%3%^%s%I%i%$%s%*%W%7%g%s$+$i$bJQ99$G$-$k$N$G!$$3$3$O%G%U%)%k%H$N$^$^$G(B -$B$$$$$G$7$g$&!%(B +$B$H(B 2M $B$K$J$C$F$$$^$9!#(BTiMidity++ $B$G$O!"(BMIDI $B%$%Y%s%H$r1iAUA0$K(B scan $B$7$F!"(B +$B0lIt$N2;$r$"$i$+$8$a%j%5%s%W%j%s%0$7$^$9!#$=$N%j%5%s%W%j%s%0$N%P%C%U%!$N(B +$BBg$-$5$r;XDj$7$F$/$@$5$$!#Bg$-$/$9$k$[$I9bB.$K$J$j$^$9$,!"$=$NJ,!"(B +$B%a%b%j$rO2Hq$7$^$9!#(B2M $B0J>e$KA}$d$7$F$b!"$"$^$j82Cx$K9bB.2=$7$J$/!"$^$?!"(B +$B%3%^%s%I%i%$%s%*%W%7%g%s$+$i$bJQ99$G$-$k$N$G!"$3$3$O%G%U%)%k%H$N$^$^$G(B +$B$$$$$G$7$g$&!#(B -$Bl9g$N$_!$$3$N5!G=$,M-8z$K$J$j$^$9!%(B -$B0J2<$N%^%/%m$r@_Dj$7$F$/$@$5$$!%(B +$Bl9g$N$_!"$3$N5!G=$,M-8z$K$J$j$^$9!#(B +$B0J2<$N%^%/%m$r@_Dj$7$F$/$@$5$$!#(B $B!&(BMAIL_DOMAIN - $B%a!<%k%"%I%l%9$N%I%a%$%sL>$r;XDj$7$F$/$@$5$$!%Nc$($P%a!<%k%"%I%l%9$,(B - mo@goice.co.jp $B$H$9$k$H!$(B + $B%a!<%k%"%I%l%9$N%I%a%$%sL>$r;XDj$7$F$/$@$5$$!#Nc$($P%a!<%k%"%I%l%9$,(B + mo@goice.co.jp $B$H$9$k$H!"(B #define MAIL_DOMAIN "@goice.co.jp" - $B$H5-=R$7$^$9!%(B + $B$H5-=R$7$^$9!#(B $B!&(BMAIL_NAME - UNIX $B$G$OL$Dj5A$K$7$F$/$@$5$$!%(BWindows $B$G$O%a!<%kL>$rDj5A$7$F$/$@$5$$!%(B - $BNc$($P%a!<%k%"%I%l%9$,(B mo@goice.co.jp $B$H$9$k$H!$(B + UNIX $B$G$OL$Dj5A$K$7$F$/$@$5$$!#(BWindows $B$G$O%a!<%kL>$rDj5A$7$F$/$@$5$$!#(B + $BNc$($P%a!<%k%"%I%l%9$,(B mo@goice.co.jp $B$H$9$k$H!"(B #define MAIL_NAME "mo" - $B$H5-=R$7$^$9!%(B + $B$H5-=R$7$^$9!#(B -$B$3$N%a!<%k%"%I%l%9$O!$(Banonymous FTP $B$K(B proxy $B$r2p$5$:$K%"%/%;%9$9$k>l9g$K(B -$BMxMQ$5$l$^$9!%(B +$B$3$N%a!<%k%"%I%l%9$O!"(Banonymous FTP $B$K(B proxy $B$r2p$5$:$K%"%/%;%9$9$k>l9g$K(B +$BMxMQ$5$l$^$9!#(B -$Bl=j$r;XDj$7$^$9!%%G%U%)%k%H$G$O(B +$Bl=j$r;XDj$7$^$9!#%G%U%)%k%H$G$O(B /* #define TMPDIR "/var/tmp" */ -$B$HL$Dj5A$K$J$C$F$$$^$9!%(BUNIX $B$G$O!$$3$N%^%/%m$rL$Dj5A$K$7$F$*$/$H!$(B -TMPDIR $B4D6-JQ?t$GDj5A$5$l$F$$$k%G%#%l%/%H%j$K0l;~%U%!%$%k$r:n@.$7$^$9!%(B +$B$HL$Dj5A$K$J$C$F$$$^$9!#(BUNIX $B$G$O!"$3$N%^%/%m$rL$Dj5A$K$7$F$*$/$H!"(B +TMPDIR $B4D6-JQ?t$GDj5A$5$l$F$$$k%G%#%l%/%H%j$K0l;~%U%!%$%k$r:n@.$7$^$9!#(B TMPDIR $B%^%/%m$b(B TMPDIR $B4D6-JQ?t$b$I$A$i$H$bL$Dj5A$N>l9g$O(B /tmp $B$K(B -$B0l;~%U%!%$%k$,:n@.$5$l$^$9!%(B -Windows $B$G$O!$(BTMPDIR $B4D6-JQ?t$OL5;k$5$l$^$9$N$G!$(B -TMPDIR $B%^%/%m$rDj5A$7$F$/$@$5$$!%(B +$B0l;~%U%!%$%k$,:n@.$5$l$^$9!#(B +Windows $B$G$O!"(BTMPDIR $B4D6-JQ?t$OL5;k$5$l$^$9$N$G!"(B +TMPDIR $B%^%/%m$rDj5A$7$F$/$@$5$$!#(B -$Bl9g$O!$(B +$B$HDj5A$7$F$/$@$5$$!#F|K\8l4D6-$G$J$$>l9g$O!"(B /* #define JAPANESE */ -$B$H%3%a%s%H%"%&%H$7$F$/$@$5$$!%e$NF|K\8l4D6-$G$O!$>e5-$9$Y$FM-8z$G$9!%(B -Windows $BF|K\8l4D6-$G$O!$(B"ASCII"$B!$(B"NOCNV"$B!$(B"SJIS" $B$N$I$l$+$r;XDj$7$F$/$@$5$$!%(B -$BF|K\8l4D6-$G$J$$>l9g$O!$(B"ASCII"$B!$(B"NOCNV" $B$N$I$A$i$+$r;XDj$7$F$/$@$5$$!%(B +UNIX $B>e$NF|K\8l4D6-$G$O!">e5-$9$Y$FM-8z$G$9!#(B +Windows $BF|K\8l4D6-$G$O!"(B"ASCII"$B!"(B"NOCNV"$B!"(B"SJIS" $B$N$I$l$+$r;XDj$7$F$/$@$5$$!#(B +$BF|K\8l4D6-$G$J$$>l9g$O!"(B"ASCII"$B!"(B"NOCNV" $B$N$I$A$i$+$r;XDj$7$F$/$@$5$$!#(B -$Bo$K(B CPU - $B%Q%o!<$rI,MW$H$9$k$?$a!$%j%"%k%?%$%`1iAU$,:$Fq$K$J$j$^$9!%(B + $BDj5A$9$k$H!"%j%P!<%V5!G=$r%G%U%)%k%H$GM-8z$K$7$^$9!#$3$N5!G=$OHs>o$K(B CPU + $B%Q%o!<$rI,MW$H$9$k$?$a!"%j%"%k%?%$%`1iAU$,:$Fq$K$J$j$^$9!#(B (-Er:on -ER:off) $B!&(BCHORUS_CONTROL_ALLOW - $BDj5A$9$k$H!$%3!<%i%95!G=$r%G%U%)%k%H$GM-8z$K$7$^$9!%$3$N5!G=$OHs>o$K(B CPU - $B%Q%o!<$rI,MW$H$9$k$?$a!$%j%"%k%?%$%`1iAU$,:$Fq$K$J$j$^$9!%(B + $BDj5A$9$k$H!"%3!<%i%95!G=$r%G%U%)%k%H$GM-8z$K$7$^$9!#$3$N5!G=$OHs>o$K(B CPU + $B%Q%o!<$rI,MW$H$9$k$?$a!"%j%"%k%?%$%`1iAU$,:$Fq$K$J$j$^$9!#(B (-Ec:on -EC:off) $B!&(BGM_CHANNEL_PRESSURE_ALLOW - $BDj5A$9$k$H!$%G%U%)%k%H$G(B Channel pressure $B$rM-8z$K$7$^$9!%(B + $BDj5A$9$k$H!"%G%U%)%k%H$G(B Channel pressure $B$rM-8z$K$7$^$9!#(B (-Es:on -ES:off) $B!&(BXG_BANK_SELECT_LSB_ALLOW - $BDj5A$9$k$H!$%G%U%)%k%H$G(B XG $B$N%P%s%/%;%l%/%H$rM-8z$K$7$^$9!%(B + $BDj5A$9$k$H!"%G%U%)%k%H$G(B XG $B$N%P%s%/%;%l%/%H$rM-8z$K$7$^$9!#(B (-Ex:on -EX:off) $B!&(BALWAYS_TRACE_TEXT_META_EVENT - $BDj5A$9$k$H!$%G%U%)%k%H$G(B Text Meta $B%$%Y%s%H$NJ8;zNs$r%H%l!<%9I=<($7$^$9!%(B + $BDj5A$9$k$H!"%G%U%)%k%H$G(B Text Meta $B%$%Y%s%H$NJ8;zNs$r%H%l!<%9I=<($7$^$9!#(B (-Et:on -ET:off) $B!&(BOVERLAP_VOICE_ALLOW - $BDj5A$9$k$H!$F10l2;$N=E$J$C$?(B voice $B$rM-8z$K$7$^$9!%(B + $BDj5A$9$k$H!"F10l2;$N=E$J$C$?(B voice $B$rM-8z$K$7$^$9!#(B (-Eo:on -EO:off) diff -ruN TiMidity++-1.3.0/NEWS TiMidity++-1.3.1/NEWS --- TiMidity++-1.3.0/NEWS Wed Feb 3 07:26:57 1999 +++ TiMidity++-1.3.1/NEWS Fri Feb 5 14:39:57 1999 @@ -1,3 +1,8 @@ +* 2/5, 1999 + Released TiMidity++ v1.3.1. + * Fixed some bugs. + * Enabled compile with gcc from MINGW32. + * 2/3, 1999 Released TiMidity++ v1.3.0. New features and major change from v1.2.x: diff -ruN TiMidity++-1.3.0/acinclude.m4 TiMidity++-1.3.1/acinclude.m4 --- TiMidity++-1.3.0/acinclude.m4 Mon Jan 25 21:14:28 1999 +++ TiMidity++-1.3.1/acinclude.m4 Thu Feb 4 18:06:49 1999 @@ -297,3 +297,51 @@ $1="$val" rm -f wordtmp >/dev/null 2>&1 ]) + + +dnl WAPI_CHECK_FUNC(FUNCTION, INCLUDES, TEST-BODY, + [ACTION-FI-FOUND [, ACTION-IF-NOT-FOUND]]) +AC_DEFUN(WAPI_CHECK_FUNC, +[AC_MSG_CHECKING(for $1) +AC_CACHE_VAL(wapi_cv_func_$1, +[AC_TRY_LINK([#include +$2 +], [$3], +wapi_cv_func_$1=yes, wapi_cv_func_$1=no)]) +if eval "test \"`echo '$wapi_cv_func_'$1`\" = yes"; then + AC_MSG_RESULT(yes) + ifelse([$4], , :, [$4]) +else + AC_MSG_RESULT(no) +ifelse([$5], , , [$5 +])dnl +fi +]) + + +dnl WAPI_CHECK_LIB(LIBRARY, FUNCTION, +dnl INCLUDES, TEST-BODY +dnl [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND +dnl [, OTHER-LIBRARIES]]]) +AC_DEFUN(WAPI_CHECK_LIB, +[AC_MSG_CHECKING([for $2 in -l$1]) +ac_lib_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'` +AC_CACHE_VAL(wapi_cv_lib_$ac_lib_var, +[ac_save_LIBS="$LIBS" +LIBS="-l$1 $7 $LIBS" +AC_TRY_LINK([#include +$3 +], [$4], +eval "wapi_cv_lib_$ac_lib_var=yes", +eval "wapi_cv_lib_$ac_lib_var=no") +LIBS="$ac_save_LIBS" +])dnl +if eval "test \"`echo '$wapi_cv_lib_'$ac_lib_var`\" = yes"; then + AC_MSG_RESULT(yes) + ifelse([$5], ,LIBS="-l$1 $LIBS", [$5]) +else + AC_MSG_RESULT(no) +ifelse([$6], , , [$6 +])dnl +fi +]) diff -ruN TiMidity++-1.3.0/aclocal.m4 TiMidity++-1.3.1/aclocal.m4 --- TiMidity++-1.3.0/aclocal.m4 Wed Feb 3 05:12:32 1999 +++ TiMidity++-1.3.1/aclocal.m4 Fri Feb 5 14:36:00 1999 @@ -310,6 +310,54 @@ rm -f wordtmp >/dev/null 2>&1 ]) + +dnl WAPI_CHECK_FUNC(FUNCTION, INCLUDES, TEST-BODY, + [ACTION-FI-FOUND [, ACTION-IF-NOT-FOUND]]) +AC_DEFUN(WAPI_CHECK_FUNC, +[AC_MSG_CHECKING(for $1) +AC_CACHE_VAL(wapi_cv_func_$1, +[AC_TRY_LINK([#include +$2 +], [$3], +wapi_cv_func_$1=yes, wapi_cv_func_$1=no)]) +if eval "test \"`echo '$wapi_cv_func_'$1`\" = yes"; then + AC_MSG_RESULT(yes) + ifelse([$4], , :, [$4]) +else + AC_MSG_RESULT(no) +ifelse([$5], , , [$5 +])dnl +fi +]) + + +dnl WAPI_CHECK_LIB(LIBRARY, FUNCTION, +dnl INCLUDES, TEST-BODY +dnl [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND +dnl [, OTHER-LIBRARIES]]]) +AC_DEFUN(WAPI_CHECK_LIB, +[AC_MSG_CHECKING([for $2 in -l$1]) +ac_lib_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'` +AC_CACHE_VAL(wapi_cv_lib_$ac_lib_var, +[ac_save_LIBS="$LIBS" +LIBS="-l$1 $7 $LIBS" +AC_TRY_LINK([#include +$3 +], [$4], +eval "wapi_cv_lib_$ac_lib_var=yes", +eval "wapi_cv_lib_$ac_lib_var=no") +LIBS="$ac_save_LIBS" +])dnl +if eval "test \"`echo '$wapi_cv_lib_'$ac_lib_var`\" = yes"; then + AC_MSG_RESULT(yes) + ifelse([$5], ,LIBS="-l$1 $LIBS", [$5]) +else + AC_MSG_RESULT(no) +ifelse([$6], , , [$6 +])dnl +fi +]) + # Define a conditional. AC_DEFUN(AM_CONDITIONAL, diff -ruN TiMidity++-1.3.0/configure TiMidity++-1.3.1/configure --- TiMidity++-1.3.0/configure Wed Feb 3 05:12:36 1999 +++ TiMidity++-1.3.1/configure Fri Feb 5 14:36:04 1999 @@ -836,7 +836,7 @@ PACKAGE=TiMidity++ -VERSION=1.3.0 +VERSION=1.3.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; } @@ -4366,13 +4366,15 @@ if test "x$CYGNUS" = xyes; then - echo $ac_n "checking for opendir""... $ac_c" 1>&6 -echo "configure:4371: checking for opendir" >&5 + 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:4373: 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; then +if { (eval echo configure:4401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_opendir=yes" else @@ -4416,6 +4418,100 @@ W32READDIR=yes fi + ;; + *)EXTRADEFS="$EXTRADEFS -D__W32READDIR__" + W32READDIR=yes + ;; + esac + if test "x$enable_network" = "xyes"; then + echo $ac_n "checking for socket""... $ac_c" 1>&6 +echo "configure:4429: 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 < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char socket(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_socket) || defined (__stub___socket) +choke me +#else +socket(); +#endif + +; return 0; } +EOF +if { (eval echo configure:4457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_func_socket=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_socket=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'socket`\" = yes"; then + echo "$ac_t""yes" 1>&6 + : +else + echo "$ac_t""no" 1>&6 +echo $ac_n "checking for WSAStartup in -lwsock32""... $ac_c" 1>&6 +echo "configure:4475: 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 +else + ac_save_LIBS="$LIBS" +LIBS="-lwsock32 $LIBS" +cat > conftest.$ac_ext < +#include + +int main() { +WSAStartup(0,0); +; return 0; } +EOF +if { (eval echo configure:4492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "wapi_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "wapi_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$wapi_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + EXTRALIBS="$EXTRALIBS -lwsock32" + EXTRADEFS="$EXTRADEFS -DWINSOCK" +else + echo "$ac_t""no" 1>&6 +fi + +fi + + fi fi @@ -4478,7 +4574,7 @@ echo $ac_n "checking whether to enable audio""... $ac_c" 1>&6 -echo "configure:4482: checking whether to enable audio" >&5 +echo "configure:4578: checking whether to enable audio" >&5 # Check whether --enable-audio or --disable-audio was given. if test "${enable_audio+set}" = set; then enableval="$enable_audio" @@ -4524,7 +4620,7 @@ echo $ac_n "checking for ALSA CFLAGS""... $ac_c" 1>&6 -echo "configure:4528: checking for ALSA CFLAGS" >&5 +echo "configure:4624: 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" @@ -4532,7 +4628,7 @@ echo "$ac_t""$ALSA_CFLAGS" 1>&6 echo $ac_n "checking for ALSA LDFLAGS""... $ac_c" 1>&6 -echo "configure:4536: checking for ALSA LDFLAGS" >&5 +echo "configure:4632: checking for ALSA LDFLAGS" >&5 if test "$alsa_prefix" != "" ; then ALSA_LIBS="$ALSA_LIBS -L$alsa_prefix" LIBS="-L$alsa_prefix" @@ -4544,7 +4640,7 @@ min_alsa_version=0.1.1 echo $ac_n "checking for libasound headers version >= $min_alsa_version""... $ac_c" 1>&6 -echo "configure:4548: checking for libasound headers version >= $min_alsa_version" >&5 +echo "configure:4644: 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/'` @@ -4554,7 +4650,7 @@ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` cat > conftest.$ac_ext < @@ -4595,7 +4691,7 @@ ; return 0; } EOF -if { (eval echo configure:4599: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4695: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""found." 1>&6 have_alsa=yes @@ -4609,7 +4705,7 @@ rm -f conftest* echo $ac_n "checking for snd_cards in -lasound""... $ac_c" 1>&6 -echo "configure:4613: checking for snd_cards in -lasound" >&5 +echo "configure:4709: 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 @@ -4617,7 +4713,7 @@ ac_save_LIBS="$LIBS" LIBS="-lasound $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4769,62 +4865,51 @@ if test "$NEEDDLOPEN" = "yes"; then have_dl=no + echo $ac_n "checking for LoadLibraryExA""... $ac_c" 1>&6 -echo "configure:4774: checking for LoadLibraryExA" >&5 -if eval "test \"`echo '$''{'ac_cv_func_LoadLibraryExA'+set}'`\" = set"; then +echo "configure:4871: checking for LoadLibraryExA" >&5 +if eval "test \"`echo '$''{'wapi_cv_func_LoadLibraryExA'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char LoadLibraryExA(); +#include -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_LoadLibraryExA) || defined (__stub___LoadLibraryExA) -choke me -#else -LoadLibraryExA(); -#endif +int main() { +LoadLibraryExA(0,0,0); ; return 0; } EOF -if { (eval echo configure:4802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* - eval "ac_cv_func_LoadLibraryExA=yes" + wapi_cv_func_LoadLibraryExA=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_func_LoadLibraryExA=no" + wapi_cv_func_LoadLibraryExA=no fi rm -f conftest* fi -if eval "test \"`echo '$ac_cv_func_'LoadLibraryExA`\" = yes"; then +if eval "test \"`echo '$wapi_cv_func_'LoadLibraryExA`\" = yes"; then echo "$ac_t""yes" 1>&6 have_dl=cygwin else echo "$ac_t""no" 1>&6 fi + test $wapi_cv_func_LoadLibraryExA = yes && have_dl=cygwin + if test "$have_dl" = "no"; then echo $ac_n "checking for shl_load""... $ac_c" 1>&6 -echo "configure:4823: checking for shl_load" >&5 +echo "configure:4908: 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; then +if { (eval echo configure:4936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_shl_load=yes" else @@ -4872,12 +4957,12 @@ fi if test "$have_dl" = "no"; then echo $ac_n "checking for dlopen""... $ac_c" 1>&6 -echo "configure:4876: checking for dlopen" >&5 +echo "configure:4961: 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; then +if { (eval echo configure:4989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_dlopen=yes" else @@ -4922,12 +5007,12 @@ fi if test "$have_dl" = "no"; then echo $ac_n "checking for dld_init""... $ac_c" 1>&6 -echo "configure:4926: checking for dld_init" >&5 +echo "configure:5011: 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; then +if { (eval echo configure:5039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_dld_init=yes" else @@ -4972,7 +5057,7 @@ fi if test "$have_dl" = "no"; then echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6 -echo "configure:4976: checking for dld_init in -ldld" >&5 +echo "configure:5061: 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 @@ -4980,7 +5065,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5014,13 +5099,13 @@ fi echo $ac_n "checking dynamic link method""... $ac_c" 1>&6 -echo "configure:5018: checking dynamic link method" >&5 +echo "configure:5103: 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:5024: checking whether your dlsym() needs a leading underscore" >&5 +echo "configure:5109: 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 @@ -5168,17 +5253,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5172: checking for $ac_hdr" >&5 +echo "configure:5257: 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:5182: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5267: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5205,7 +5290,7 @@ done echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6 -echo "configure:5209: checking for initscr in -lncurses" >&5 +echo "configure:5294: 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 @@ -5213,7 +5298,7 @@ ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5303,7 +5388,7 @@ enableval="$enable_slang" case "x$enable_slang" in xyes|xdynamic) KEEPLIBS=$LIBS echo $ac_n "checking for SLang_init_tty in -lslang""... $ac_c" 1>&6 -echo "configure:5307: checking for SLang_init_tty in -lslang" >&5 +echo "configure:5392: 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 @@ -5311,7 +5396,7 @@ ac_save_LIBS="$LIBS" LIBS="-lslang $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5375,7 +5460,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:5379: checking for initscr in -ltermcap" >&5 +echo "configure:5464: 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 @@ -5383,7 +5468,7 @@ ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5512,7 +5597,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:5516: checking for Tcl_Init in -l$l" >&5 +echo "configure:5601: 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 @@ -5520,7 +5605,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$l $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5555,7 +5640,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:5559: checking for Tk_Init in -l$l" >&5 +echo "configure:5644: 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 @@ -5563,7 +5648,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$l $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5935,7 +6020,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:5939: checking for $ac_word" >&5 +echo "configure:6024: 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 @@ -5966,7 +6051,7 @@ min_gtk_version=1.1.3 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:5970: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:6055: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" = "no" ; then no_gtk=yes @@ -5989,7 +6074,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -6055,7 +6140,7 @@ } EOF -if { (eval echo configure:6059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -6089,7 +6174,7 @@ CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat > conftest.$ac_ext < @@ -6099,7 +6184,7 @@ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ; return 0; } EOF -if { (eval echo configure:6103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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" @@ -6178,17 +6263,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:6182: checking for X11/xpm.h" >&5 +echo "configure:6267: 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:6192: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6277: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -6211,7 +6296,7 @@ fi echo $ac_n "checking for XpmCreatePixmapFromData in -lXpm""... $ac_c" 1>&6 -echo "configure:6215: checking for XpmCreatePixmapFromData in -lXpm" >&5 +echo "configure:6300: 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 @@ -6219,7 +6304,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXpm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6302,7 +6387,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:6306: checking for DndInitialize in -lDnd" >&5 +echo "configure:6391: 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 @@ -6310,7 +6395,7 @@ ac_save_LIBS="$LIBS" LIBS="-lDnd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else diff -ruN TiMidity++-1.3.0/configure.in TiMidity++-1.3.1/configure.in --- TiMidity++-1.3.0/configure.in Tue Feb 2 18:13:13 1999 +++ TiMidity++-1.3.1/configure.in Fri Feb 5 13:37:00 1999 @@ -54,7 +54,7 @@ AC_INIT(timidity/timidity.c) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(TiMidity++, 1.3.0, no-define) +AM_INIT_AUTOMAKE(TiMidity++, 1.3.1, no-define) dnl To use CONTAINS() macro (See acinclude.m4) CONTAINS_INIT @@ -282,9 +282,24 @@ dnl checking on cygnus if test "x$CYGNUS" = xyes; then - AC_CHECK_FUNC(opendir,, + 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*) + AC_CHECK_FUNC(opendir,, [ EXTRADEFS="$EXTRADEFS -D__W32READDIR__" W32READDIR=yes ]) + ;; + *)EXTRADEFS="$EXTRADEFS -D__W32READDIR__" + W32READDIR=yes + ;; + esac + if test "x$enable_network" = "xyes"; then + AC_CHECK_FUNC(socket,, + WAPI_CHECK_LIB(wsock32,WSAStartup, + [#include ], + [WSAStartup(0,0);], + [ EXTRALIBS="$EXTRALIBS -lwsock32" + EXTRADEFS="$EXTRADEFS -DWINSOCK" ])) + fi fi @@ -454,7 +469,10 @@ if test "$NEEDDLOPEN" = "yes"; then have_dl=no - AC_CHECK_FUNC(LoadLibraryExA,have_dl=cygwin) + + WAPI_CHECK_FUNC(LoadLibraryExA,,[LoadLibraryExA(0,0,0);],have_dl=cygwin) + test $wapi_cv_func_LoadLibraryExA = yes && have_dl=cygwin + if test "$have_dl" = "no"; then AC_CHECK_FUNC(shl_load,have_dl=hpux) fi diff -ruN TiMidity++-1.3.0/interface/Makefile.am TiMidity++-1.3.1/interface/Makefile.am --- TiMidity++-1.3.0/interface/Makefile.am Mon Feb 1 12:29:37 1999 +++ TiMidity++-1.3.1/interface/Makefile.am Fri Feb 5 13:46:00 1999 @@ -262,32 +262,35 @@ url_buff.$(so): $(top_srcdir)/libarc/url_buff.c $(COMPILE) $(SHCFLAGS) -o $@ -c $< -interface_n.$(so): ncurs_c.$(so) bitset.$(so) timer.$(so) - $(SHLD) -o $@ ncurs_c.$(so) bitset.$(so) timer.$(so) $(n_so_libs) +support.$(so): $(top_srcdir)/utils/support.c + $(COMPILE) $(SHCFLAGS) -o $@ -c $< -interface_s.$(so): slang_c.$(so) timer.$(so) - $(SHLD) -o $@ slang_c.$(so) timer.$(so) $(s_so_libs) +interface_n.$(so): ncurs_c.$(so) support.$(so) bitset.$(so) timer.$(so) + $(SHLD) -o $@ ncurs_c.$(so) support.$(so) bitset.$(so) timer.$(so) $(n_so_libs) -interface_m.$(so): motif_c.$(so) motif_i.$(so) motif_p.$(so) - $(SHLD) -o $@ motif_c.$(so) motif_i.$(so) motif_p.$(so) $(m_so_libs) +interface_s.$(so): slang_c.$(so) support.$(so) timer.$(so) + $(SHLD) -o $@ slang_c.$(so) support.$(so) timer.$(so) $(s_so_libs) -interface_k.$(so): tk_c.$(so) - $(SHLD) -o $@ tk_c.$(so) $(k_so_libs) +interface_m.$(so): motif_c.$(so) support.$(so) motif_i.$(so) motif_p.$(so) + $(SHLD) -o $@ motif_c.$(so) support.$(so) motif_i.$(so) motif_p.$(so) $(m_so_libs) -interface_e.$(so): emacs_c.$(so) - $(SHLD) -o $@ emacs_c.$(so) $(e_so_libs) +interface_k.$(so): tk_c.$(so) support.$(so) + $(SHLD) -o $@ tk_c.$(so) support.$(so) $(k_so_libs) -interface_T.$(so): vt100_c.$(so) vt100.$(so) bitset.$(so) timer.$(so) - $(SHLD) -o $@ vt100_c.$(so) vt100.$(so) bitset.$(so) timer.$(so) $(T_so_libs) +interface_e.$(so): emacs_c.$(so) support.$(so) + $(SHLD) -o $@ emacs_c.$(so) support.$(so) $(e_so_libs) -interface_a.$(so): xaw_c.$(so) xaw_i.$(so) timer.$(so) - $(SHLD) -o $@ xaw_c.$(so) xaw_i.$(so) timer.$(so) $(a_so_libs) +interface_T.$(so): vt100_c.$(so) support.$(so) vt100.$(so) bitset.$(so) timer.$(so) + $(SHLD) -o $@ vt100_c.$(so) support.$(so) vt100.$(so) bitset.$(so) timer.$(so) $(T_so_libs) -interface_i.$(so): xskin_c.$(so) xskin_i.$(so) xskin_loadBMP.$(so) xskin_spectrum.$(so) url_buff.$(so) - $(SHLD) -o $@ xskin_c.$(so) xskin_i.$(so) xskin_loadBMP.$(so) xskin_spectrum.$(so) url_buff.$(so) $(i_so_libs) +interface_a.$(so): xaw_c.$(so) support.$(so) xaw_i.$(so) timer.$(so) + $(SHLD) -o $@ xaw_c.$(so) support.$(so) xaw_i.$(so) timer.$(so) $(a_so_libs) -interface_g.$(so): gtk_c.$(so) gtk_i.$(so) gtk_p.$(so) - $(SHLD) -o $@ gtk_c.$(so) gtk_i.$(so) gtk_p.$(so) $(g_so_libs) +interface_i.$(so): xskin_c.$(so) support.$(so) xskin_i.$(so) xskin_loadBMP.$(so) xskin_spectrum.$(so) url_buff.$(so) + $(SHLD) -o $@ xskin_c.$(so) support.$(so) xskin_i.$(so) xskin_loadBMP.$(so) xskin_spectrum.$(so) url_buff.$(so) $(i_so_libs) + +interface_g.$(so): gtk_c.$(so) support.$(so) gtk_i.$(so) gtk_p.$(so) + $(SHLD) -o $@ gtk_c.$(so) support.$(so) gtk_i.$(so) gtk_p.$(so) $(g_so_libs) clean-compile: diff -ruN TiMidity++-1.3.0/interface/Makefile.in TiMidity++-1.3.1/interface/Makefile.in --- TiMidity++-1.3.0/interface/Makefile.in Wed Feb 3 07:27:48 1999 +++ TiMidity++-1.3.1/interface/Makefile.in Fri Feb 5 14:40:49 1999 @@ -647,32 +647,35 @@ @NEEDDLOPEN_TRUE@url_buff.$(so): $(top_srcdir)/libarc/url_buff.c @NEEDDLOPEN_TRUE@ $(COMPILE) $(SHCFLAGS) -o $@ -c $< -@NEEDDLOPEN_TRUE@interface_n.$(so): ncurs_c.$(so) bitset.$(so) timer.$(so) -@NEEDDLOPEN_TRUE@ $(SHLD) -o $@ ncurs_c.$(so) bitset.$(so) timer.$(so) $(n_so_libs) +@NEEDDLOPEN_TRUE@support.$(so): $(top_srcdir)/utils/support.c +@NEEDDLOPEN_TRUE@ $(COMPILE) $(SHCFLAGS) -o $@ -c $< -@NEEDDLOPEN_TRUE@interface_s.$(so): slang_c.$(so) timer.$(so) -@NEEDDLOPEN_TRUE@ $(SHLD) -o $@ slang_c.$(so) timer.$(so) $(s_so_libs) +@NEEDDLOPEN_TRUE@interface_n.$(so): ncurs_c.$(so) support.$(so) bitset.$(so) timer.$(so) +@NEEDDLOPEN_TRUE@ $(SHLD) -o $@ ncurs_c.$(so) support.$(so) bitset.$(so) timer.$(so) $(n_so_libs) -@NEEDDLOPEN_TRUE@interface_m.$(so): motif_c.$(so) motif_i.$(so) motif_p.$(so) -@NEEDDLOPEN_TRUE@ $(SHLD) -o $@ motif_c.$(so) motif_i.$(so) motif_p.$(so) $(m_so_libs) +@NEEDDLOPEN_TRUE@interface_s.$(so): slang_c.$(so) support.$(so) timer.$(so) +@NEEDDLOPEN_TRUE@ $(SHLD) -o $@ slang_c.$(so) support.$(so) timer.$(so) $(s_so_libs) -@NEEDDLOPEN_TRUE@interface_k.$(so): tk_c.$(so) -@NEEDDLOPEN_TRUE@ $(SHLD) -o $@ tk_c.$(so) $(k_so_libs) +@NEEDDLOPEN_TRUE@interface_m.$(so): motif_c.$(so) support.$(so) motif_i.$(so) motif_p.$(so) +@NEEDDLOPEN_TRUE@ $(SHLD) -o $@ motif_c.$(so) support.$(so) motif_i.$(so) motif_p.$(so) $(m_so_libs) -@NEEDDLOPEN_TRUE@interface_e.$(so): emacs_c.$(so) -@NEEDDLOPEN_TRUE@ $(SHLD) -o $@ emacs_c.$(so) $(e_so_libs) +@NEEDDLOPEN_TRUE@interface_k.$(so): tk_c.$(so) support.$(so) +@NEEDDLOPEN_TRUE@ $(SHLD) -o $@ tk_c.$(so) support.$(so) $(k_so_libs) -@NEEDDLOPEN_TRUE@interface_T.$(so): vt100_c.$(so) vt100.$(so) bitset.$(so) timer.$(so) -@NEEDDLOPEN_TRUE@ $(SHLD) -o $@ vt100_c.$(so) vt100.$(so) bitset.$(so) timer.$(so) $(T_so_libs) +@NEEDDLOPEN_TRUE@interface_e.$(so): emacs_c.$(so) support.$(so) +@NEEDDLOPEN_TRUE@ $(SHLD) -o $@ emacs_c.$(so) support.$(so) $(e_so_libs) -@NEEDDLOPEN_TRUE@interface_a.$(so): xaw_c.$(so) xaw_i.$(so) timer.$(so) -@NEEDDLOPEN_TRUE@ $(SHLD) -o $@ xaw_c.$(so) xaw_i.$(so) timer.$(so) $(a_so_libs) +@NEEDDLOPEN_TRUE@interface_T.$(so): vt100_c.$(so) support.$(so) vt100.$(so) bitset.$(so) timer.$(so) +@NEEDDLOPEN_TRUE@ $(SHLD) -o $@ vt100_c.$(so) support.$(so) vt100.$(so) bitset.$(so) timer.$(so) $(T_so_libs) -@NEEDDLOPEN_TRUE@interface_i.$(so): xskin_c.$(so) xskin_i.$(so) xskin_loadBMP.$(so) xskin_spectrum.$(so) url_buff.$(so) -@NEEDDLOPEN_TRUE@ $(SHLD) -o $@ xskin_c.$(so) xskin_i.$(so) xskin_loadBMP.$(so) xskin_spectrum.$(so) url_buff.$(so) $(i_so_libs) +@NEEDDLOPEN_TRUE@interface_a.$(so): xaw_c.$(so) support.$(so) xaw_i.$(so) timer.$(so) +@NEEDDLOPEN_TRUE@ $(SHLD) -o $@ xaw_c.$(so) support.$(so) xaw_i.$(so) timer.$(so) $(a_so_libs) -@NEEDDLOPEN_TRUE@interface_g.$(so): gtk_c.$(so) gtk_i.$(so) gtk_p.$(so) -@NEEDDLOPEN_TRUE@ $(SHLD) -o $@ gtk_c.$(so) gtk_i.$(so) gtk_p.$(so) $(g_so_libs) +@NEEDDLOPEN_TRUE@interface_i.$(so): xskin_c.$(so) support.$(so) xskin_i.$(so) xskin_loadBMP.$(so) xskin_spectrum.$(so) url_buff.$(so) +@NEEDDLOPEN_TRUE@ $(SHLD) -o $@ xskin_c.$(so) support.$(so) xskin_i.$(so) xskin_loadBMP.$(so) xskin_spectrum.$(so) url_buff.$(so) $(i_so_libs) + +@NEEDDLOPEN_TRUE@interface_g.$(so): gtk_c.$(so) support.$(so) gtk_i.$(so) gtk_p.$(so) +@NEEDDLOPEN_TRUE@ $(SHLD) -o $@ gtk_c.$(so) support.$(so) gtk_i.$(so) gtk_p.$(so) $(g_so_libs) @NEEDDLOPEN_TRUE@clean-compile: @NEEDDLOPEN_TRUE@ -rm -f *.$(so) diff -ruN TiMidity++-1.3.0/interface/wrdt_wincon.c TiMidity++-1.3.1/interface/wrdt_wincon.c --- TiMidity++-1.3.0/interface/wrdt_wincon.c Tue Feb 2 20:31:16 1999 +++ TiMidity++-1.3.1/interface/wrdt_wincon.c Fri Feb 5 14:14:19 1999 @@ -52,9 +52,8 @@ #include "wrd.h" // #define DEBUG1 -#ifdef __CYGWIN32__ +#ifndef __BORLANDC__ #define USE_ESC - #define NULL_STMT do ; while(0) #define gotoxy(x, y) NULL_STMT #define wherex() 1 @@ -64,9 +63,7 @@ #define delline() NULL_STMT #define clrscr() NULL_STMT #define clreol() NULL_STMT - - -#endif /* __CYGWIN32__ */ +#endif /* __BORLANDC__ */ static int wrdt_open(char *dummy); static void wrdt_apply(int cmd, int wrd_argc, int wrd_args[]); diff -ruN TiMidity++-1.3.0/libarc/url.h TiMidity++-1.3.1/libarc/url.h --- TiMidity++-1.3.0/libarc/url.h Mon Nov 2 12:29:06 1998 +++ TiMidity++-1.3.1/libarc/url.h Thu Feb 4 14:37:29 1999 @@ -6,7 +6,7 @@ * http://www.goice.co.jp/member/mo/release/index.html#liburl */ -#define URL_LIB_VERSION "1.8.6" +#define URL_LIB_VERSION "1.8.7" /* Define if you want to enable pipe command scheme ("command|") */ #define PIPE_SCHEME_ENABLE diff -ruN TiMidity++-1.3.0/libarc/url_dir.c TiMidity++-1.3.1/libarc/url_dir.c --- TiMidity++-1.3.0/libarc/url_dir.c Wed Feb 3 06:29:13 1999 +++ TiMidity++-1.3.1/libarc/url_dir.c Thu Feb 4 16:02:32 1999 @@ -12,7 +12,7 @@ #include "url.h" -#ifdef __W32_READDIR__ +#ifdef __W32READDIR__ #include "readdir.h" # define NAMLEN(dirent) strlen((dirent)->d_name) #else @@ -42,11 +42,10 @@ #include "strtab.h" struct dir_cache_t { - char *dirname; char **fnames; dev_t dev; ino_t ino; - time_t dir_ctime; + time_t dir_mtime; struct dir_cache_t *next; }; static struct dir_cache_t *dir_cache = NULL; @@ -58,32 +57,29 @@ StringTable stab; DIR *dirp; struct dirent *d; + int allocated; if(p == NULL) { if((p = (struct dir_cache_t *)malloc(sizeof(struct dir_cache_t))) == NULL) return NULL; - } + allocated = 1; + } else + allocated = 0; /* save directory information */ - if((p->dirname = strdup(dirname)) == NULL) - { - url_errno = errno; - free(p); - errno = url_errno; - return NULL; - } p->ino = s->st_ino; p->dev = s->st_dev; - p->dir_ctime = s->st_ctime; + p->dir_mtime = s->st_mtime; if((dirp = opendir(dirname)) == NULL) { url_errno = errno; - free(p->dirname); - free(p); - p->dirname = NULL; + if(allocated) + free(p); + else + p->ino = 0; /* remove directory entry */ errno = url_errno; return NULL; } @@ -104,10 +100,11 @@ { url_errno = errno; delete_string_table(&stab); - free(p->dirname); - free(p); + if(allocated) + free(p); + else + p->ino = 0; /* remove directory entry */ closedir(dirp); - p->dirname = NULL; errno = url_errno; return NULL; } @@ -120,9 +117,10 @@ { url_errno = errno; delete_string_table(&stab); - free(p->dirname); - free(p); - p->dirname = NULL; + if(allocated) + free(p); + else + p->ino = 0; /* remove directory entry */ errno = url_errno; return NULL; } @@ -145,31 +143,30 @@ q = NULL; for(p = dir_cache; p; p = p->next) { - if(p->dirname == NULL) + if(p->ino == 0) { + /* Entry is removed. + * Save the entry to `q' which is reused for puting in new entry. + */ if(q != NULL) q = p; - continue; /* deleted entry */ + continue; } - if(!strcmp(p->dirname, dirname)) + if(s.st_dev == p->dev && s.st_ino == p->ino) { - if(s.st_dev == p->dev && s.st_ino == p->ino && - p->dir_ctime == s.st_ctime) - return p; /* found */ + /* found */ + if(p->dir_mtime == s.st_mtime) + return p; - /* File is updated */ - free(p->dirname); + /* Directory entry is updated */ free(p->fnames[0]); free(p->fnames); return scan_cached_files(p, &s, dirname); } } /* New directory */ - if(q != NULL) - return scan_cached_files(p, &s, dirname); - p = scan_cached_files(NULL, &s, dirname); - if(p == NULL) + if((p = scan_cached_files(q, &s, dirname)) == NULL) return NULL; p->next = dir_cache; dir_cache = p; @@ -254,7 +251,7 @@ url->ptr = NULL; url->len = 0; url->total = 0; - url->dirname = d->dirname; + url->dirname = strdup(dname); url->endp = 0; return (URL)url; @@ -315,7 +312,7 @@ url->ptr = NULL; url->len = 0; url->total = 0; - url->dirname = dirname; + url->dirname = strdup(dname); url->endp = 0; return (URL)url; @@ -336,12 +333,12 @@ static void url_dir_close(URL url) { -#ifndef URL_DIR_CACHE_ENABLE URL_dir *urlp = (URL_dir *)url; +#ifndef URL_DIR_CACHE_ENABLE closedir(urlp->dirp); - free(urlp->dirname); #endif - free(url); + free(urlp->dirname); + free(urlp); } static long url_dir_read(URL url, void *buff, long n) diff -ruN TiMidity++-1.3.0/stamp-h1.in TiMidity++-1.3.1/stamp-h1.in --- TiMidity++-1.3.0/stamp-h1.in Wed Feb 3 05:13:47 1999 +++ TiMidity++-1.3.1/stamp-h1.in Fri Feb 5 14:36:01 1999 @@ -1 +0,0 @@ -timestamp diff -ruN TiMidity++-1.3.0/stamp-h2.in TiMidity++-1.3.1/stamp-h2.in --- TiMidity++-1.3.0/stamp-h2.in Wed Feb 3 05:13:50 1999 +++ TiMidity++-1.3.1/stamp-h2.in Fri Feb 5 14:36:01 1999 @@ -1 +0,0 @@ -timestamp diff -ruN TiMidity++-1.3.0/timidity/Makefile.am TiMidity++-1.3.1/timidity/Makefile.am --- TiMidity++-1.3.0/timidity/Makefile.am Wed Feb 3 06:36:26 1999 +++ TiMidity++-1.3.1/timidity/Makefile.am Thu Feb 4 16:46:21 1999 @@ -115,8 +115,7 @@ $(SYSEXTRAS:.c=.o) \ $(top_builddir)/interface/libinterface.a \ $(top_builddir)/libarc/libarc.a \ - $(top_builddir)/utils/libutils.a \ - @EXTRALIBS@ + $(top_builddir)/utils/libutils.a timidity_DEPENDENCIES = $(SYSEXTRAS:.c=.o) \ $(top_builddir)/interface/libinterface.a \ diff -ruN TiMidity++-1.3.0/timidity/Makefile.in TiMidity++-1.3.1/timidity/Makefile.in --- TiMidity++-1.3.0/timidity/Makefile.in Wed Feb 3 07:28:03 1999 +++ TiMidity++-1.3.1/timidity/Makefile.in Fri Feb 5 14:40:57 1999 @@ -204,8 +204,7 @@ $(SYSEXTRAS:.c=.o) \ $(top_builddir)/interface/libinterface.a \ $(top_builddir)/libarc/libarc.a \ - $(top_builddir)/utils/libutils.a \ - @EXTRALIBS@ + $(top_builddir)/utils/libutils.a timidity_DEPENDENCIES = $(SYSEXTRAS:.c=.o) \ $(top_builddir)/interface/libinterface.a \ diff -ruN TiMidity++-1.3.0/timidity/audriv_al.c TiMidity++-1.3.1/timidity/audriv_al.c --- TiMidity++-1.3.0/timidity/audriv_al.c Tue Feb 2 15:53:08 1999 +++ TiMidity++-1.3.1/timidity/audriv_al.c Wed Feb 3 17:29:03 1999 @@ -675,23 +675,6 @@ return True; } -#ifndef HAVE_USLEEP -/* IRIX 5.? */ -#include -#include -#include -static int xusleep(unsigned long usec) -{ - struct timeval tv; - - tv.tv_sec = usec / 1000000; - tv.tv_usec = usec % 1000000; - return select(0, NULL, NULL, NULL, &tv); -} -#define usleep xusleep -#endif - - void audriv_wait_play(void) /* CPU パワーを浪費しないようにするために，一時的に停止します．*/ { diff -ruN TiMidity++-1.3.0/timidity/audriv_sun.c TiMidity++-1.3.1/timidity/audriv_sun.c --- TiMidity++-1.3.0/timidity/audriv_sun.c Tue Feb 2 15:53:31 1999 +++ TiMidity++-1.3.1/timidity/audriv_sun.c Wed Feb 3 17:29:33 1999 @@ -67,7 +67,6 @@ #define AUDRIV_AENC_SIGWORD AENC_SIGWORDL #else #define AUDRIV_AENC_SIGWORD AENC_SIGWORDB -int usleep(unsigned int useconds); /* shut gcc warning up */ #endif #else /* for SunOS 4.x */ #include diff -ruN TiMidity++-1.3.0/timidity/dl_cygwin32.c TiMidity++-1.3.1/timidity/dl_cygwin32.c --- TiMidity++-1.3.0/timidity/dl_cygwin32.c Mon Nov 30 17:35:16 1998 +++ TiMidity++-1.3.1/timidity/dl_cygwin32.c Thu Feb 4 15:46:43 1999 @@ -66,7 +66,7 @@ #include #endif #include "timidity.h" -#include "dlutils.c" +#include "dlutils.h" /*ARGSUSED*/ void dl_init(int argc, char **argv) @@ -82,6 +82,8 @@ LOAD_WITH_ALTERED_SEARCH_PATH); if(RETVAL == NULL) fprintf(stderr, "%d", GetLastError()); + +#if 0 else { // setup the dll's impure_ptr: @@ -97,6 +99,7 @@ (*impure_setupptr)(_impure_ptr); } } +#endif return RETVAL; } diff -ruN TiMidity++-1.3.0/timidity/playmidi.c TiMidity++-1.3.1/timidity/playmidi.c --- TiMidity++-1.3.0/timidity/playmidi.c Wed Feb 3 04:40:38 1999 +++ TiMidity++-1.3.1/timidity/playmidi.c Wed Feb 3 17:23:25 1999 @@ -98,7 +98,7 @@ static void set_reverb_level(int ch, int level); static int make_rvid_flag = 0; static int data_output_count; -#define fragment_start_count (play_mode->rate/2) +#define fragment_start_count (play_mode->rate) /* Ring voice id for each notes */ static uint8 vidq_head[128 * MAX_CHANNELS], vidq_tail[128 * MAX_CHANNELS]; @@ -2699,6 +2699,7 @@ if(ctl->trace_playing) { rc = play_mode->flush_output(); /* Wait until play out */ + data_output_count = 0; if(RC_IS_SKIP_FILE(rc)) goto midi_end; } @@ -2708,11 +2709,7 @@ while(play_mode->play_loop()) { int rc; -#ifdef HAVE_USLEEP usleep(100000); -#else - sleep(1); -#endif rc = check_apply_control(); if(RC_IS_SKIP_FILE(rc)) goto midi_end; @@ -3224,6 +3221,7 @@ static int play_count = 0; rc = play_mode->flush_output(); + data_output_count = 0; if(RC_IS_SKIP_FILE(rc)) return rc; @@ -3394,6 +3392,7 @@ break; } play_mode->flush_output(); + data_output_count = 0; return; case RC_QUIT: diff -ruN TiMidity++-1.3.0/timidity/timidity.c TiMidity++-1.3.1/timidity/timidity.c --- TiMidity++-1.3.0/timidity/timidity.c Wed Feb 3 05:25:15 1999 +++ TiMidity++-1.3.1/timidity/timidity.c Fri Feb 5 13:51:44 1999 @@ -542,7 +542,7 @@ for(cmp = ctl_list; *cmp; cmp++) mark[(int)(*cmp)->id_character] = 1; - list_dyna_interface(fp, SHARED_LIB_PATH, mark); + list_dyna_interface(fp, dynamic_lib_root, mark); } #endif /* IA_DYNAMIC */ fputs(NLS, fp); @@ -1776,8 +1776,8 @@ ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "%s: line %d: Program must be between " "%d and %d", - progbase, 127 + progbase, - name, line); + name, line, + progbase, 127 + progbase); CHECKERRLIMIT; continue; } @@ -1814,8 +1814,8 @@ ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "%s: line %d: Program must be between " "%d and %d", - progbase, 127 + progbase, - name, line); + name, line, + progbase, 127 + progbase); CHECKERRLIMIT; continue; } @@ -1846,6 +1846,11 @@ } #ifdef SUPPORT_SOCKET + +#if defined(__WIN32__) && !defined(MAIL_NAME) +#define MAIL_NAME "anonymous" +#endif /* __WIN32__ */ + #ifdef MAIL_NAME #define get_username() MAIL_NAME #else /* MAIL_NAME */ diff -ruN TiMidity++-1.3.0/timidity/timidity.h TiMidity++-1.3.1/timidity/timidity.h --- TiMidity++-1.3.0/timidity/timidity.h Wed Feb 3 05:59:56 1999 +++ TiMidity++-1.3.1/timidity/timidity.h Wed Feb 3 17:30:26 1999 @@ -516,11 +516,15 @@ #endif #ifdef sun -#ifndef SOLARIS /* SunOS 4.x */ +#ifndef SOLARIS +/* SunOS 4.x */ #include #include #define memcpy(x, y, n) bcopy(y, x, n) -#endif /* SunOS 4.x */ +#else +/* Solaris */ +int usleep(unsigned int useconds); /* shut gcc warning up */ +#endif extern int errno; extern int opterr; extern int optind; @@ -613,7 +617,7 @@ #endif /* HAVE_SNPRINTF */ #ifndef HAVE_GETOPT -extern int getopt(int argc, char *argv[], char *optionS) +extern int getopt(int argc, char *argv[], char *optionS); #endif /* HAVE_GETOPT */ #ifndef HAVE_STRERROR @@ -621,7 +625,7 @@ #endif /* HAVE_STRERROR */ #ifndef HAVE_USLEEP -extern int usleep(unsigned int usec) +extern int usleep(unsigned int usec); #endif #ifndef HAVE_SLEEP diff -ruN TiMidity++-1.3.0/timidity/win_a.c TiMidity++-1.3.1/timidity/win_a.c --- TiMidity++-1.3.0/timidity/win_a.c Wed Feb 3 05:02:49 1999 +++ TiMidity++-1.3.1/timidity/win_a.c Fri Feb 5 14:14:32 1999 @@ -38,7 +38,7 @@ #endif #include -#ifdef __CYGWIN32__ +#if defined(__CYGWIN32__) || defined(__MINGW32__) #define HAVE_WAVEFORMAT_CBSIZE /* On cygnus, there is no header file for Multimedia API's. */ /* Then declare some of them here. */ @@ -123,8 +123,7 @@ extern int default_play_event(void *); -/* #define DATA_BLOCK_SIZE (1024*2) for small shared memory implementation */ -#define DATA_BLOCK_SIZE (1024*16) +#define DATA_BLOCK_SIZE (2*AUDIO_BUFFER_SIZE) #define DATA_BLOCK_NUM (dpm.extra_param[0]) #define DATA_MIN_NBLOCKS (DATA_BLOCK_NUM-1) @@ -155,7 +154,7 @@ PlayMode dpm = { DEFAULT_RATE, PE_16BIT|PE_SIGNED, PF_NEED_INSTRUMENTS|PF_CAN_TRACE, -1, - {16}, + {32}, "Win32 audio driver", 'd', NULL, default_play_event, diff -ruN TiMidity++-1.3.0/utils/net.c TiMidity++-1.3.1/utils/net.c --- TiMidity++-1.3.0/utils/net.c Tue Feb 2 17:24:09 1999 +++ TiMidity++-1.3.1/utils/net.c Thu Feb 4 19:23:19 1999 @@ -25,7 +25,7 @@ #endif /* HAVE_CONFIG_H */ #include #include -#if !defined(__WIN32__) || defined(__CYGWIN32__) +#if !defined(WINSOCK) #include #include #include @@ -46,7 +46,7 @@ #define INADDR_NONE 0xffffffff #endif /* INADDR_NONE */ -#if !defined(__WIN32__) || defined(__CYGWIN32__) +#if !defined(WINSOCK) #ifndef INVALID_SOCKET #define INVALID_SOCKET -1 #endif /* INVALID_SOCKET */ @@ -59,6 +59,13 @@ { SOCKET fd; struct sockaddr_in in; + static int first = 1; + + if(first) { + WSADATA dmy; + WSAStartup(MAKEWORD(1,1), &dmy); + first = 0; + } memset(&in, 0, sizeof(in)); if((in.sin_addr.s_addr = inet_addr(host)) == INADDR_NONE) diff -ruN TiMidity++-1.3.0/utils/net.h TiMidity++-1.3.1/utils/net.h --- TiMidity++-1.3.0/utils/net.h Tue Feb 2 17:23:59 1999 +++ TiMidity++-1.3.1/utils/net.h Thu Feb 4 18:13:52 1999 @@ -23,11 +23,15 @@ #ifndef ___NET_H_ #define ___NET_H_ -#if !defined(__WIN32__) || defined(__CYGWIN32__) +#if defined(WINSOCK) +#include +#else typedef int SOCKET; #define closesocket(fd) close(fd) -#else -#include +#define WSADATA int +#define MAKEWORD(a,b) +#define WSAStartup(a,b) +#define WSACleanup() #endif extern SOCKET open_socket(char *host, unsigned short port); diff -ruN TiMidity++-1.3.0/utils/support.c TiMidity++-1.3.1/utils/support.c --- TiMidity++-1.3.0/utils/support.c Wed Feb 3 05:18:24 1999 +++ TiMidity++-1.3.1/utils/support.c Wed Feb 3 17:20:29 1999 @@ -37,7 +37,9 @@ #else #include #endif - +#ifdef __WIN32__ +#include +#endif /* __WIN32__ */ #include "timidity.h" #include "mblock.h"