notwa/crap
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

dumb fixes

Browse source
This commit is contained in:
Connor Olding 2015-06-08 15:27:16 -07:00
parent 2bd8ebb62c
commit 3cc5467f5b
3 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
crap/eq_const_T420.hpp
View file

@ -10,9 +10,9 @@
struct Crap_eq_const_T420 struct Crap_eq_const_T420
:public AdjustAll<Buffer2<Crap>> { :public AdjustAll<Buffer2<Crap>> {
static constexpr ulong id = 0x0DEFACED; static constexpr ulong id = 0x0DEFACED + 420;
static constexpr char label[] = "crap_eq_const"; static constexpr char label[] = "crap_eq_const_T420";
static constexpr char name[] = "crap Constant Equalizer"; static constexpr char name[] = "crap T420 Speaker Compensation";
static constexpr char author[] = "Connor Olding"; static constexpr char author[] = "Connor Olding";
static constexpr char copyright[] = "MIT"; static constexpr char copyright[] = "MIT";
@ -72,6 +72,8 @@ struct Crap_eq_const_T420
f[13] = biquad_gen(FILT_PEAKING, 490, -1.5, 0.23, fs); f[13] = biquad_gen(FILT_PEAKING, 490, -1.5, 0.23, fs);
f[14] = biquad_gen(FILT_PEAKING, 3100, 5.0, 0.33, fs); f[14] = biquad_gen(FILT_PEAKING, 3100, 5.0, 0.33, fs);
f[15] = biquad_gen(FILT_LOWPASS, 14000, 0.0, 0.40, fs); f[15] = biquad_gen(FILT_LOWPASS, 14000, 0.0, 0.40, fs);
for (int i = 0; i < bands; i++)
filters_R[i] = filters_L[i];
} }
}; };

15
crap/eq_const_T420_svf.hpp
View file

@ -13,7 +13,7 @@
struct Crap_eq_const_T420_svf struct Crap_eq_const_T420_svf
:public AdjustAll<Buffer4<Crap>> { :public AdjustAll<Buffer4<Crap>> {
static constexpr ulong id = 0x0DEFACED + 420 + 1337; static constexpr ulong id = 0x0DEFACED + 420 + 1337;
static constexpr char label[] = "crap_eq_const"; static constexpr char label[] = "crap_eq_const_T420_svf";
static constexpr char name[] = "crap T420 Speaker Compensation (SVF)"; static constexpr char name[] = "crap T420 Speaker Compensation (SVF)";
static constexpr char author[] = "Connor Olding"; static constexpr char author[] = "Connor Olding";
static constexpr char copyright[] = "MIT"; static constexpr char copyright[] = "MIT";
@ -24,7 +24,7 @@ struct Crap_eq_const_T420_svf
svf_matrix<v4sf> filters_L[bands]; svf_matrix<v4sf> filters_L[bands];
svf_matrix<v4sf> filters_R[bands]; svf_matrix<v4sf> filters_R[bands];
virtual inline void inline void
process2(v4sf *buf_L, v4sf *buf_R, ulong rem) process2(v4sf *buf_L, v4sf *buf_R, ulong rem)
{ {
svf_matrix<v4sf> *f0, *f1; svf_matrix<v4sf> *f0, *f1;
@ -48,10 +48,10 @@ struct Crap_eq_const_T420_svf
inline void inline void
resume() resume()
{ {
svf_matrix<v4sf> *filters = filters_L; for (int i = 0; i < bands; i++) {
for (int i = 0; i < bands; i++) filters_L[i].memory = v4sf(0);
filters[i].memory = v4sf(0); filters_R[i].memory = v4sf(0);
memcpy(filters_R, filters, bands*sizeof(svf_matrix<v4sf>)); }
} }
static inline void static inline void
@ -79,6 +79,9 @@ struct Crap_eq_const_T420_svf
f[13] = gen(FILT_PEAKING, 490, -1.5, 0.23, fs); f[13] = gen(FILT_PEAKING, 490, -1.5, 0.23, fs);
f[14] = gen(FILT_PEAKING, 3100, 5.0, 0.33, fs); f[14] = gen(FILT_PEAKING, 3100, 5.0, 0.33, fs);
f[15] = gen(FILT_LOWPASS, 14000, 0.0, 0.40, fs); f[15] = gen(FILT_LOWPASS, 14000, 0.0, 0.40, fs);
#undef gen
for (int i = 0; i < bands; i++)
filters_R[i] = filters_L[i];
} }
}; };

2
crap/tube.hpp
View file

@ -65,7 +65,7 @@ struct Crap_tube
for (ulong i = 0; i < rem; i++) for (ulong i = 0; i < rem; i++)
drives[i] = v2df(drive.smooth()); drives[i] = v2df(drive.smooth());
for (ulong i = 0; i < rem; i++) for (ulong i = 0; i < rem; i++)
drives[i] = v2df(wet.smooth()); wets[i] = v2df(wet.smooth());
for (ulong i = 0; i < rem; i++) for (ulong i = 0; i < rem; i++)
buf[i] = Tube::process(buf[i], drives[i], wets[i]); buf[i] = Tube::process(buf[i], drives[i], wets[i]);