| Revisión | 93ecd0db995067814a27bec8aa5c733ad3e8f500 (tree) |
|---|---|
| Tiempo | 2020-03-26 23:47:20 |
| Autor | Starg <starg@user...> |
| Commiter | Starg |
Merge branch 'unkotim' into dev41
timidity/effect.c (diff)
timidity/effect.h (diff) timidity/thread_effect.c (diff)| @@ -2506,23 +2506,9 @@ static void do_drive_mono(Drive *drv, DATA_T *inout) | ||
| 2506 | 2506 | int32 index; |
| 2507 | 2507 | FLOAT_T in, sign, v1, v2, fp; |
| 2508 | 2508 | |
| 2509 | - static FLOAT_T max = 0, avg = 0, sum = 0; | |
| 2510 | - static int32 tc = 0; | |
| 2511 | - | |
| 2512 | - | |
| 2513 | - | |
| 2514 | - | |
| 2515 | 2509 | in = *inout; |
| 2516 | 2510 | sign = (in < 0) ? (-1.0) : (1.0); |
| 2517 | 2511 | in *= drv->cnv * sign; |
| 2518 | - | |
| 2519 | - if(in > 1 && in > max) | |
| 2520 | - max = in; | |
| 2521 | - ++tc; | |
| 2522 | - sum += in; | |
| 2523 | - avg = sum / (FLOAT_T)tc; | |
| 2524 | - | |
| 2525 | - | |
| 2526 | 2512 | fp = floor(in); |
| 2527 | 2513 | index = fp; |
| 2528 | 2514 | fp = in - fp; |
| @@ -505,9 +505,9 @@ int32 | ||
| 505 | 505 | in: 0.0 ~ 8.0 (1.0: 1<<(DRIVE_INPUT_BIT) , DRIVE_SCALE_BIT+DRIVE_BASE_BIT+FRACTION_BITS < 30bit |
| 506 | 506 | out: 0.0 ~ 8.0 * clip_level |
| 507 | 507 | */ |
| 508 | -#define DRIVE_SCALE_BIT (3) // 1.0 * 2^MATH_SCALE_BIT | |
| 508 | +#define DRIVE_SCALE_BIT (2) // 1.0 * 2^MATH_SCALE_BIT | |
| 509 | 509 | #define DRIVE_SCALE_MAX (1 << DRIVE_SCALE_BIT) // table max 1.0 * MATH_SCALE_MAX |
| 510 | -#define DRIVE_BASE_BIT (6) // 0.0~1.0 table size | |
| 510 | +#define DRIVE_BASE_BIT (8) // 0.0~1.0 table size | |
| 511 | 511 | #define DRIVE_BASE_LENGTH (1 << (DRIVE_BASE_BIT)) // 0.0~1.0:table size |
| 512 | 512 | #define DRIVE_TABLE_LENGTH (1 << (DRIVE_BASE_BIT + DRIVE_SCALE_BIT)) // 0.0~1.0 * MATH_SCALE_MAX table size |
| 513 | 513 | #define DRIVE_FRAC_BIT (14) // for int32 |
| @@ -1970,6 +1970,8 @@ void init_effect_buffer_thread(void) | ||
| 1970 | 1970 | memset(delay_effect_buffer_sub, 0, sizeof(delay_effect_buffer_sub)); |
| 1971 | 1971 | memset(reverb_effect_buffer_sub, 0, sizeof(reverb_effect_buffer_sub)); |
| 1972 | 1972 | |
| 1973 | + memset(master_effect_buffer_thread, 0, sizeof(master_effect_buffer_thread)); | |
| 1974 | + | |
| 1973 | 1975 | reset_effect_thread_var(); |
| 1974 | 1976 | } |
| 1975 | 1977 |
Fork