コミット: 067e1222e07bdb1d39ad744a8cd62efcf2f5ed76 - timidity41 (git)

コミットメタ情報

• リビジョン: 067e1222e07bdb1d39ad744a8cd62efcf2f5ed76 (tree)
• 日時: 2019-03-15 23:19:07
• 作者: Starg <starg@user...>
• コミッター: Starg

ログメッセージ

Import UnkoTim225

変更サマリ

• modified: timidity/effect.c
• modified: timidity/effect.h

差分

--- a/timidity/effect.c
+++ b/timidity/effect.c
@@ -13636,15 +13636,21 @@ static void do_od_ds_parallel(DATA_T *buf, int32 count, InfoOverdrive *info1, In
 {
 	int32 i, j, k;
 	DATA_T input[2];
+	simple_delay *dly = &info2->dly;
 
 	if(count == MAGIC_INIT_EFFECT_INFO) {
 		do_od_ds_multi(buf, count, info1);
-		do_od_ds_multi(buf, count, info2);		
+		do_od_ds_multi(buf, count, info2);			
+		set_delay(&info2->dly, playmode_rate_ms * 1.5);
+		return; 
+	}else if(count == MAGIC_FREE_EFFECT_INFO) {
+		free_delay(&info2->dly);
 		return;
 	}else if(count <= 0)
 		return;	
 	for(i = 0; i < count; i++) {
 		input[0] = buf[i]; input[1] = buf[i + 1];
+		do_delay(&input[1], dly->buf, dly->size, &dly->index);
 		/* waveshaping amp simulation anti-aliasing */
 		sample_filter_left(&info1->bw1, &input[0]);
 		sample_filter_left(&info2->bw1, &input[1]);

--- a/timidity/effect.h
+++ b/timidity/effect.h
@@ -431,30 +431,6 @@ typedef struct {
 	int32 feedbacki;
 } mod_allpass;
 
-/*! Moog VCF (resonant IIR state variable filter) */
-typedef struct {
-	int16 freq, last_freq;	/* in Hz */
-	double res_dB, last_res_dB; /* in dB */
-	FLOAT_T df, dq, dp;	/* coefficients in fixed-point */
-	FLOAT_T db0, db1, db2, db3, db4;
-	int32 f, q, p;	/* coefficients in fixed-point */
-	int32 ib0, ib1, ib2, ib3, ib4;
-} filter_moog;
-
-/*! Moog VCF (resonant IIR state variable filter with distortion) */
-typedef struct {
-	int16 freq, last_freq;	/* in Hz */
-	double res_dB, last_res_dB; /* in dB */
-	double dist, last_dist, f, q, p, d, b0, b1, b2, b3, b4;
-} filter_moog_dist;
-
-/*! LPF18 (resonant IIR lowpass filter with waveshaping) */
-typedef struct {
-	int16 freq, last_freq;	/* in Hz */
-	double dist, res, last_dist, last_res; /* in linear */
-	double ay1, ay2, aout, lastin, kres, value, kp, kp1h;
-} filter_lpf18;
-
 
 /*! allpass filter */
 typedef struct _allpass {
@@ -939,6 +915,7 @@ typedef struct {
 	Drive drv1, drv2, drv3;
 	FilterCoefficients bw1, bw2, bw3, bw4, bq;
 	InfoAmpSimulator amp;
+	simple_delay dly;
 } InfoOverdrive;
 
 #define PHASER_PHASE 12