From 46dcaf97c76f8a70330599ba8317942234fff17b Mon Sep 17 00:00:00 2001 From: nino de wit Date: Fri, 27 Nov 2015 16:26:47 +0100 Subject: [PATCH] modified pichotto & shiroverb --- plugins/pitchotto/gen_exported.cpp | 502 +++++++-------- plugins/pitchotto/gen~.pitchotto.maxpat | 10 +- plugins/pitchotto/pitchotto.gendsp | 10 +- plugins/shiroverb/gen_exported.cpp | 792 ++++++++++++------------ plugins/shiroverb/gen~.shiroverb.maxpat | 42 +- plugins/shiroverb/shiroverb.gendsp | 32 +- 6 files changed, 666 insertions(+), 722 deletions(-) diff --git a/plugins/pitchotto/gen_exported.cpp b/plugins/pitchotto/gen_exported.cpp index 06efdbc..8cbe6f5 100644 --- a/plugins/pitchotto/gen_exported.cpp +++ b/plugins/pitchotto/gen_exported.cpp @@ -70,15 +70,15 @@ typedef struct State { double m_y_1; double m_history_9; double m_history_8; - double m_mix_13; + double m_resonance_13; double m_y_10; - double m_resonance_19; - double m_window_20; - double m_window_17; - double m_cutoff_18; - double m_ratio_15; - double m_blur_14; - double m_ratio_16; + double m_window_19; + double m_ratio_20; + double m_blur_17; + double m_ratio_18; + double m_window_15; + double m_cutoff_14; + double m_mix_16; int vectorsize; int __exception; // re-initialize all member variables; @@ -98,14 +98,14 @@ typedef struct State { m_y_10 = 0; m_delay_11.reset("m_delay_11", 96000); m_delay_12.reset("m_delay_12", 96000); - m_mix_13 = 1; - m_blur_14 = 0.01; - m_ratio_15 = 0.5; - m_ratio_16 = 2; - m_window_17 = 100; - m_cutoff_18 = 3000; - m_resonance_19 = 0; - m_window_20 = 100; + m_resonance_13 = 0; + m_cutoff_14 = 2250; + m_window_15 = 100; + m_mix_16 = 0.5; + m_blur_17 = 0.25; + m_ratio_18 = 0.5; + m_window_19 = 100; + m_ratio_20 = 2; samples_to_seconds = (1 / samplerate); m_phasor_21.reset(0); m_delta_22.reset(0); @@ -149,177 +149,177 @@ typedef struct State { return __exception; }; - double mul_2017 = (m_resonance_19 * 0.125); - double exp_2018 = exp(mul_2017); - double mul_2016 = (exp_2018 * 0.882497); - double mul_2012 = (mul_2016 * mul_2016); - double expr_2006 = safediv(((m_cutoff_18 * 2) * 3.1415926535898), 44100); - double cos_2015 = cos(expr_2006); - double mul_2014 = (cos_2015 * mul_2016); - double mul_2013 = (mul_2014 * -2); - double add_2011 = ((mul_2013 + mul_2012) + 1); - double mstosamps_2078 = (m_window_20 * (samplerate * 0.001)); - double mstosamps_2153 = (m_window_17 * (samplerate * 0.001)); - double rsub_2140 = (1 - m_ratio_16); - double mul_2139 = (rsub_2140 * 1000); - double div_2138 = safediv(mul_2139, m_window_17); + double mul_2327 = (m_resonance_13 * 0.125); + double exp_2328 = exp(mul_2327); + double mul_2326 = (exp_2328 * 0.882497); + double mul_2322 = (mul_2326 * mul_2326); + double expr_2437 = safediv(((m_cutoff_14 * 2) * 3.1415926535898), 44100); + double cos_2325 = cos(expr_2437); + double mul_2324 = (cos_2325 * mul_2326); + double mul_2323 = (mul_2324 * -2); + double add_2321 = ((mul_2323 + mul_2322) + 1); + double mstosamps_2393 = (m_window_15 * (samplerate * 0.001)); + double mstosamps_2309 = (m_window_19 * (samplerate * 0.001)); + double rsub_2296 = (1 - m_ratio_20); + double mul_2295 = (rsub_2296 * 1000); + double div_2294 = safediv(mul_2295, m_window_19); samples_to_seconds = (1 / samplerate); - double rsub_2070 = (1 - m_ratio_15); - double mul_2069 = (rsub_2070 * 1000); - double div_2068 = safediv(mul_2069, m_window_20); + double rsub_2380 = (1 - m_ratio_18); + double mul_2379 = (rsub_2380 * 1000); + double div_2378 = safediv(mul_2379, m_window_15); // the main sample loop; while ((__n--)) { const double in1 = (*(__in1++)); - double noise_2090 = noise(); - double abs_2107 = fabs(noise_2090); - double mul_2111 = (abs_2107 * m_blur_14); - double noise_2019 = noise(); - double abs_2037 = fabs(noise_2019); - double mul_2041 = (abs_2037 * m_blur_14); - double noise_2020 = noise(); - double abs_2038 = fabs(noise_2020); - double mul_2044 = (abs_2038 * m_blur_14); - double noise_2022 = noise(); - double abs_2040 = fabs(noise_2022); - double mul_2050 = (abs_2040 * m_blur_14); - double noise_2021 = noise(); - double abs_2039 = fabs(noise_2021); - double mul_2047 = (abs_2039 * m_blur_14); - double noise_2092 = noise(); - double abs_2109 = fabs(noise_2092); - double mul_2117 = (abs_2109 * m_blur_14); - double noise_2091 = noise(); - double abs_2108 = fabs(noise_2091); - double mul_2114 = (abs_2108 * m_blur_14); - double noise_2093 = noise(); - double abs_2110 = fabs(noise_2093); - double mul_2120 = (abs_2110 * m_blur_14); - double mul_2008 = (mul_2012 * m_y_10); - double mul_2009 = (mul_2013 * m_y_1); - double phasor_2159 = m_phasor_21(div_2138, samples_to_seconds); - double add_2131 = ((phasor_2159 + m_history_9) + 0.75); - double mod_2130 = safemod(add_2131, 1); - double delta_2113 = m_delta_22(mod_2130); - double sah_2094 = m_sah_23(mul_2111, delta_2113, 0); - double sah_2112 = m_sah_24(mstosamps_2153, delta_2113, 0); - double mul_2103 = (sah_2112 * mod_2130); - double sub_2129 = (mod_2130 - 0.5); - double mul_2128 = (sub_2129 * 3.1415926535898); - double cos_2127 = cos(mul_2128); - double mul_2122 = (cos_2127 * cos_2127); - double add_2152 = ((phasor_2159 + m_history_8) + 0.25); - double mod_2151 = safemod(add_2152, 1); - double delta_2119 = m_delta_25(mod_2151); - double sah_2098 = m_sah_26(mul_2117, delta_2119, 0); - double sah_2118 = m_sah_27(mstosamps_2153, delta_2119, 0); - double mul_2105 = (sah_2118 * mod_2151); - double sub_2150 = (mod_2151 - 0.5); - double mul_2149 = (sub_2150 * 3.1415926535898); - double cos_2148 = cos(mul_2149); - double mul_2124 = (cos_2148 * cos_2148); - double add_2137 = ((phasor_2159 + m_history_7) + 0.5); - double mod_2136 = safemod(add_2137, 1); - double delta_2116 = m_delta_28(mod_2136); - double sah_2096 = m_sah_29(mul_2114, delta_2116, 0); - double sah_2115 = m_sah_30(mstosamps_2153, delta_2116, 0); - double mul_2104 = (sah_2115 * mod_2136); - double sub_2135 = (mod_2136 - 0.5); - double mul_2134 = (sub_2135 * 3.1415926535898); - double cos_2133 = cos(mul_2134); - double mul_2123 = (cos_2133 * cos_2133); - double add_2158 = ((phasor_2159 + m_history_6) + 0); - double mod_2157 = safemod(add_2158, 1); - double delta_2101 = m_delta_31(mod_2157); - double sah_2100 = m_sah_32(mul_2120, delta_2101, 0); - double sah_2121 = m_sah_33(mstosamps_2153, delta_2101, 0); - double mul_2106 = (sah_2121 * mod_2157); - double tap_2144 = m_delay_12.read_linear(mul_2106); - double tap_2145 = m_delay_12.read_linear(mul_2105); - double tap_2146 = m_delay_12.read_linear(mul_2104); - double tap_2147 = m_delay_12.read_linear(mul_2103); - double mul_2141 = (tap_2145 * mul_2124); - double mul_2132 = (tap_2146 * mul_2123); - double mul_2126 = (tap_2147 * mul_2122); - double sub_2156 = (mod_2157 - 0.5); - double mul_2155 = (sub_2156 * 3.1415926535898); - double cos_2154 = cos(mul_2155); - double mul_2125 = (cos_2154 * cos_2154); - double mul_2142 = (tap_2144 * mul_2125); - double phasor_2084 = m_phasor_34(div_2068, samples_to_seconds); - double add_2061 = ((m_history_5 + phasor_2084) + 0.75); - double mod_2060 = safemod(add_2061, 1); - double delta_2043 = m_delta_35(mod_2060); - double sah_2023 = m_sah_36(mul_2041, delta_2043, 0); - double sah_2042 = m_sah_37(mstosamps_2078, delta_2043, 0); - double mul_2033 = (sah_2042 * mod_2060); - double sub_2059 = (mod_2060 - 0.5); - double mul_2058 = (sub_2059 * 3.1415926535898); - double cos_2057 = cos(mul_2058); - double mul_2052 = (cos_2057 * cos_2057); - double add_2067 = ((m_history_4 + phasor_2084) + 0.5); - double mod_2066 = safemod(add_2067, 1); - double delta_2046 = m_delta_38(mod_2066); - double sah_2025 = m_sah_39(mul_2044, delta_2046, 0); - double sah_2045 = m_sah_40(mstosamps_2078, delta_2046, 0); - double mul_2034 = (sah_2045 * mod_2066); - double sub_2065 = (mod_2066 - 0.5); - double mul_2064 = (sub_2065 * 3.1415926535898); - double cos_2063 = cos(mul_2064); - double mul_2053 = (cos_2063 * cos_2063); - double add_2083 = ((m_history_3 + phasor_2084) + 0); - double mod_2082 = safemod(add_2083, 1); - double delta_2030 = m_delta_41(mod_2082); - double sah_2029 = m_sah_42(mul_2050, delta_2030, 0); - double sah_2051 = m_sah_43(mstosamps_2078, delta_2030, 0); - double mul_2036 = (sah_2051 * mod_2082); - double sub_2081 = (mod_2082 - 0.5); - double mul_2080 = (sub_2081 * 3.1415926535898); - double cos_2079 = cos(mul_2080); - double mul_2055 = (cos_2079 * cos_2079); - double add_2077 = ((m_history_2 + phasor_2084) + 0.25); - double mod_2076 = safemod(add_2077, 1); - double delta_2049 = m_delta_44(mod_2076); - double sah_2027 = m_sah_45(mul_2047, delta_2049, 0); - double sah_2048 = m_sah_46(mstosamps_2078, delta_2049, 0); - double mul_2035 = (sah_2048 * mod_2076); - double tap_2086 = m_delay_11.read_linear(mul_2036); - double tap_2087 = m_delay_11.read_linear(mul_2035); - double tap_2088 = m_delay_11.read_linear(mul_2034); - double tap_2089 = m_delay_11.read_linear(mul_2033); - double mul_2056 = (tap_2089 * mul_2052); - double mul_2062 = (tap_2088 * mul_2053); - double mul_2072 = (tap_2086 * mul_2055); - double sub_2075 = (mod_2076 - 0.5); - double mul_2074 = (sub_2075 * 3.1415926535898); - double cos_2073 = cos(mul_2074); - double mul_2054 = (cos_2073 * cos_2073); - double mul_2071 = (tap_2087 * mul_2054); - double mul_2010 = ((((((((mul_2126 + mul_2132) + mul_2141) + mul_2142) + mul_2072) + mul_2071) + mul_2062) + mul_2056) * add_2011); - double sub_2007 = (mul_2010 - (mul_2009 + mul_2008)); - double mix_2172 = (in1 + (m_mix_13 * (sub_2007 - in1))); - double out1 = mix_2172; - double y2_next_2160 = m_y_1; - double history_2095_next_2161 = sah_2094; - double history_2099_next_2162 = sah_2098; - double history_2097_next_2163 = sah_2096; - double history_2102_next_2164 = sah_2100; - double history_2024_next_2165 = sah_2023; - double history_2026_next_2166 = sah_2025; - double history_2031_next_2167 = sah_2029; - double history_2028_next_2168 = sah_2027; - double y1_next_2169 = sub_2007; + double noise_2247 = noise(); + double abs_2264 = fabs(noise_2247); + double mul_2270 = (abs_2264 * m_blur_17); + double noise_2246 = noise(); + double abs_2263 = fabs(noise_2246); + double mul_2267 = (abs_2263 * m_blur_17); + double noise_2330 = noise(); + double abs_2348 = fabs(noise_2330); + double mul_2354 = (abs_2348 * m_blur_17); + double noise_2332 = noise(); + double abs_2350 = fabs(noise_2332); + double mul_2360 = (abs_2350 * m_blur_17); + double noise_2249 = noise(); + double abs_2266 = fabs(noise_2249); + double mul_2276 = (abs_2266 * m_blur_17); + double noise_2248 = noise(); + double abs_2265 = fabs(noise_2248); + double mul_2273 = (abs_2265 * m_blur_17); + double noise_2331 = noise(); + double abs_2349 = fabs(noise_2331); + double mul_2357 = (abs_2349 * m_blur_17); + double noise_2329 = noise(); + double abs_2347 = fabs(noise_2329); + double mul_2351 = (abs_2347 * m_blur_17); + double mul_2318 = (mul_2322 * m_y_10); + double mul_2319 = (mul_2323 * m_y_1); + double phasor_2315 = m_phasor_21(div_2294, samples_to_seconds); + double add_2293 = ((phasor_2315 + m_history_9) + 0.5); + double mod_2292 = safemod(add_2293, 1); + double delta_2272 = m_delta_22(mod_2292); + double sah_2252 = m_sah_23(mul_2270, delta_2272, 0); + double sah_2271 = m_sah_24(mstosamps_2309, delta_2272, 0); + double mul_2260 = (sah_2271 * mod_2292); + double sub_2291 = (mod_2292 - 0.5); + double mul_2290 = (sub_2291 * 3.1415926535898); + double cos_2289 = cos(mul_2290); + double mul_2279 = (cos_2289 * cos_2289); + double add_2287 = ((phasor_2315 + m_history_8) + 0.75); + double mod_2286 = safemod(add_2287, 1); + double delta_2269 = m_delta_25(mod_2286); + double sah_2250 = m_sah_26(mul_2267, delta_2269, 0); + double sah_2268 = m_sah_27(mstosamps_2309, delta_2269, 0); + double mul_2259 = (sah_2268 * mod_2286); + double sub_2285 = (mod_2286 - 0.5); + double mul_2284 = (sub_2285 * 3.1415926535898); + double cos_2283 = cos(mul_2284); + double mul_2278 = (cos_2283 * cos_2283); + double add_2314 = ((phasor_2315 + m_history_7) + 0); + double mod_2313 = safemod(add_2314, 1); + double delta_2257 = m_delta_28(mod_2313); + double sah_2256 = m_sah_29(mul_2276, delta_2257, 0); + double sah_2277 = m_sah_30(mstosamps_2309, delta_2257, 0); + double mul_2262 = (sah_2277 * mod_2313); + double sub_2312 = (mod_2313 - 0.5); + double mul_2311 = (sub_2312 * 3.1415926535898); + double cos_2310 = cos(mul_2311); + double mul_2281 = (cos_2310 * cos_2310); + double add_2308 = ((phasor_2315 + m_history_6) + 0.25); + double mod_2307 = safemod(add_2308, 1); + double delta_2275 = m_delta_31(mod_2307); + double sah_2254 = m_sah_32(mul_2273, delta_2275, 0); + double sah_2274 = m_sah_33(mstosamps_2309, delta_2275, 0); + double mul_2261 = (sah_2274 * mod_2307); + double tap_2300 = m_delay_12.read_linear(mul_2262); + double tap_2301 = m_delay_12.read_linear(mul_2261); + double tap_2302 = m_delay_12.read_linear(mul_2260); + double tap_2303 = m_delay_12.read_linear(mul_2259); + double mul_2282 = (tap_2303 * mul_2278); + double mul_2288 = (tap_2302 * mul_2279); + double mul_2298 = (tap_2300 * mul_2281); + double sub_2306 = (mod_2307 - 0.5); + double mul_2305 = (sub_2306 * 3.1415926535898); + double cos_2304 = cos(mul_2305); + double mul_2280 = (cos_2304 * cos_2304); + double mul_2297 = (tap_2301 * mul_2280); + double phasor_2399 = m_phasor_34(div_2378, samples_to_seconds); + double add_2377 = ((m_history_5 + phasor_2399) + 0.5); + double mod_2376 = safemod(add_2377, 1); + double delta_2356 = m_delta_35(mod_2376); + double sah_2335 = m_sah_36(mul_2354, delta_2356, 0); + double sah_2355 = m_sah_37(mstosamps_2393, delta_2356, 0); + double mul_2344 = (sah_2355 * mod_2376); + double sub_2375 = (mod_2376 - 0.5); + double mul_2374 = (sub_2375 * 3.1415926535898); + double cos_2373 = cos(mul_2374); + double mul_2363 = (cos_2373 * cos_2373); + double add_2398 = ((m_history_4 + phasor_2399) + 0); + double mod_2397 = safemod(add_2398, 1); + double delta_2340 = m_delta_38(mod_2397); + double sah_2339 = m_sah_39(mul_2360, delta_2340, 0); + double sah_2361 = m_sah_40(mstosamps_2393, delta_2340, 0); + double mul_2346 = (sah_2361 * mod_2397); + double sub_2396 = (mod_2397 - 0.5); + double mul_2395 = (sub_2396 * 3.1415926535898); + double cos_2394 = cos(mul_2395); + double mul_2365 = (cos_2394 * cos_2394); + double add_2392 = ((m_history_3 + phasor_2399) + 0.25); + double mod_2391 = safemod(add_2392, 1); + double delta_2359 = m_delta_41(mod_2391); + double sah_2337 = m_sah_42(mul_2357, delta_2359, 0); + double sah_2358 = m_sah_43(mstosamps_2393, delta_2359, 0); + double mul_2345 = (sah_2358 * mod_2391); + double sub_2390 = (mod_2391 - 0.5); + double mul_2389 = (sub_2390 * 3.1415926535898); + double cos_2388 = cos(mul_2389); + double mul_2364 = (cos_2388 * cos_2388); + double add_2371 = ((m_history_2 + phasor_2399) + 0.75); + double mod_2370 = safemod(add_2371, 1); + double delta_2353 = m_delta_44(mod_2370); + double sah_2333 = m_sah_45(mul_2351, delta_2353, 0); + double sah_2352 = m_sah_46(mstosamps_2393, delta_2353, 0); + double mul_2343 = (sah_2352 * mod_2370); + double tap_2384 = m_delay_11.read_linear(mul_2346); + double tap_2385 = m_delay_11.read_linear(mul_2345); + double tap_2386 = m_delay_11.read_linear(mul_2344); + double tap_2387 = m_delay_11.read_linear(mul_2343); + double mul_2382 = (tap_2384 * mul_2365); + double mul_2381 = (tap_2385 * mul_2364); + double mul_2372 = (tap_2386 * mul_2363); + double sub_2369 = (mod_2370 - 0.5); + double mul_2368 = (sub_2369 * 3.1415926535898); + double cos_2367 = cos(mul_2368); + double mul_2362 = (cos_2367 * cos_2367); + double mul_2366 = (tap_2387 * mul_2362); + double mul_2320 = ((((((((mul_2298 + mul_2297) + mul_2288) + mul_2282) + mul_2366) + mul_2372) + mul_2381) + mul_2382) * add_2321); + double sub_2317 = (mul_2320 - (mul_2319 + mul_2318)); + double mix_2450 = (in1 + (m_mix_16 * (sub_2317 - in1))); + double out1 = mix_2450; + double y2_next_2440 = m_y_1; + double history_2253_next_2441 = sah_2252; + double history_2251_next_2442 = sah_2250; + double history_2258_next_2443 = sah_2256; + double history_2255_next_2444 = sah_2254; + double history_2336_next_2445 = sah_2335; + double history_2341_next_2446 = sah_2339; + double history_2338_next_2447 = sah_2337; + double history_2334_next_2448 = sah_2333; + double y1_next_2449 = sub_2317; m_delay_12.write(in1); m_delay_11.write(in1); - m_y_10 = y2_next_2160; - m_history_9 = history_2095_next_2161; - m_history_8 = history_2099_next_2162; - m_history_7 = history_2097_next_2163; - m_history_6 = history_2102_next_2164; - m_history_5 = history_2024_next_2165; - m_history_4 = history_2026_next_2166; - m_history_3 = history_2031_next_2167; - m_history_2 = history_2028_next_2168; - m_y_1 = y1_next_2169; + m_y_10 = y2_next_2440; + m_history_9 = history_2253_next_2441; + m_history_8 = history_2251_next_2442; + m_history_7 = history_2258_next_2443; + m_history_6 = history_2255_next_2444; + m_history_5 = history_2336_next_2445; + m_history_4 = history_2341_next_2446; + m_history_3 = history_2338_next_2447; + m_history_2 = history_2334_next_2448; + m_y_1 = y1_next_2449; m_delay_11.step(); m_delay_12.step(); // assign results to output buffer; @@ -329,29 +329,29 @@ typedef struct State { return __exception; }; + inline void set_resonance(double _value) { + m_resonance_13 = (_value < 0 ? 0 : (_value > 0.25 ? 0.25 : _value)); + }; + inline void set_cutoff(double _value) { + m_cutoff_14 = (_value < 0 ? 0 : (_value > 3000 ? 3000 : _value)); + }; + inline void set_window1(double _value) { + m_window_15 = (_value < 0.1 ? 0.1 : (_value > 1000 ? 1000 : _value)); + }; inline void set_mix(double _value) { - m_mix_13 = (_value < 0 ? 0 : (_value > 1 ? 1 : _value)); + m_mix_16 = (_value < 0 ? 0 : (_value > 1 ? 1 : _value)); }; inline void set_blur(double _value) { - m_blur_14 = (_value < 0.01 ? 0.01 : (_value > 0.25 ? 0.25 : _value)); + m_blur_17 = (_value < 0.01 ? 0.01 : (_value > 0.25 ? 0.25 : _value)); }; inline void set_ratio1(double _value) { - m_ratio_15 = (_value < 0.5 ? 0.5 : (_value > 2 ? 2 : _value)); - }; - inline void set_ratio2(double _value) { - m_ratio_16 = (_value < 0.5 ? 0.5 : (_value > 2 ? 2 : _value)); + m_ratio_18 = (_value < 0.5 ? 0.5 : (_value > 2 ? 2 : _value)); }; inline void set_window2(double _value) { - m_window_17 = (_value < 0.1 ? 0.1 : (_value > 1000 ? 1000 : _value)); + m_window_19 = (_value < 0.1 ? 0.1 : (_value > 1000 ? 1000 : _value)); }; - inline void set_cutoff(double _value) { - m_cutoff_18 = (_value < 0 ? 0 : (_value > 3000 ? 3000 : _value)); - }; - inline void set_resonance(double _value) { - m_resonance_19 = (_value < 0 ? 0 : (_value > 0.25 ? 0.25 : _value)); - }; - inline void set_window1(double _value) { - m_window_20 = (_value < 0.1 ? 0.1 : (_value > 1000 ? 1000 : _value)); + inline void set_ratio2(double _value) { + m_ratio_20 = (_value < 0.5 ? 0.5 : (_value > 2 ? 2 : _value)); }; } State; @@ -394,14 +394,14 @@ void reset(CommonState *cself) { void setparameter(CommonState *cself, long index, double value, void *ref) { State * self = (State *)cself; switch (index) { - case 0: self->set_mix(value); break; - case 1: self->set_blur(value); break; - case 2: self->set_ratio1(value); break; - case 3: self->set_ratio2(value); break; - case 4: self->set_window2(value); break; - case 5: self->set_cutoff(value); break; - case 6: self->set_resonance(value); break; - case 7: self->set_window1(value); break; + case 0: self->set_resonance(value); break; + case 1: self->set_cutoff(value); break; + case 2: self->set_window1(value); break; + case 3: self->set_mix(value); break; + case 4: self->set_blur(value); break; + case 5: self->set_ratio1(value); break; + case 6: self->set_window2(value); break; + case 7: self->set_ratio2(value); break; default: break; } @@ -412,14 +412,14 @@ void setparameter(CommonState *cself, long index, double value, void *ref) { void getparameter(CommonState *cself, long index, double *value) { State *self = (State *)cself; switch (index) { - case 0: *value = self->m_mix_13; break; - case 1: *value = self->m_blur_14; break; - case 2: *value = self->m_ratio_15; break; - case 3: *value = self->m_ratio_16; break; - case 4: *value = self->m_window_17; break; - case 5: *value = self->m_cutoff_18; break; - case 6: *value = self->m_resonance_19; break; - case 7: *value = self->m_window_20; break; + case 0: *value = self->m_resonance_13; break; + case 1: *value = self->m_cutoff_14; break; + case 2: *value = self->m_window_15; break; + case 3: *value = self->m_mix_16; break; + case 4: *value = self->m_blur_17; break; + case 5: *value = self->m_ratio_18; break; + case 6: *value = self->m_window_19; break; + case 7: *value = self->m_ratio_20; break; default: break; } @@ -439,116 +439,116 @@ void * create(double sr, long vs) { self->__commonstate.vs = vs; self->__commonstate.params = (ParamInfo *)genlib_sysmem_newptr(8 * sizeof(ParamInfo)); self->__commonstate.numparams = 8; - // initialize parameter 0 ("m_mix_13") + // initialize parameter 0 ("m_resonance_13") pi = self->__commonstate.params + 0; - pi->name = "mix"; + pi->name = "resonance"; pi->paramtype = GENLIB_PARAMTYPE_FLOAT; - pi->defaultvalue = self->m_mix_13; + pi->defaultvalue = self->m_resonance_13; pi->defaultref = 0; pi->hasinputminmax = false; pi->inputmin = 0; pi->inputmax = 1; pi->hasminmax = true; pi->outputmin = 0; - pi->outputmax = 1; + pi->outputmax = 0.25; pi->exp = 0; pi->units = ""; // no units defined - // initialize parameter 1 ("m_blur_14") + // initialize parameter 1 ("m_cutoff_14") pi = self->__commonstate.params + 1; - pi->name = "blur"; + pi->name = "cutoff"; pi->paramtype = GENLIB_PARAMTYPE_FLOAT; - pi->defaultvalue = self->m_blur_14; + pi->defaultvalue = self->m_cutoff_14; pi->defaultref = 0; pi->hasinputminmax = false; pi->inputmin = 0; pi->inputmax = 1; pi->hasminmax = true; - pi->outputmin = 0.01; - pi->outputmax = 0.25; + pi->outputmin = 0; + pi->outputmax = 3000; pi->exp = 0; pi->units = ""; // no units defined - // initialize parameter 2 ("m_ratio_15") + // initialize parameter 2 ("m_window_15") pi = self->__commonstate.params + 2; - pi->name = "ratio1"; + pi->name = "window1"; pi->paramtype = GENLIB_PARAMTYPE_FLOAT; - pi->defaultvalue = self->m_ratio_15; + pi->defaultvalue = self->m_window_15; pi->defaultref = 0; pi->hasinputminmax = false; pi->inputmin = 0; pi->inputmax = 1; pi->hasminmax = true; - pi->outputmin = 0.5; - pi->outputmax = 2; + pi->outputmin = 0.1; + pi->outputmax = 1000; pi->exp = 0; pi->units = ""; // no units defined - // initialize parameter 3 ("m_ratio_16") + // initialize parameter 3 ("m_mix_16") pi = self->__commonstate.params + 3; - pi->name = "ratio2"; + pi->name = "mix"; pi->paramtype = GENLIB_PARAMTYPE_FLOAT; - pi->defaultvalue = self->m_ratio_16; + pi->defaultvalue = self->m_mix_16; pi->defaultref = 0; pi->hasinputminmax = false; pi->inputmin = 0; pi->inputmax = 1; pi->hasminmax = true; - pi->outputmin = 0.5; - pi->outputmax = 2; + pi->outputmin = 0; + pi->outputmax = 1; pi->exp = 0; pi->units = ""; // no units defined - // initialize parameter 4 ("m_window_17") + // initialize parameter 4 ("m_blur_17") pi = self->__commonstate.params + 4; - pi->name = "window2"; + pi->name = "blur"; pi->paramtype = GENLIB_PARAMTYPE_FLOAT; - pi->defaultvalue = self->m_window_17; + pi->defaultvalue = self->m_blur_17; pi->defaultref = 0; pi->hasinputminmax = false; pi->inputmin = 0; pi->inputmax = 1; pi->hasminmax = true; - pi->outputmin = 0.1; - pi->outputmax = 1000; + pi->outputmin = 0.01; + pi->outputmax = 0.25; pi->exp = 0; pi->units = ""; // no units defined - // initialize parameter 5 ("m_cutoff_18") + // initialize parameter 5 ("m_ratio_18") pi = self->__commonstate.params + 5; - pi->name = "cutoff"; + pi->name = "ratio1"; pi->paramtype = GENLIB_PARAMTYPE_FLOAT; - pi->defaultvalue = self->m_cutoff_18; + pi->defaultvalue = self->m_ratio_18; pi->defaultref = 0; pi->hasinputminmax = false; pi->inputmin = 0; pi->inputmax = 1; pi->hasminmax = true; - pi->outputmin = 0; - pi->outputmax = 3000; + pi->outputmin = 0.5; + pi->outputmax = 2; pi->exp = 0; pi->units = ""; // no units defined - // initialize parameter 6 ("m_resonance_19") + // initialize parameter 6 ("m_window_19") pi = self->__commonstate.params + 6; - pi->name = "resonance"; + pi->name = "window2"; pi->paramtype = GENLIB_PARAMTYPE_FLOAT; - pi->defaultvalue = self->m_resonance_19; + pi->defaultvalue = self->m_window_19; pi->defaultref = 0; pi->hasinputminmax = false; pi->inputmin = 0; pi->inputmax = 1; pi->hasminmax = true; - pi->outputmin = 0; - pi->outputmax = 0.25; + pi->outputmin = 0.1; + pi->outputmax = 1000; pi->exp = 0; pi->units = ""; // no units defined - // initialize parameter 7 ("m_window_20") + // initialize parameter 7 ("m_ratio_20") pi = self->__commonstate.params + 7; - pi->name = "window1"; + pi->name = "ratio2"; pi->paramtype = GENLIB_PARAMTYPE_FLOAT; - pi->defaultvalue = self->m_window_20; + pi->defaultvalue = self->m_ratio_20; pi->defaultref = 0; pi->hasinputminmax = false; pi->inputmin = 0; pi->inputmax = 1; pi->hasminmax = true; - pi->outputmin = 0.1; - pi->outputmax = 1000; + pi->outputmin = 0.5; + pi->outputmax = 2; pi->exp = 0; pi->units = ""; // no units defined diff --git a/plugins/pitchotto/gen~.pitchotto.maxpat b/plugins/pitchotto/gen~.pitchotto.maxpat index 58151ad..ce689b4 100644 --- a/plugins/pitchotto/gen~.pitchotto.maxpat +++ b/plugins/pitchotto/gen~.pitchotto.maxpat @@ -2619,7 +2619,7 @@ "architecture" : "x86" } , - "rect" : [ 5.0, 45.0, 879.0, 830.0 ], + "rect" : [ 5.0, 45.0, 955.0, 830.0 ], "bgcolor" : [ 0.9, 0.9, 0.9, 1.0 ], "bglocked" : 0, "openinpresentation" : 0, @@ -3600,8 +3600,8 @@ "numinlets" : 0, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 564.5, 531.0, 180.0, 20.0 ], - "text" : "param mix 1. @min 0. @max 1." + "patching_rect" : [ 564.5, 531.0, 186.0, 20.0 ], + "text" : "param mix 0.5 @min 0. @max 1." } } @@ -3839,7 +3839,7 @@ "numoutlets" : 1, "outlettype" : [ "" ], "patching_rect" : [ 754.5, 506.0, 230.0, 20.0 ], - "text" : "param cutoff 3000. @min 0. @max 3000." + "text" : "param cutoff 2250. @min 0. @max 3000." } } @@ -4188,7 +4188,7 @@ "numoutlets" : 1, "outlettype" : [ "" ], "patching_rect" : [ 1231.333252, 11.0, 221.0, 20.0 ], - "text" : "param blur 0.01 @min 0.01 @max 0.25" + "text" : "param blur 0.25 @min 0.01 @max 0.25" } } diff --git a/plugins/pitchotto/pitchotto.gendsp b/plugins/pitchotto/pitchotto.gendsp index 2b895f1..7292c3f 100644 --- a/plugins/pitchotto/pitchotto.gendsp +++ b/plugins/pitchotto/pitchotto.gendsp @@ -8,7 +8,7 @@ "architecture" : "x86" } , - "rect" : [ 5.0, 45.0, 879.0, 830.0 ], + "rect" : [ 5.0, 45.0, 955.0, 830.0 ], "bgcolor" : [ 0.9, 0.9, 0.9, 1.0 ], "bglocked" : 0, "openinpresentation" : 0, @@ -989,8 +989,8 @@ "numinlets" : 0, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 564.5, 531.0, 180.0, 20.0 ], - "text" : "param mix 1. @min 0. @max 1." + "patching_rect" : [ 564.5, 531.0, 186.0, 20.0 ], + "text" : "param mix 0.5 @min 0. @max 1." } } @@ -1228,7 +1228,7 @@ "numoutlets" : 1, "outlettype" : [ "" ], "patching_rect" : [ 754.5, 506.0, 230.0, 20.0 ], - "text" : "param cutoff 3000. @min 0. @max 3000." + "text" : "param cutoff 2250. @min 0. @max 3000." } } @@ -1577,7 +1577,7 @@ "numoutlets" : 1, "outlettype" : [ "" ], "patching_rect" : [ 1231.333252, 11.0, 221.0, 20.0 ], - "text" : "param blur 0.01 @min 0.01 @max 0.25" + "text" : "param blur 0.25 @min 0.01 @max 0.25" } } diff --git a/plugins/shiroverb/gen_exported.cpp b/plugins/shiroverb/gen_exported.cpp index 4ce938d..a91f977 100644 --- a/plugins/shiroverb/gen_exported.cpp +++ b/plugins/shiroverb/gen_exported.cpp @@ -58,15 +58,15 @@ typedef struct State { Sah m_sah_44; Sah m_sah_41; double m_early_34; - double m_cutoff_35; - double m_resonance_36; - double m_mix_38; - double m_shimmer_33; - double m_ratio_37; + double m_shimmer_35; + double m_blur_36; + double m_ratio_38; + double m_cutoff_33; + double m_window_37; double samples_to_seconds; - double m_tail_32; - double m_window_25; - double m_decay_30; + double m_resonance_32; + double m_roomsize_25; + double m_damping_30; double m_history_4; double m_history_5; double m_history_6; @@ -74,16 +74,16 @@ typedef struct State { double m_history_1; double m_y_2; double samplerate; - double m_spread_31; + double m_mix_31; double m_history_7; double m_history_9; - double m_roomsize_28; - double m_damping_29; + double m_tail_28; + double m_tone_29; double m_history_8; - double m_tone_27; + double m_spread_27; double m_y_11; double m_history_10; - double m_blur_26; + double m_decay_26; int vectorsize; int __exception; // re-initialize all member variables; @@ -107,28 +107,28 @@ typedef struct State { m_delay_14.reset("m_delay_14", 15000); m_delay_15.reset("m_delay_15", 16000); m_delay_16.reset("m_delay_16", 6000); - m_delay_17.reset("m_delay_17", 96000); - m_delay_18.reset("m_delay_18", 48000); + m_delay_17.reset("m_delay_17", 48000); + m_delay_18.reset("m_delay_18", 96000); m_delay_19.reset("m_delay_19", 10000); m_delay_20.reset("m_delay_20", 12000); m_delay_21.reset("m_delay_21", 48000); m_delay_22.reset("m_delay_22", 48000); m_delay_23.reset("m_delay_23", 48000); m_delay_24.reset("m_delay_24", 48000); - m_window_25 = 100; - m_blur_26 = 0.25; - m_tone_27 = 0.5; - m_roomsize_28 = 150; - m_damping_29 = 0.5; - m_decay_30 = 180; - m_spread_31 = 25; - m_tail_32 = 0.25; - m_shimmer_33 = 0.5; + m_roomsize_25 = 150; + m_decay_26 = 180; + m_spread_27 = 25; + m_tail_28 = 0.25; + m_tone_29 = 0.5; + m_damping_30 = 0.75; + m_mix_31 = 0.5; + m_resonance_32 = 0; + m_cutoff_33 = 3000; m_early_34 = 0.25; - m_cutoff_35 = 3000; - m_resonance_36 = 0; - m_ratio_37 = 2; - m_mix_38 = 0.5; + m_shimmer_35 = 0.5; + m_blur_36 = 0.25; + m_window_37 = 100; + m_ratio_38 = 2; samples_to_seconds = (1 / samplerate); m_phasor_39.reset(0); m_delta_40.reset(0); @@ -160,270 +160,270 @@ typedef struct State { return __exception; }; - double rsub_605 = (1 - m_tone_27); - double expr_747 = safepow(0.001, safediv(1, (m_decay_30 * 44100))); - double expr_748 = safediv((m_roomsize_28 * 44100), 340); - double mul_594 = (expr_748 * 0.63245); - double expr_739 = (-safepow(expr_747, mul_594)); - double mul_597 = (expr_748 * 1); - double expr_746 = (-safepow(expr_747, mul_597)); - double mul_596 = (expr_748 * 0.81649); - double expr_741 = (-safepow(expr_747, mul_596)); - double mul_595 = (expr_748 * 0.7071); - double expr_740 = (-safepow(expr_747, mul_595)); - double mul_379 = (m_resonance_36 * 0.125); - double exp_380 = exp(mul_379); - double mul_378 = (exp_380 * 0.882497); - double mul_374 = (mul_378 * mul_378); - double expr_738 = safediv(((m_cutoff_35 * 2) * 3.1415926535898), 44100); - double cos_377 = cos(expr_738); - double mul_376 = (cos_377 * mul_378); - double mul_375 = (mul_376 * -2); - double add_373 = ((mul_375 + mul_374) + 1); - double mul_591 = (expr_748 * 0.000527); - int int_590 = int(mul_591); - double add_520 = (expr_748 + 5); - double expr_742 = safepow(expr_747, add_520); - double mstosamps_445 = (m_window_25 * (samplerate * 0.001)); - double mul_531 = (m_spread_31 * -0.380445); - double add_530 = (mul_531 + 931); - double rsub_527 = (1341 - add_530); - double mul_540 = (int_590 * rsub_527); - double mul_559 = (m_spread_31 * 0.376623); - double add_558 = (mul_559 + 931); - double rsub_555 = (1341 - add_558); - double mul_566 = (int_590 * rsub_555); - double mul_526 = (expr_748 * 0.41); - double add_523 = (mul_526 + 5); - double expr_745 = safepow(expr_747, add_523); - double mul_525 = (expr_748 * 0.3); - double add_522 = (mul_525 + 5); - double expr_744 = safepow(expr_747, add_522); - double mul_524 = (expr_748 * 0.155); - double add_521 = (mul_524 + 5); - double expr_743 = safepow(expr_747, add_521); - double rsub_432 = (1 - m_ratio_37); - double mul_431 = (rsub_432 * 1000); - double div_430 = safediv(mul_431, m_window_25); + double rsub_238 = (1 - m_tone_29); + double expr_271 = safepow(0.001, safediv(1, (m_decay_26 * 44100))); + double expr_272 = safediv((m_roomsize_25 * 44100), 340); + double mul_230 = (expr_272 * 1); + double expr_270 = (-safepow(expr_271, mul_230)); + double mul_229 = (expr_272 * 0.81649); + double expr_265 = (-safepow(expr_271, mul_229)); + double mul_228 = (expr_272 * 0.7071); + double expr_264 = (-safepow(expr_271, mul_228)); + double mul_227 = (expr_272 * 0.63245); + double expr_263 = (-safepow(expr_271, mul_227)); + double mul_12 = (m_resonance_32 * 0.125); + double exp_13 = exp(mul_12); + double mul_11 = (exp_13 * 0.882497); + double mul_7 = (mul_11 * mul_11); + double expr_262 = safediv(((m_cutoff_33 * 2) * 3.1415926535898), 44100); + double cos_10 = cos(expr_262); + double mul_9 = (cos_10 * mul_11); + double mul_8 = (mul_9 * -2); + double add_6 = ((mul_8 + mul_7) + 1); + double mul_224 = (expr_272 * 0.000527); + int int_223 = int(mul_224); + double add_153 = (expr_272 + 5); + double expr_266 = safepow(expr_271, add_153); + double mstosamps_78 = (m_window_37 * (samplerate * 0.001)); + double mul_164 = (m_spread_27 * -0.380445); + double add_163 = (mul_164 + 931); + double rsub_160 = (1341 - add_163); + double mul_173 = (int_223 * rsub_160); + double mul_192 = (m_spread_27 * 0.376623); + double add_191 = (mul_192 + 931); + double rsub_188 = (1341 - add_191); + double mul_199 = (int_223 * rsub_188); + double rsub_65 = (1 - m_ratio_38); + double mul_64 = (rsub_65 * 1000); + double div_63 = safediv(mul_64, m_window_37); samples_to_seconds = (1 / samplerate); - double mul_589 = (expr_748 * 0.110732); - double mul_533 = (m_spread_31 * -0.568366); - double add_529 = (mul_533 + 369); - double rsub_528 = (add_530 - add_529); - double mul_547 = (int_590 * rsub_528); - double mul_575 = (m_spread_31 * 0.125541); - double add_557 = (mul_575 + 369); - double rsub_556 = (add_558 - add_557); - double mul_573 = (int_590 * rsub_556); - double add_532 = (mul_533 + 159); - double mul_554 = (int_590 * add_532); - double add_574 = (mul_575 + 159); - double mul_582 = (int_590 * add_574); + double mul_159 = (expr_272 * 0.41); + double add_156 = (mul_159 + 5); + double expr_269 = safepow(expr_271, add_156); + double mul_158 = (expr_272 * 0.3); + double add_155 = (mul_158 + 5); + double expr_268 = safepow(expr_271, add_155); + double mul_157 = (expr_272 * 0.155); + double add_154 = (mul_157 + 5); + double expr_267 = safepow(expr_271, add_154); + double mul_222 = (expr_272 * 0.110732); + double mul_166 = (m_spread_27 * -0.568366); + double add_162 = (mul_166 + 369); + double rsub_161 = (add_163 - add_162); + double mul_180 = (int_223 * rsub_161); + double mul_208 = (m_spread_27 * 0.125541); + double add_190 = (mul_208 + 369); + double rsub_189 = (add_191 - add_190); + double mul_206 = (int_223 * rsub_189); + double add_165 = (mul_166 + 159); + double mul_187 = (int_223 * add_165); + double add_207 = (mul_208 + 159); + double mul_215 = (int_223 * add_207); // the main sample loop; while ((__n--)) { const double in1 = (*(__in1++)); - double noise_381 = noise(); - double abs_399 = fabs(noise_381); - double mul_403 = (abs_399 * m_blur_26); - double noise_383 = noise(); - double abs_401 = fabs(noise_383); - double mul_409 = (abs_401 * m_blur_26); - double noise_382 = noise(); - double abs_400 = fabs(noise_382); - double mul_406 = (abs_400 * m_blur_26); - double noise_384 = noise(); - double abs_402 = fabs(noise_384); - double mul_412 = (abs_402 * m_blur_26); - double tap_494 = m_delay_24.read_linear(mul_594); - double mul_490 = (tap_494 * expr_739); - double mix_773 = (mul_490 + (m_damping_29 * (m_history_10 - mul_490))); - double mix_492 = mix_773; - double tap_602 = m_delay_23.read_linear(mul_597); - double mul_593 = (tap_602 * expr_746); - double mix_774 = (mul_593 + (m_damping_29 * (m_history_9 - mul_593))); - double mix_600 = mix_774; - double tap_506 = m_delay_22.read_linear(mul_596); - double mul_502 = (tap_506 * expr_741); - double mix_775 = (mul_502 + (m_damping_29 * (m_history_8 - mul_502))); - double mix_504 = mix_775; - double tap_500 = m_delay_21.read_linear(mul_595); - double mul_496 = (tap_500 * expr_740); - double mix_776 = (mul_496 + (m_damping_29 * (m_history_7 - mul_496))); - double mix_498 = mix_776; - double mul_370 = (mul_374 * m_y_11); - double mul_371 = (mul_375 * m_y_2); - double add_484 = (mix_600 + mix_504); - double add_482 = (mix_498 + mix_492); - double add_477 = (add_484 + add_482); - double mul_460 = (add_477 * 0.5); - double sub_481 = (add_484 - add_482); - double mul_463 = (sub_481 * 0.5); - double sub_483 = (mix_600 - mix_504); - double sub_480 = (mix_498 - mix_492); - double sub_479 = (sub_483 - sub_480); - double mul_462 = (sub_479 * 0.5); - double add_478 = (sub_483 + sub_480); - double rsub_476 = (0 - add_478); - double mul_461 = (rsub_476 * 0.5); - double tap_539 = m_delay_20.read_linear(mul_540); - double mul_537 = (tap_539 * 0.625); - double tap_565 = m_delay_19.read_linear(mul_566); - double mul_563 = (tap_565 * 0.625); - double tap_508 = m_delay_18.read_linear(add_523); - double tap_509 = m_delay_18.read_linear(add_522); - double tap_510 = m_delay_18.read_linear(add_521); - double tap_511 = m_delay_18.read_linear(add_520); - double mul_512 = (tap_511 * expr_742); - double add_485 = (mul_460 + mul_512); - double mul_518 = (tap_508 * expr_745); - double add_488 = (mul_463 + mul_518); - double mul_516 = (tap_509 * expr_744); - double add_487 = (mul_462 + mul_516); - double mul_514 = (tap_510 * expr_743); - double add_486 = (mul_461 + mul_514); - double phasor_451 = m_phasor_39(div_430, samples_to_seconds); - double add_423 = ((m_history_6 + phasor_451) + 0.75); - double mod_422 = safemod(add_423, 1); - double delta_405 = m_delta_40(mod_422); - double sah_385 = m_sah_41(mul_403, delta_405, 0); - double sah_404 = m_sah_42(mstosamps_445, delta_405, 0); - double mul_395 = (sah_404 * mod_422); - double sub_421 = (mod_422 - 0.5); - double mul_420 = (sub_421 * 3.1415926535898); - double cos_419 = cos(mul_420); - double mul_414 = (cos_419 * cos_419); - double add_444 = ((m_history_5 + phasor_451) + 0.25); - double mod_443 = safemod(add_444, 1); - double delta_411 = m_delta_43(mod_443); - double sah_389 = m_sah_44(mul_409, delta_411, 0); - double sah_410 = m_sah_45(mstosamps_445, delta_411, 0); - double mul_397 = (sah_410 * mod_443); - double sub_442 = (mod_443 - 0.5); - double mul_441 = (sub_442 * 3.1415926535898); - double cos_440 = cos(mul_441); - double mul_416 = (cos_440 * cos_440); - double add_429 = ((m_history_4 + phasor_451) + 0.5); - double mod_428 = safemod(add_429, 1); - double delta_408 = m_delta_46(mod_428); - double sah_387 = m_sah_47(mul_406, delta_408, 0); - double sah_407 = m_sah_48(mstosamps_445, delta_408, 0); - double mul_396 = (sah_407 * mod_428); - double sub_427 = (mod_428 - 0.5); - double mul_426 = (sub_427 * 3.1415926535898); - double cos_425 = cos(mul_426); - double mul_415 = (cos_425 * cos_425); - double add_450 = ((m_history_3 + phasor_451) + 0); - double mod_449 = safemod(add_450, 1); - double delta_392 = m_delta_49(mod_449); - double sah_391 = m_sah_50(mul_412, delta_392, 0); - double sah_413 = m_sah_51(mstosamps_445, delta_392, 0); - double mul_398 = (sah_413 * mod_449); - double tap_700 = m_delay_17.read_linear(mul_398); - double tap_701 = m_delay_17.read_linear(mul_397); - double tap_702 = m_delay_17.read_linear(mul_396); - double tap_703 = m_delay_17.read_linear(mul_395); - double mul_418 = (tap_703 * mul_414); - double mul_424 = (tap_702 * mul_415); - double mul_433 = (tap_701 * mul_416); - double sub_448 = (mod_449 - 0.5); - double mul_447 = (sub_448 * 3.1415926535898); - double cos_446 = cos(mul_447); - double mul_417 = (cos_446 * cos_446); - double mul_434 = (tap_700 * mul_417); - double mul_372 = ((((mul_434 + mul_433) + mul_424) + mul_418) * add_373); - double sub_369 = (mul_372 - (mul_371 + mul_370)); - double mix_777 = (in1 + (m_shimmer_33 * (sub_369 - in1))); - double mix_394 = mix_777; - double mul_454 = (mix_394 * 0.707); - double mix_778 = (mul_454 + (rsub_605 * (m_history_1 - mul_454))); - double mix_604 = mix_778; - double tap_588 = m_delay_16.read_linear(mul_589); - double mul_586 = (tap_588 * 0.75); - double sub_585 = (mix_604 - mul_586); - double mul_584 = (sub_585 * 0.75); - double add_583 = (mul_584 + tap_588); - double tap_546 = m_delay_15.read_linear(mul_547); - double mul_544 = (tap_546 * 0.625); - double tap_572 = m_delay_14.read_linear(mul_573); - double mul_570 = (tap_572 * 0.625); - double tap_553 = m_delay_13.read_linear(mul_554); - double mul_551 = (tap_553 * 0.75); - double tap_581 = m_delay_12.read_linear(mul_582); - double mul_579 = (tap_581 * 0.75); - double mul_475 = (mul_463 * m_tail_32); - double mul_473 = (mul_461 * m_tail_32); - double add_459 = (mul_475 + mul_473); - double mul_474 = (mul_462 * m_tail_32); - double mul_472 = (mul_460 * m_tail_32); - double add_458 = (mul_474 + mul_472); - double sub_467 = (add_459 - add_458); - double mul_471 = (mul_518 * m_early_34); - double mul_469 = (mul_514 * m_early_34); - double add_457 = (mul_471 + mul_469); - double mul_470 = (mul_516 * m_early_34); - double mul_468 = (mul_512 * m_early_34); - double add_456 = (mul_470 + mul_468); - double sub_466 = (add_457 - add_456); - double add_453 = (sub_467 + sub_466); - double add_455 = (add_453 + mix_394); - double sub_550 = (add_455 - mul_551); - double mul_549 = (sub_550 * 0.75); - double add_548 = (mul_549 + tap_553); - double sub_543 = (add_548 - mul_544); - double mul_542 = (sub_543 * 0.625); - double add_541 = (mul_542 + tap_546); - double sub_536 = (add_541 - mul_537); - double mul_535 = (sub_536 * 0.625); - double add_534 = (mul_535 + tap_539); - double mul_452 = (add_534 * m_mix_38); - double out2 = (mul_452 + in1); - double add_465 = (add_453 + mix_394); - double sub_578 = (add_465 - mul_579); - double mul_577 = (sub_578 * 0.75); - double add_576 = (mul_577 + tap_581); - double sub_569 = (add_576 - mul_570); - double mul_568 = (sub_569 * 0.625); - double add_567 = (mul_568 + tap_572); - double sub_562 = (add_567 - mul_563); - double mul_561 = (sub_562 * 0.625); - double add_560 = (mul_561 + tap_565); - double mul_464 = (add_560 * m_mix_38); - double out1 = (mul_464 + in1); - double y2_next_762 = m_y_2; - double history_491_next_763 = mix_492; - double history_599_next_764 = mix_600; - double history_503_next_765 = mix_504; - double history_497_next_766 = mix_498; - double history_386_next_767 = sah_385; - double history_390_next_768 = sah_389; - double history_388_next_769 = sah_387; - double history_393_next_770 = sah_391; - double y1_next_771 = sub_369; - double history_603_next_772 = mix_604; - m_delay_24.write(add_485); - m_delay_23.write(add_488); - m_delay_22.write(add_487); - m_delay_21.write(add_486); - m_delay_20.write(sub_536); - m_delay_19.write(sub_562); - m_delay_18.write(add_583); - m_delay_17.write(in1); - m_delay_16.write(sub_585); - m_delay_15.write(sub_543); - m_delay_14.write(sub_569); - m_delay_13.write(sub_550); - m_delay_12.write(sub_578); - m_y_11 = y2_next_762; - m_history_10 = history_491_next_763; - m_history_9 = history_599_next_764; - m_history_8 = history_503_next_765; - m_history_7 = history_497_next_766; - m_history_6 = history_386_next_767; - m_history_5 = history_390_next_768; - m_history_4 = history_388_next_769; - m_history_3 = history_393_next_770; - m_y_2 = y1_next_771; - m_history_1 = history_603_next_772; + double noise_14 = noise(); + double abs_32 = fabs(noise_14); + double mul_36 = (abs_32 * m_blur_36); + double noise_16 = noise(); + double abs_34 = fabs(noise_16); + double mul_42 = (abs_34 * m_blur_36); + double noise_17 = noise(); + double abs_35 = fabs(noise_17); + double mul_45 = (abs_35 * m_blur_36); + double noise_15 = noise(); + double abs_33 = fabs(noise_15); + double mul_39 = (abs_33 * m_blur_36); + double tap_235 = m_delay_24.read_linear(mul_230); + double mul_226 = (tap_235 * expr_270); + double mix_297 = (mul_226 + (m_damping_30 * (m_history_10 - mul_226))); + double mix_233 = mix_297; + double tap_139 = m_delay_23.read_linear(mul_229); + double mul_135 = (tap_139 * expr_265); + double mix_298 = (mul_135 + (m_damping_30 * (m_history_9 - mul_135))); + double mix_137 = mix_298; + double tap_133 = m_delay_22.read_linear(mul_228); + double mul_129 = (tap_133 * expr_264); + double mix_299 = (mul_129 + (m_damping_30 * (m_history_8 - mul_129))); + double mix_131 = mix_299; + double tap_127 = m_delay_21.read_linear(mul_227); + double mul_123 = (tap_127 * expr_263); + double mix_300 = (mul_123 + (m_damping_30 * (m_history_7 - mul_123))); + double mix_125 = mix_300; + double mul_3 = (mul_7 * m_y_11); + double mul_4 = (mul_8 * m_y_2); + double add_117 = (mix_233 + mix_137); + double add_115 = (mix_131 + mix_125); + double sub_114 = (add_117 - add_115); + double mul_96 = (sub_114 * 0.5); + double add_110 = (add_117 + add_115); + double mul_93 = (add_110 * 0.5); + double tap_172 = m_delay_20.read_linear(mul_173); + double mul_170 = (tap_172 * 0.625); + double sub_116 = (mix_233 - mix_137); + double sub_113 = (mix_131 - mix_125); + double sub_112 = (sub_116 - sub_113); + double mul_95 = (sub_112 * 0.5); + double add_111 = (sub_116 + sub_113); + double rsub_109 = (0 - add_111); + double mul_94 = (rsub_109 * 0.5); + double tap_198 = m_delay_19.read_linear(mul_199); + double mul_196 = (tap_198 * 0.625); + double phasor_84 = m_phasor_39(div_63, samples_to_seconds); + double add_56 = ((m_history_6 + phasor_84) + 0.75); + double mod_55 = safemod(add_56, 1); + double delta_38 = m_delta_40(mod_55); + double sah_18 = m_sah_41(mul_36, delta_38, 0); + double sah_37 = m_sah_42(mstosamps_78, delta_38, 0); + double mul_28 = (sah_37 * mod_55); + double sub_54 = (mod_55 - 0.5); + double mul_53 = (sub_54 * 3.1415926535898); + double cos_52 = cos(mul_53); + double mul_47 = (cos_52 * cos_52); + double add_77 = ((m_history_5 + phasor_84) + 0.25); + double mod_76 = safemod(add_77, 1); + double delta_44 = m_delta_43(mod_76); + double sah_22 = m_sah_44(mul_42, delta_44, 0); + double sah_43 = m_sah_45(mstosamps_78, delta_44, 0); + double mul_30 = (sah_43 * mod_76); + double sub_75 = (mod_76 - 0.5); + double mul_74 = (sub_75 * 3.1415926535898); + double cos_73 = cos(mul_74); + double mul_49 = (cos_73 * cos_73); + double add_83 = ((m_history_4 + phasor_84) + 0); + double mod_82 = safemod(add_83, 1); + double delta_25 = m_delta_46(mod_82); + double sah_24 = m_sah_47(mul_45, delta_25, 0); + double sah_46 = m_sah_48(mstosamps_78, delta_25, 0); + double mul_31 = (sah_46 * mod_82); + double sub_81 = (mod_82 - 0.5); + double mul_80 = (sub_81 * 3.1415926535898); + double cos_79 = cos(mul_80); + double mul_50 = (cos_79 * cos_79); + double add_62 = ((m_history_3 + phasor_84) + 0.5); + double mod_61 = safemod(add_62, 1); + double delta_41 = m_delta_49(mod_61); + double sah_20 = m_sah_50(mul_39, delta_41, 0); + double sah_40 = m_sah_51(mstosamps_78, delta_41, 0); + double mul_29 = (sah_40 * mod_61); + double tap_69 = m_delay_18.read_linear(mul_31); + double tap_70 = m_delay_18.read_linear(mul_30); + double tap_71 = m_delay_18.read_linear(mul_29); + double tap_72 = m_delay_18.read_linear(mul_28); + double mul_51 = (tap_72 * mul_47); + double mul_66 = (tap_70 * mul_49); + double mul_67 = (tap_69 * mul_50); + double sub_60 = (mod_61 - 0.5); + double mul_59 = (sub_60 * 3.1415926535898); + double cos_58 = cos(mul_59); + double mul_48 = (cos_58 * cos_58); + double mul_57 = (tap_71 * mul_48); + double mul_5 = ((((mul_67 + mul_66) + mul_57) + mul_51) * add_6); + double sub_2 = (mul_5 - (mul_4 + mul_3)); + double mix_301 = (in1 + (m_shimmer_35 * (sub_2 - in1))); + double mix_27 = mix_301; + double mul_87 = (mix_27 * 0.707); + double mix_302 = (mul_87 + (rsub_238 * (m_history_1 - mul_87))); + double mix_237 = mix_302; + double tap_141 = m_delay_17.read_linear(add_156); + double tap_142 = m_delay_17.read_linear(add_155); + double tap_143 = m_delay_17.read_linear(add_154); + double tap_144 = m_delay_17.read_linear(add_153); + double mul_151 = (tap_141 * expr_269); + double add_121 = (mul_96 + mul_151); + double mul_149 = (tap_142 * expr_268); + double add_120 = (mul_95 + mul_149); + double mul_145 = (tap_144 * expr_266); + double add_118 = (mul_93 + mul_145); + double mul_147 = (tap_143 * expr_267); + double add_119 = (mul_94 + mul_147); + double tap_221 = m_delay_16.read_linear(mul_222); + double mul_219 = (tap_221 * 0.75); + double sub_218 = (mix_237 - mul_219); + double mul_217 = (sub_218 * 0.75); + double add_216 = (mul_217 + tap_221); + double tap_179 = m_delay_15.read_linear(mul_180); + double mul_177 = (tap_179 * 0.625); + double tap_205 = m_delay_14.read_linear(mul_206); + double mul_203 = (tap_205 * 0.625); + double tap_186 = m_delay_13.read_linear(mul_187); + double mul_184 = (tap_186 * 0.75); + double tap_214 = m_delay_12.read_linear(mul_215); + double mul_212 = (tap_214 * 0.75); + double mul_108 = (mul_96 * m_tail_28); + double mul_106 = (mul_94 * m_tail_28); + double add_92 = (mul_108 + mul_106); + double mul_107 = (mul_95 * m_tail_28); + double mul_105 = (mul_93 * m_tail_28); + double add_91 = (mul_107 + mul_105); + double sub_100 = (add_92 - add_91); + double mul_104 = (mul_151 * m_early_34); + double mul_102 = (mul_147 * m_early_34); + double add_90 = (mul_104 + mul_102); + double mul_103 = (mul_149 * m_early_34); + double mul_101 = (mul_145 * m_early_34); + double add_89 = (mul_103 + mul_101); + double sub_99 = (add_90 - add_89); + double add_86 = (sub_100 + sub_99); + double add_88 = (add_86 + mix_27); + double sub_183 = (add_88 - mul_184); + double mul_182 = (sub_183 * 0.75); + double add_181 = (mul_182 + tap_186); + double sub_176 = (add_181 - mul_177); + double mul_175 = (sub_176 * 0.625); + double add_174 = (mul_175 + tap_179); + double sub_169 = (add_174 - mul_170); + double mul_168 = (sub_169 * 0.625); + double add_167 = (mul_168 + tap_172); + double mul_85 = (add_167 * m_mix_31); + double out2 = (mul_85 + in1); + double add_98 = (add_86 + mix_27); + double sub_211 = (add_98 - mul_212); + double mul_210 = (sub_211 * 0.75); + double add_209 = (mul_210 + tap_214); + double sub_202 = (add_209 - mul_203); + double mul_201 = (sub_202 * 0.625); + double add_200 = (mul_201 + tap_205); + double sub_195 = (add_200 - mul_196); + double mul_194 = (sub_195 * 0.625); + double add_193 = (mul_194 + tap_198); + double mul_97 = (add_193 * m_mix_31); + double out1 = (mul_97 + in1); + double y2_next_286 = m_y_2; + double history_232_next_287 = mix_233; + double history_136_next_288 = mix_137; + double history_130_next_289 = mix_131; + double history_124_next_290 = mix_125; + double history_19_next_291 = sah_18; + double history_23_next_292 = sah_22; + double history_26_next_293 = sah_24; + double history_21_next_294 = sah_20; + double y1_next_295 = sub_2; + double history_236_next_296 = mix_237; + m_delay_24.write(add_121); + m_delay_23.write(add_120); + m_delay_22.write(add_119); + m_delay_21.write(add_118); + m_delay_20.write(sub_169); + m_delay_19.write(sub_195); + m_delay_18.write(in1); + m_delay_17.write(add_216); + m_delay_16.write(sub_218); + m_delay_15.write(sub_176); + m_delay_14.write(sub_202); + m_delay_13.write(sub_183); + m_delay_12.write(sub_211); + m_y_11 = y2_next_286; + m_history_10 = history_232_next_287; + m_history_9 = history_136_next_288; + m_history_8 = history_130_next_289; + m_history_7 = history_124_next_290; + m_history_6 = history_19_next_291; + m_history_5 = history_23_next_292; + m_history_4 = history_26_next_293; + m_history_3 = history_21_next_294; + m_y_2 = y1_next_295; + m_history_1 = history_236_next_296; m_delay_12.step(); m_delay_13.step(); m_delay_14.step(); @@ -445,47 +445,47 @@ typedef struct State { return __exception; }; - inline void set_window(double _value) { - m_window_25 = (_value < 0.1 ? 0.1 : (_value > 1000 ? 1000 : _value)); - }; - inline void set_blur(double _value) { - m_blur_26 = (_value < 0.01 ? 0.01 : (_value > 0.25 ? 0.25 : _value)); - }; - inline void set_tone(double _value) { - m_tone_27 = (_value < 0 ? 0 : (_value > 1 ? 1 : _value)); - }; inline void set_roomsize(double _value) { - m_roomsize_28 = (_value < 0.1 ? 0.1 : (_value > 300 ? 300 : _value)); - }; - inline void set_damping(double _value) { - m_damping_29 = (_value < 0 ? 0 : (_value > 1 ? 1 : _value)); + m_roomsize_25 = (_value < 0.1 ? 0.1 : (_value > 300 ? 300 : _value)); }; inline void set_decay(double _value) { - m_decay_30 = (_value < 0.1 ? 0.1 : (_value > 360 ? 360 : _value)); + m_decay_26 = (_value < 0.1 ? 0.1 : (_value > 360 ? 360 : _value)); }; inline void set_spread(double _value) { - m_spread_31 = (_value < 0 ? 0 : (_value > 100 ? 100 : _value)); + m_spread_27 = (_value < 0 ? 0 : (_value > 100 ? 100 : _value)); }; inline void set_tail(double _value) { - m_tail_32 = (_value < 0 ? 0 : (_value > 1 ? 1 : _value)); + m_tail_28 = (_value < 0 ? 0 : (_value > 1 ? 1 : _value)); }; - inline void set_shimmer(double _value) { - m_shimmer_33 = (_value < 0 ? 0 : (_value > 1 ? 1 : _value)); + inline void set_tone(double _value) { + m_tone_29 = (_value < 0 ? 0 : (_value > 1 ? 1 : _value)); + }; + inline void set_damping(double _value) { + m_damping_30 = (_value < 0 ? 0 : (_value > 1 ? 1 : _value)); + }; + inline void set_mix(double _value) { + m_mix_31 = (_value < 0 ? 0 : (_value > 1 ? 1 : _value)); + }; + inline void set_resonance(double _value) { + m_resonance_32 = (_value < 0 ? 0 : (_value > 0.25 ? 0.25 : _value)); + }; + inline void set_cutoff(double _value) { + m_cutoff_33 = (_value < 0 ? 0 : (_value > 6000 ? 6000 : _value)); }; inline void set_early(double _value) { m_early_34 = (_value < 0 ? 0 : (_value > 1 ? 1 : _value)); }; - inline void set_cutoff(double _value) { - m_cutoff_35 = (_value < 0 ? 0 : (_value > 6000 ? 6000 : _value)); + inline void set_shimmer(double _value) { + m_shimmer_35 = (_value < 0 ? 0 : (_value > 1 ? 1 : _value)); }; - inline void set_resonance(double _value) { - m_resonance_36 = (_value < 0 ? 0 : (_value > 0.25 ? 0.25 : _value)); + inline void set_blur(double _value) { + m_blur_36 = (_value < 0.01 ? 0.01 : (_value > 0.25 ? 0.25 : _value)); }; - inline void set_ratio(double _value) { - m_ratio_37 = (_value < 0.5 ? 0.5 : (_value > 2 ? 2 : _value)); + inline void set_window(double _value) { + m_window_37 = (_value < 0.1 ? 0.1 : (_value > 1000 ? 1000 : _value)); }; - inline void set_mix(double _value) { - m_mix_38 = (_value < 0 ? 0 : (_value > 1 ? 1 : _value)); + inline void set_ratio(double _value) { + m_ratio_38 = (_value < 0.5 ? 0.5 : (_value > 2 ? 2 : _value)); }; } State; @@ -528,20 +528,20 @@ void reset(CommonState *cself) { void setparameter(CommonState *cself, long index, double value, void *ref) { State * self = (State *)cself; switch (index) { - case 0: self->set_window(value); break; - case 1: self->set_blur(value); break; - case 2: self->set_tone(value); break; - case 3: self->set_roomsize(value); break; - case 4: self->set_damping(value); break; - case 5: self->set_decay(value); break; - case 6: self->set_spread(value); break; - case 7: self->set_tail(value); break; - case 8: self->set_shimmer(value); break; + case 0: self->set_roomsize(value); break; + case 1: self->set_decay(value); break; + case 2: self->set_spread(value); break; + case 3: self->set_tail(value); break; + case 4: self->set_tone(value); break; + case 5: self->set_damping(value); break; + case 6: self->set_mix(value); break; + case 7: self->set_resonance(value); break; + case 8: self->set_cutoff(value); break; case 9: self->set_early(value); break; - case 10: self->set_cutoff(value); break; - case 11: self->set_resonance(value); break; - case 12: self->set_ratio(value); break; - case 13: self->set_mix(value); break; + case 10: self->set_shimmer(value); break; + case 11: self->set_blur(value); break; + case 12: self->set_window(value); break; + case 13: self->set_ratio(value); break; default: break; } @@ -552,20 +552,20 @@ void setparameter(CommonState *cself, long index, double value, void *ref) { void getparameter(CommonState *cself, long index, double *value) { State *self = (State *)cself; switch (index) { - case 0: *value = self->m_window_25; break; - case 1: *value = self->m_blur_26; break; - case 2: *value = self->m_tone_27; break; - case 3: *value = self->m_roomsize_28; break; - case 4: *value = self->m_damping_29; break; - case 5: *value = self->m_decay_30; break; - case 6: *value = self->m_spread_31; break; - case 7: *value = self->m_tail_32; break; - case 8: *value = self->m_shimmer_33; break; + case 0: *value = self->m_roomsize_25; break; + case 1: *value = self->m_decay_26; break; + case 2: *value = self->m_spread_27; break; + case 3: *value = self->m_tail_28; break; + case 4: *value = self->m_tone_29; break; + case 5: *value = self->m_damping_30; break; + case 6: *value = self->m_mix_31; break; + case 7: *value = self->m_resonance_32; break; + case 8: *value = self->m_cutoff_33; break; case 9: *value = self->m_early_34; break; - case 10: *value = self->m_cutoff_35; break; - case 11: *value = self->m_resonance_36; break; - case 12: *value = self->m_ratio_37; break; - case 13: *value = self->m_mix_38; break; + case 10: *value = self->m_shimmer_35; break; + case 11: *value = self->m_blur_36; break; + case 12: *value = self->m_window_37; break; + case 13: *value = self->m_ratio_38; break; default: break; } @@ -585,67 +585,67 @@ void * create(double sr, long vs) { self->__commonstate.vs = vs; self->__commonstate.params = (ParamInfo *)genlib_sysmem_newptr(14 * sizeof(ParamInfo)); self->__commonstate.numparams = 14; - // initialize parameter 0 ("m_window_25") + // initialize parameter 0 ("m_roomsize_25") pi = self->__commonstate.params + 0; - pi->name = "window"; + pi->name = "roomsize"; pi->paramtype = GENLIB_PARAMTYPE_FLOAT; - pi->defaultvalue = self->m_window_25; + pi->defaultvalue = self->m_roomsize_25; pi->defaultref = 0; pi->hasinputminmax = false; pi->inputmin = 0; pi->inputmax = 1; pi->hasminmax = true; pi->outputmin = 0.1; - pi->outputmax = 1000; + pi->outputmax = 300; pi->exp = 0; pi->units = ""; // no units defined - // initialize parameter 1 ("m_blur_26") + // initialize parameter 1 ("m_decay_26") pi = self->__commonstate.params + 1; - pi->name = "blur"; + pi->name = "decay"; pi->paramtype = GENLIB_PARAMTYPE_FLOAT; - pi->defaultvalue = self->m_blur_26; + pi->defaultvalue = self->m_decay_26; pi->defaultref = 0; pi->hasinputminmax = false; pi->inputmin = 0; pi->inputmax = 1; pi->hasminmax = true; - pi->outputmin = 0.01; - pi->outputmax = 0.25; + pi->outputmin = 0.1; + pi->outputmax = 360; pi->exp = 0; pi->units = ""; // no units defined - // initialize parameter 2 ("m_tone_27") + // initialize parameter 2 ("m_spread_27") pi = self->__commonstate.params + 2; - pi->name = "tone"; + pi->name = "spread"; pi->paramtype = GENLIB_PARAMTYPE_FLOAT; - pi->defaultvalue = self->m_tone_27; + pi->defaultvalue = self->m_spread_27; pi->defaultref = 0; pi->hasinputminmax = false; pi->inputmin = 0; pi->inputmax = 1; pi->hasminmax = true; pi->outputmin = 0; - pi->outputmax = 1; + pi->outputmax = 100; pi->exp = 0; pi->units = ""; // no units defined - // initialize parameter 3 ("m_roomsize_28") + // initialize parameter 3 ("m_tail_28") pi = self->__commonstate.params + 3; - pi->name = "roomsize"; + pi->name = "tail"; pi->paramtype = GENLIB_PARAMTYPE_FLOAT; - pi->defaultvalue = self->m_roomsize_28; + pi->defaultvalue = self->m_tail_28; pi->defaultref = 0; pi->hasinputminmax = false; pi->inputmin = 0; pi->inputmax = 1; pi->hasminmax = true; - pi->outputmin = 0.1; - pi->outputmax = 300; + pi->outputmin = 0; + pi->outputmax = 1; pi->exp = 0; pi->units = ""; // no units defined - // initialize parameter 4 ("m_damping_29") + // initialize parameter 4 ("m_tone_29") pi = self->__commonstate.params + 4; - pi->name = "damping"; + pi->name = "tone"; pi->paramtype = GENLIB_PARAMTYPE_FLOAT; - pi->defaultvalue = self->m_damping_29; + pi->defaultvalue = self->m_tone_29; pi->defaultref = 0; pi->hasinputminmax = false; pi->inputmin = 0; @@ -655,60 +655,60 @@ void * create(double sr, long vs) { pi->outputmax = 1; pi->exp = 0; pi->units = ""; // no units defined - // initialize parameter 5 ("m_decay_30") + // initialize parameter 5 ("m_damping_30") pi = self->__commonstate.params + 5; - pi->name = "decay"; + pi->name = "damping"; pi->paramtype = GENLIB_PARAMTYPE_FLOAT; - pi->defaultvalue = self->m_decay_30; + pi->defaultvalue = self->m_damping_30; pi->defaultref = 0; pi->hasinputminmax = false; pi->inputmin = 0; pi->inputmax = 1; pi->hasminmax = true; - pi->outputmin = 0.1; - pi->outputmax = 360; + pi->outputmin = 0; + pi->outputmax = 1; pi->exp = 0; pi->units = ""; // no units defined - // initialize parameter 6 ("m_spread_31") + // initialize parameter 6 ("m_mix_31") pi = self->__commonstate.params + 6; - pi->name = "spread"; + pi->name = "mix"; pi->paramtype = GENLIB_PARAMTYPE_FLOAT; - pi->defaultvalue = self->m_spread_31; + pi->defaultvalue = self->m_mix_31; pi->defaultref = 0; pi->hasinputminmax = false; pi->inputmin = 0; pi->inputmax = 1; pi->hasminmax = true; pi->outputmin = 0; - pi->outputmax = 100; + pi->outputmax = 1; pi->exp = 0; pi->units = ""; // no units defined - // initialize parameter 7 ("m_tail_32") + // initialize parameter 7 ("m_resonance_32") pi = self->__commonstate.params + 7; - pi->name = "tail"; + pi->name = "resonance"; pi->paramtype = GENLIB_PARAMTYPE_FLOAT; - pi->defaultvalue = self->m_tail_32; + pi->defaultvalue = self->m_resonance_32; pi->defaultref = 0; pi->hasinputminmax = false; pi->inputmin = 0; pi->inputmax = 1; pi->hasminmax = true; pi->outputmin = 0; - pi->outputmax = 1; + pi->outputmax = 0.25; pi->exp = 0; pi->units = ""; // no units defined - // initialize parameter 8 ("m_shimmer_33") + // initialize parameter 8 ("m_cutoff_33") pi = self->__commonstate.params + 8; - pi->name = "shimmer"; + pi->name = "cutoff"; pi->paramtype = GENLIB_PARAMTYPE_FLOAT; - pi->defaultvalue = self->m_shimmer_33; + pi->defaultvalue = self->m_cutoff_33; pi->defaultref = 0; pi->hasinputminmax = false; pi->inputmin = 0; pi->inputmax = 1; pi->hasminmax = true; pi->outputmin = 0; - pi->outputmax = 1; + pi->outputmax = 6000; pi->exp = 0; pi->units = ""; // no units defined // initialize parameter 9 ("m_early_34") @@ -725,60 +725,60 @@ void * create(double sr, long vs) { pi->outputmax = 1; pi->exp = 0; pi->units = ""; // no units defined - // initialize parameter 10 ("m_cutoff_35") + // initialize parameter 10 ("m_shimmer_35") pi = self->__commonstate.params + 10; - pi->name = "cutoff"; + pi->name = "shimmer"; pi->paramtype = GENLIB_PARAMTYPE_FLOAT; - pi->defaultvalue = self->m_cutoff_35; + pi->defaultvalue = self->m_shimmer_35; pi->defaultref = 0; pi->hasinputminmax = false; pi->inputmin = 0; pi->inputmax = 1; pi->hasminmax = true; pi->outputmin = 0; - pi->outputmax = 6000; + pi->outputmax = 1; pi->exp = 0; pi->units = ""; // no units defined - // initialize parameter 11 ("m_resonance_36") + // initialize parameter 11 ("m_blur_36") pi = self->__commonstate.params + 11; - pi->name = "resonance"; + pi->name = "blur"; pi->paramtype = GENLIB_PARAMTYPE_FLOAT; - pi->defaultvalue = self->m_resonance_36; + pi->defaultvalue = self->m_blur_36; pi->defaultref = 0; pi->hasinputminmax = false; pi->inputmin = 0; pi->inputmax = 1; pi->hasminmax = true; - pi->outputmin = 0; + pi->outputmin = 0.01; pi->outputmax = 0.25; pi->exp = 0; pi->units = ""; // no units defined - // initialize parameter 12 ("m_ratio_37") + // initialize parameter 12 ("m_window_37") pi = self->__commonstate.params + 12; - pi->name = "ratio"; + pi->name = "window"; pi->paramtype = GENLIB_PARAMTYPE_FLOAT; - pi->defaultvalue = self->m_ratio_37; + pi->defaultvalue = self->m_window_37; pi->defaultref = 0; pi->hasinputminmax = false; pi->inputmin = 0; pi->inputmax = 1; pi->hasminmax = true; - pi->outputmin = 0.5; - pi->outputmax = 2; + pi->outputmin = 0.1; + pi->outputmax = 1000; pi->exp = 0; pi->units = ""; // no units defined - // initialize parameter 13 ("m_mix_38") + // initialize parameter 13 ("m_ratio_38") pi = self->__commonstate.params + 13; - pi->name = "mix"; + pi->name = "ratio"; pi->paramtype = GENLIB_PARAMTYPE_FLOAT; - pi->defaultvalue = self->m_mix_38; + pi->defaultvalue = self->m_ratio_38; pi->defaultref = 0; pi->hasinputminmax = false; pi->inputmin = 0; pi->inputmax = 1; pi->hasminmax = true; - pi->outputmin = 0; - pi->outputmax = 1; + pi->outputmin = 0.5; + pi->outputmax = 2; pi->exp = 0; pi->units = ""; // no units defined diff --git a/plugins/shiroverb/gen~.shiroverb.maxpat b/plugins/shiroverb/gen~.shiroverb.maxpat index 7601b5e..e51f44a 100644 --- a/plugins/shiroverb/gen~.shiroverb.maxpat +++ b/plugins/shiroverb/gen~.shiroverb.maxpat @@ -8,7 +8,7 @@ "architecture" : "x86" } , - "rect" : [ 27.0, 92.0, 914.0, 640.0 ], + "rect" : [ 27.0, 118.0, 914.0, 614.0 ], "bglocked" : 0, "openinpresentation" : 0, "default_fontsize" : 12.0, @@ -246,7 +246,7 @@ "outlettype" : [ "signal", "signal", "", "float", "list" ], "parameter_enable" : 1, "patching_rect" : [ 15.0, 528.0, 136.0, 42.0 ], - "presentation_rect" : [ 60.0, 60.0, 50.0, 28.0 ], + "presentation_rect" : [ 60.0, 60.0, 50.0, 42.0 ], "saved_attribute_attributes" : { "valueof" : { "parameter_longname" : "live.gain~", @@ -2630,20 +2630,6 @@ "text" : "delay 48000 4" } - } -, { - "box" : { - "fontname" : "Arial", - "fontsize" : 12.0, - "frgb" : 0.0, - "id" : "obj-212", - "maxclass" : "comment", - "numinlets" : 1, - "numoutlets" : 0, - "patching_rect" : [ 871.0, 1003.0, 75.0, 20.0 ], - "text" : "prediffuse" - } - } , { "box" : { @@ -3876,20 +3862,6 @@ "text" : "mix" } - } -, { - "box" : { - "fontname" : "Arial", - "fontsize" : 12.0, - "frgb" : 0.0, - "id" : "obj-16", - "maxclass" : "comment", - "numinlets" : 1, - "numoutlets" : 0, - "patching_rect" : [ 931.0, 868.0, 90.0, 20.0 ], - "text" : "input damper" - } - } , { "box" : { @@ -3971,8 +3943,8 @@ "numinlets" : 0, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 511.0, 1258.0, 214.0, 20.0 ], - "text" : "param damping 0.5 @min 0. @max 1." + "patching_rect" : [ 511.0, 1258.0, 220.0, 20.0 ], + "text" : "param damping 0.75 @min 0. @max 1." } } @@ -7745,10 +7717,10 @@ } ], "parameters" : { - "obj-6" : [ "live.gain~", "live.gain~", 0 ], - "obj-7::obj-32" : [ "[8]", "[2]", 0 ], "obj-7::obj-21::obj-6" : [ "live.tab[3]", "live.tab[1]", 0 ], - "obj-7::obj-35" : [ "[5]", "Level", 0 ] + "obj-6" : [ "live.gain~", "live.gain~", 0 ], + "obj-7::obj-35" : [ "[5]", "Level", 0 ], + "obj-7::obj-32" : [ "[8]", "[2]", 0 ] } , "dependency_cache" : [ { diff --git a/plugins/shiroverb/shiroverb.gendsp b/plugins/shiroverb/shiroverb.gendsp index 60be1a5..7e27997 100644 --- a/plugins/shiroverb/shiroverb.gendsp +++ b/plugins/shiroverb/shiroverb.gendsp @@ -2086,20 +2086,6 @@ "text" : "delay 48000 4" } - } -, { - "box" : { - "fontname" : "Arial", - "fontsize" : 12.0, - "frgb" : 0.0, - "id" : "obj-212", - "maxclass" : "comment", - "numinlets" : 1, - "numoutlets" : 0, - "patching_rect" : [ 871.0, 1003.0, 75.0, 20.0 ], - "text" : "prediffuse" - } - } , { "box" : { @@ -3332,20 +3318,6 @@ "text" : "mix" } - } -, { - "box" : { - "fontname" : "Arial", - "fontsize" : 12.0, - "frgb" : 0.0, - "id" : "obj-16", - "maxclass" : "comment", - "numinlets" : 1, - "numoutlets" : 0, - "patching_rect" : [ 931.0, 868.0, 90.0, 20.0 ], - "text" : "input damper" - } - } , { "box" : { @@ -3427,8 +3399,8 @@ "numinlets" : 0, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 511.0, 1258.0, 214.0, 20.0 ], - "text" : "param damping 0.5 @min 0. @max 1." + "patching_rect" : [ 511.0, 1258.0, 220.0, 20.0 ], + "text" : "param damping 0.75 @min 0. @max 1." } }