--- TiMidity++-2.9.1/timidity/playmidi.c Mon Mar 20 09:29:20 2000 +++ tim.old/timidity/playmidi.c Wed May 3 00:33:48 2000 @@ -1178,9 +1178,9 @@ return lowest; } - if(i < voices) +/* if(i < voices)*/ return upper_voices++; - return reduce_voice(); +/* return reduce_voice();*/ } void free_voice(int v1) @@ -2981,7 +2981,7 @@ void restore_voices(int save_voices) { -#ifdef REDUCE_VOICE_TIME_TUNING +#ifndef REDUCE_VOICE_TIME_TUNING static int old_voices = -1; if(old_voices == -1 || save_voices) old_voices = voices; @@ -3177,8 +3177,8 @@ voices = 0; jump_flag = 1; } - else - voice_decrement(val); +/* else + voice_decrement(val);*/ restore_voices(1); continue; @@ -3583,7 +3583,7 @@ } #endif -#ifdef REDUCE_VOICE_TIME_TUNING +#ifndef REDUCE_VOICE_TIME_TUNING /* Auto voice reduce implementation by Masanao Izumo */ if(reduce_voice_threshold && (play_mode->flag & PF_CAN_TRACE) && @@ -3712,8 +3712,8 @@ kill_nv = temp_nv; } - for(i = 0; i < kill_nv; i++) - v = reduce_voice(); +/* for(i = 0; i < kill_nv; i++) + v = reduce_voice();*/ /* lower max # of allowed voices to let the buffer recover */ if (auto_reduce_polyphony) { @@ -3721,11 +3721,11 @@ ok_nv = ok_nv_total / ok_nv_counts; /* decrease it to current nv left */ - if (voices > temp_nv && temp_nv > ok_nv) - voice_decrement_conservative(voices - temp_nv); +/* if (voices > temp_nv && temp_nv > ok_nv) + voice_decrement_conservative(voices - temp_nv);*/ /* decrease it to ok_nv */ - else if (voices > ok_nv && temp_nv <= ok_nv) - voice_decrement_conservative(voices - ok_nv); +/* else if (voices > ok_nv && temp_nv <= ok_nv) + voice_decrement_conservative(voices - ok_nv);*/ /* increase the polyphony */ else if (voices < ok_nv) voice_increment(ok_nv - voices);