diff -ruN TiMidity++-2.10.1/ChangeLog TiMidity++-2.10.2/ChangeLog --- TiMidity++-2.10.1/ChangeLog Wed Oct 18 09:09:36 2000 +++ TiMidity++-2.10.2/ChangeLog Thu Nov 2 17:42:25 2000 @@ -1,3 +1,17 @@ +2000-11-02 Masanao Izumo + + * Version 2.10.2 released. + +2000-11-01 Masanao Izumo + + * interface/alsaseq_c.c: Set time tick resolution to 100Hz. + * timidity/aq.c: Bug fix. + * interface/xaw_.c.: Bug fix. + +2000-10-22 Masanao Izumo + + * timidity/mod.c: Bug fix. + 2000-10-18 Masanao Izumo * Version 2.10.1 released. diff -ruN TiMidity++-2.10.1/NEWS TiMidity++-2.10.2/NEWS --- TiMidity++-2.10.1/NEWS Wed Oct 18 09:09:16 2000 +++ TiMidity++-2.10.2/NEWS Thu Nov 2 17:42:30 2000 @@ -1,3 +1,6 @@ +11/02, 2000 + * Version 2.10.2 released. + 10/18, 2000 * Version 2.10.1 released. diff -ruN TiMidity++-2.10.1/configs/msc-config.h TiMidity++-2.10.2/configs/msc-config.h --- TiMidity++-2.10.1/configs/msc-config.h Wed Oct 18 09:10:01 2000 +++ TiMidity++-2.10.2/configs/msc-config.h Thu Nov 2 18:24:19 2000 @@ -261,7 +261,7 @@ /* In VDS Macro AAA=BBB is not available. */ #define __W32__ -#define TIMID_VERSION "2.10.1" +#define TIMID_VERSION "2.10.2" #define DEFAULT_PATH ".\\" #define AU_W32 #define WINSOCK diff -ruN TiMidity++-2.10.1/configure TiMidity++-2.10.2/configure --- TiMidity++-2.10.1/configure Wed Oct 18 08:39:15 2000 +++ TiMidity++-2.10.2/configure Mon Oct 30 21:23:37 2000 @@ -891,7 +891,7 @@ PACKAGE=TiMidity++ -VERSION=2.10.1 +VERSION=2.10.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; } diff -ruN TiMidity++-2.10.1/configure.in TiMidity++-2.10.2/configure.in --- TiMidity++-2.10.1/configure.in Wed Oct 18 08:38:25 2000 +++ TiMidity++-2.10.2/configure.in Mon Oct 30 21:23:31 2000 @@ -55,7 +55,7 @@ AC_INIT(timidity/timidity.c) SHELL=${CONFIG_SHELL-/bin/sh} AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(TiMidity++, 2.10.1, no-define) +AM_INIT_AUTOMAKE(TiMidity++, 2.10.2, no-define) dnl To use CONTAINS() macro (See acinclude.m4) CONTAINS_INIT diff -ruN TiMidity++-2.10.1/interface/alsaseq_c.c TiMidity++-2.10.2/interface/alsaseq_c.c --- TiMidity++-2.10.1/interface/alsaseq_c.c Thu Jul 20 04:10:40 2000 +++ TiMidity++-2.10.2/interface/alsaseq_c.c Thu Nov 2 17:55:07 2000 @@ -141,6 +141,8 @@ * this should be configurable via command line.. */ +#define TICKTIME_HZ 100 + struct seq_context { snd_seq_t *handle; /* The snd_seq handle to /dev/snd/seq */ int client; /* The client associated with this context */ @@ -346,7 +348,7 @@ continue; event_time_offset += (int32)(fill_time * play_mode->rate); #endif - event_time_offset += audio_buffer_size; + event_time_offset += play_mode->rate / TICKTIME_HZ; ev.time = event_time_offset; ev.type = ME_NONE; play_event(&ev); diff -ruN TiMidity++-2.10.1/interface/xaw_c.c TiMidity++-2.10.2/interface/xaw_c.c --- TiMidity++-2.10.1/interface/xaw_c.c Sat Feb 19 22:34:16 2000 +++ TiMidity++-2.10.2/interface/xaw_c.c Wed Nov 1 13:42:52 2000 @@ -408,7 +408,7 @@ opt_modulation_wheel = n & MODUL_BIT; opt_portamento = n & PORTA_BIT; opt_nrpn_vibrato = n & NRPNV_BIT; - opt_reverb_control = n & REVERB_BIT; + opt_reverb_control = !!(n & REVERB_BIT); opt_channel_pressure = n & CHPRESSURE_BIT; opt_overlap_voice_allow = n & OVERLAPV_BIT; opt_trace_text_meta_event = n & TXTMETA_BIT; diff -ruN TiMidity++-2.10.1/timidity/Makefile.in TiMidity++-2.10.2/timidity/Makefile.in --- TiMidity++-2.10.1/timidity/Makefile.in Wed Oct 18 09:09:58 2000 +++ TiMidity++-2.10.2/timidity/Makefile.in Thu Nov 2 18:24:16 2000 @@ -315,7 +315,7 @@ mod2midi.o: mod2midi.c ../config.h timidity.h ../utils/support.h \ common.h ../libarc/url.h ../utils/mblock.h instrum.h playmidi.h \ readmidi.h tables.h mod.h output.h controls.h \ - ../libunimod/unimod.h mod2midi.h + ../libunimod/unimod.h mod2midi.h filter.h nas_a.o: nas_a.c ../config.h timidity.h ../utils/support.h common.h \ ../libarc/url.h ../utils/mblock.h output.h controls.h \ ../utils/timer.h instrum.h playmidi.h miditrace.h diff -ruN TiMidity++-2.10.1/timidity/aiff_a.c TiMidity++-2.10.2/timidity/aiff_a.c --- TiMidity++-2.10.1/timidity/aiff_a.c Mon Jul 24 16:38:43 2000 +++ TiMidity++-2.10.2/timidity/aiff_a.c Sun Oct 22 17:42:12 2000 @@ -25,8 +25,8 @@ #include "config.h" #endif /* HAVE_CONFIG_H */ #include -#ifdef __W32__ #include +#ifdef __W32__ #include #else #include @@ -38,6 +38,7 @@ #endif #include #include +#include #include "timidity.h" #include "common.h" diff -ruN TiMidity++-2.10.1/timidity/aq.c TiMidity++-2.10.2/timidity/aq.c --- TiMidity++-2.10.1/timidity/aq.c Mon Jul 24 11:16:04 2000 +++ TiMidity++-2.10.2/timidity/aq.c Wed Nov 1 13:49:28 2000 @@ -645,8 +645,10 @@ if(n == 0) return 0; - if(!nbuckets) - return play_mode->output_data((char *)buf, n); + if(!nbuckets) { + play_mode->output_data((char *)buf, n); + return n; + } if(head == NULL) head = tail = next_allocated_bucket(); diff -ruN TiMidity++-2.10.1/timidity/mod.c TiMidity++-2.10.2/timidity/mod.c --- TiMidity++-2.10.1/timidity/mod.c Tue Oct 17 19:45:21 2000 +++ TiMidity++-2.10.2/timidity/mod.c Sun Oct 22 17:43:53 2000 @@ -60,7 +60,6 @@ int load_module_file (struct timidity_file *tf, int mod_type) { - int i, err; MODULE *mf; #ifdef LOOKUP_HACK @@ -86,8 +85,6 @@ int get_module_type (char *fn) { - char *p; - if (check_file_extension (fn, ".mod", 1)) /* Most common first */ return IS_MOD_FILE; @@ -369,11 +366,12 @@ MP_VOICE *a; ULONG t, k, tvol, pp; + a = mp.voice; for (t = 0; t < MOD_NUM_VOICES; t++) { /* allow us to take over a nonexisting sample */ if (!a->s) - return k; + return t; if (((mp.voice[t].kick == KICK_ABSENT) || (mp.voice[t].kick == KICK_ENV)) && Voice_Stopped (t)) @@ -382,7 +380,6 @@ tvol = 0xffffffUL; t = 0; - a = mp.voice; for (k = 0; k < MOD_NUM_VOICES; k++, a++) if ((a->kick == KICK_ABSENT) || (a->kick == KICK_ENV)) { diff -ruN TiMidity++-2.10.1/timidity/mod2midi.c TiMidity++-2.10.2/timidity/mod2midi.c --- TiMidity++-2.10.1/timidity/mod2midi.c Fri Mar 31 09:54:16 2000 +++ TiMidity++-2.10.2/timidity/mod2midi.c Sun Oct 22 17:41:07 2000 @@ -43,6 +43,7 @@ #include "controls.h" #include "unimod.h" #include "mod2midi.h" +#include "filter.h" /* Define this to show all the notes touched by a bending in the @@ -382,10 +383,10 @@ TURN_OFF_8((base), 0) \ } while(0) - if (j = ModV[v].noteson[0]) TURN_OFF_32(0); - if (j = ModV[v].noteson[1]) TURN_OFF_32(32); - if (j = ModV[v].noteson[2]) TURN_OFF_32(64); - if (j = ModV[v].noteson[3]) TURN_OFF_32(96); + if ((j = ModV[v].noteson[0]) != 0) TURN_OFF_32(0); + if ((j = ModV[v].noteson[1]) != 0) TURN_OFF_32(32); + if ((j = ModV[v].noteson[2]) != 0) TURN_OFF_32(64); + if ((j = ModV[v].noteson[3]) != 0) TURN_OFF_32(96); bitmapClear(ModV[v].noteson); ModV[v].noteon = -1; } diff -ruN TiMidity++-2.10.1/timidity/mod2midi.h TiMidity++-2.10.2/timidity/mod2midi.h --- TiMidity++-2.10.1/timidity/mod2midi.h Mon Mar 20 15:47:35 2000 +++ TiMidity++-2.10.2/timidity/mod2midi.h Sun Oct 22 17:10:12 2000 @@ -36,3 +36,4 @@ void Voice_StartPlaying (); void Voice_EndPlaying (); void load_module_samples (SAMPLE *, int, int); +void Voice_SetPeriod (UBYTE v, ULONG period); diff -ruN TiMidity++-2.10.1/timidity/sun_a.c TiMidity++-2.10.2/timidity/sun_a.c --- TiMidity++-2.10.1/timidity/sun_a.c Mon Feb 7 07:56:00 2000 +++ TiMidity++-2.10.2/timidity/sun_a.c Wed Nov 1 13:20:33 2000 @@ -261,11 +261,7 @@ ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "%s: %s", dpm.name, strerror(errno)); if(errno == EINTR || errno == EAGAIN) - { - n = nbytes; goto retry_write; - } - return -1; } diff -ruN TiMidity++-2.10.1/timidity/timpp32g.ini TiMidity++-2.10.2/timidity/timpp32g.ini --- TiMidity++-2.10.1/timidity/timpp32g.ini Tue Oct 5 16:00:49 1999 +++ TiMidity++-2.10.2/timidity/timpp32g.ini Thu Nov 2 18:22:33 2000 @@ -1,5 +1,5 @@ [PLAYER] -IniVersion=2.1 +IniVersion=2.2 InitMinimizeFlag=0 DebugWndStartFlag=1 ConsoleWndStartFlag=0 @@ -43,6 +43,7 @@ DocWndIndependent=0 SeachDirRecursive=0 IniFileAutoSave=1 +SecondMode=0 [TIMIDITY] amplification=70 @@ -116,4 +117,5 @@ free_instruments_afterwards=0 out_wrd=- data_block_time=400 -data_block_num=20 +data_block_num=64 +data_block_bits=12