1 files changed, 93 insertions, 84 deletions
diff --git a/apps/plugins/pdbox/PDa/extra/highpass.c b/apps/plugins/pdbox/PDa/extra/highpass.c
index f97ca233f3..05e8a06d59 100644
--- a/apps/plugins/pdbox/PDa/extra/highpass.c
+++ b/apps/plugins/pdbox/PDa/extra/highpass.c
@@ -1,85 +1,94 @@
-/* (C) Guenter Geiger <geiger@epy.co.at> */
+/* (C) Guenter Geiger <geiger@epy.co.at> */
-/*
+/*
- These filter coefficients computations are taken from
+ These filter coefficients computations are taken from
- http://www.harmony-central.com/Computer/Programming/Audio-EQ-Cookbook.txt  
+ http://www.harmony-central.com/Computer/Programming/Audio-EQ-Cookbook.txt  
- written by Robert Bristow-Johnson
+ written by Robert Bristow-Johnson
-*/
+*/
-#include "m_pd.h"
-#ifdef NT
+#ifdef ROCKBOX
-#pragma warning( disable : 4244 )
+#include "plugin.h"
-#pragma warning( disable : 4305 )
+#include "pdbox.h"
-#endif
+#include "m_pd.h"
-#include <math.h>
+#include "math.h"
-#include "filters.h"
+#include "filters.h"
+#else /* ROCKBOX */
+#include "m_pd.h"
-/* ------------------- highpass ----------------------------*/
+#ifdef NT
+#pragma warning( disable : 4244 )
-static t_class *highpass_class;
+#pragma warning( disable : 4305 )
+#endif
-void highpass_bang(t_rbjfilter *x)
+#include <math.h>
-{
+#include "filters.h"
-     t_atom at[5];
+#endif /* ROCKBOX */
-     t_float omega = e_omega(x->x_freq,x->x_rate);
-     t_float alpha = e_alpha(x->x_bw* 0.01,omega);
-     t_float b1 = -(1 + cos(omega));
+/* ------------------- highpass ----------------------------*/
-     t_float b0 = -b1/2.;
-     t_float b2 = b0;
+static t_class *highpass_class;
-     t_float a0 = 1 + alpha;
-     t_float a1 = -2.*cos(omega);
+void highpass_bang(t_rbjfilter *x)
-     t_float a2 = 1 - alpha;
+{
+     t_atom at[5];
-/*     post("bang %f %f %f",x->x_freq, x->x_gain, x->x_bw); */
+     t_float omega = e_omega(x->x_freq,x->x_rate);
-     
+     t_float alpha = e_alpha(x->x_bw* 0.01,omega);
-     if (!check_stability(-a1/a0,-a2/a0,b0/a0,b1/a0,b2/a0)) {
+     t_float b1 = -(1 + cos(omega));
-       post("highpass: filter unstable -> resetting");
+     t_float b0 = -b1/2.;
-       a0=1.;a1=0.;a2=0.;
+     t_float b2 = b0;
-       b0=1.;b1=0.;b2=0.;
+     t_float a0 = 1 + alpha;
-     }
+     t_float a1 = -2.*cos(omega);
+     t_float a2 = 1 - alpha;
-     SETFLOAT(at,-a1/a0);
-     SETFLOAT(at+1,-a2/a0);
+/*     post("bang %f %f %f",x->x_freq, x->x_gain, x->x_bw); */
-     SETFLOAT(at+2,b0/a0);
+     
-     SETFLOAT(at+3,b1/a0);
+     if (!check_stability(-a1/a0,-a2/a0,b0/a0,b1/a0,b2/a0)) {
-     SETFLOAT(at+4,b2/a0);
+       post("highpass: filter unstable -> resetting");
-     
+       a0=1.;a1=0.;a2=0.;
-     outlet_list(x->x_obj.ob_outlet,&s_list,5,at);
+       b0=1.;b1=0.;b2=0.;
-}
+     }
+     SETFLOAT(at,-a1/a0);
-void highpass_float(t_rbjfilter *x,t_floatarg f)
+     SETFLOAT(at+1,-a2/a0);
-{
+     SETFLOAT(at+2,b0/a0);
-     x->x_freq = f;
+     SETFLOAT(at+3,b1/a0);
-     highpass_bang(x);
+     SETFLOAT(at+4,b2/a0);
-}
+     
+     outlet_list(x->x_obj.ob_outlet,&s_list,5,at);
+}
-static void *highpass_new(t_floatarg f,t_floatarg bw)
-{
-    t_rbjfilter *x = (t_rbjfilter *)pd_new(highpass_class);
+void highpass_float(t_rbjfilter *x,t_floatarg f)
+{
-    x->x_rate = 44100.0;
+     x->x_freq = f;
-    outlet_new(&x->x_obj,&s_float);
+     highpass_bang(x);
-/*    floatinlet_new(&x->x_obj, &x->x_gain);    */
+}
-    floatinlet_new(&x->x_obj, &x->x_bw);
-    if (f > 0.) x->x_freq = f;
-    if (bw > 0.) x->x_bw = bw;
+static void *highpass_new(t_floatarg f,t_floatarg bw)
-    return (x);
+{
-}
+    t_rbjfilter *x = (t_rbjfilter *)pd_new(highpass_class);
+    x->x_rate = 44100.0;
-void highpass_setup(void)
+    outlet_new(&x->x_obj,&s_float);
-{
+/*    floatinlet_new(&x->x_obj, &x->x_gain);    */
-    highpass_class = class_new(gensym("highpass"), (t_newmethod)highpass_new, 0,
+    floatinlet_new(&x->x_obj, &x->x_bw);
-                                sizeof(t_rbjfilter), 0,A_DEFFLOAT,A_DEFFLOAT,0);
+    if (f > 0.) x->x_freq = f;
-    class_addbang(highpass_class,highpass_bang);
+    if (bw > 0.) x->x_bw = bw;
-    class_addfloat(highpass_class,highpass_float);
+    return (x);
-}
+}
+void highpass_setup(void)
+{
+    highpass_class = class_new(gensym("highpass"), (t_newmethod)highpass_new, 0,
+                                sizeof(t_rbjfilter), 0,A_DEFFLOAT,A_DEFFLOAT,0);
+    class_addbang(highpass_class,highpass_bang);
+    class_addfloat(highpass_class,highpass_float);
+}

diff --git a/apps/plugins/pdbox/PDa/extra/highpass.c b/apps/plugins/pdbox/PDa/extra/highpass.c index f97ca233f3..05e8a06d59 100644 --- a/apps/plugins/pdbox/PDa/extra/highpass.c +++ b/apps/plugins/pdbox/PDa/extra/highpass.c
@@ -1,85 +1,94 @@
1	/* (C) Guenter Geiger <geiger@epy.co.at> */	1	/* (C) Guenter Geiger <geiger@epy.co.at> */
2		2
3		3
4	/*	4	/*
5		5
6	These filter coefficients computations are taken from	6	These filter coefficients computations are taken from
7	http://www.harmony-central.com/Computer/Programming/Audio-EQ-Cookbook.txt	7	http://www.harmony-central.com/Computer/Programming/Audio-EQ-Cookbook.txt
8		8
9	written by Robert Bristow-Johnson	9	written by Robert Bristow-Johnson
10		10
11	*/	11	*/
12		12
13	#include "m_pd.h"	13
14	#ifdef NT	14	#ifdef ROCKBOX
15	#pragma warning( disable : 4244 )	15	#include "plugin.h"
16	#pragma warning( disable : 4305 )	16	#include "pdbox.h"
17	#endif	17	#include "m_pd.h"
18	#include <math.h>	18	#include "math.h"
19	#include "filters.h"	19	#include "filters.h"
20		20	#else /* ROCKBOX */
21		21	#include "m_pd.h"
22	/* ------------------- highpass ----------------------------*/	22	#ifdef NT
23		23	#pragma warning( disable : 4244 )
24	static t_class *highpass_class;	24	#pragma warning( disable : 4305 )
25		25	#endif
26	void highpass_bang(t_rbjfilter *x)	26	#include <math.h>
27	{	27	#include "filters.h"
28	t_atom at[5];	28	#endif /* ROCKBOX */
29	t_float omega = e_omega(x->x_freq,x->x_rate);	29
30	t_float alpha = e_alpha(x->x_bw* 0.01,omega);	30
31	t_float b1 = -(1 + cos(omega));	31	/* ------------------- highpass ----------------------------*/
32	t_float b0 = -b1/2.;	32
33	t_float b2 = b0;	33	static t_class *highpass_class;
34	t_float a0 = 1 + alpha;	34
35	t_float a1 = -2.*cos(omega);	35	void highpass_bang(t_rbjfilter *x)
36	t_float a2 = 1 - alpha;	36	{
37		37	t_atom at[5];
38	/* post("bang %f %f %f",x->x_freq, x->x_gain, x->x_bw); */	38	t_float omega = e_omega(x->x_freq,x->x_rate);
39		39	t_float alpha = e_alpha(x->x_bw* 0.01,omega);
40	if (!check_stability(-a1/a0,-a2/a0,b0/a0,b1/a0,b2/a0)) {	40	t_float b1 = -(1 + cos(omega));
41	post("highpass: filter unstable -> resetting");	41	t_float b0 = -b1/2.;
42	a0=1.;a1=0.;a2=0.;	42	t_float b2 = b0;
43	b0=1.;b1=0.;b2=0.;	43	t_float a0 = 1 + alpha;
44	}	44	t_float a1 = -2.*cos(omega);
45		45	t_float a2 = 1 - alpha;
46	SETFLOAT(at,-a1/a0);	46
47	SETFLOAT(at+1,-a2/a0);	47	/* post("bang %f %f %f",x->x_freq, x->x_gain, x->x_bw); */
48	SETFLOAT(at+2,b0/a0);	48
49	SETFLOAT(at+3,b1/a0);	49	if (!check_stability(-a1/a0,-a2/a0,b0/a0,b1/a0,b2/a0)) {
50	SETFLOAT(at+4,b2/a0);	50	post("highpass: filter unstable -> resetting");
51		51	a0=1.;a1=0.;a2=0.;
52	outlet_list(x->x_obj.ob_outlet,&s_list,5,at);	52	b0=1.;b1=0.;b2=0.;
53	}	53	}
54		54
55		55	SETFLOAT(at,-a1/a0);
56	void highpass_float(t_rbjfilter *x,t_floatarg f)	56	SETFLOAT(at+1,-a2/a0);
57	{	57	SETFLOAT(at+2,b0/a0);
58	x->x_freq = f;	58	SETFLOAT(at+3,b1/a0);
59	highpass_bang(x);	59	SETFLOAT(at+4,b2/a0);
60	}	60
61		61	outlet_list(x->x_obj.ob_outlet,&s_list,5,at);
62		62	}
63	static void *highpass_new(t_floatarg f,t_floatarg bw)	63
64	{	64
65	t_rbjfilter x = (t_rbjfilter )pd_new(highpass_class);	65	void highpass_float(t_rbjfilter *x,t_floatarg f)
66		66	{
67	x->x_rate = 44100.0;	67	x->x_freq = f;
68	outlet_new(&x->x_obj,&s_float);	68	highpass_bang(x);
69	/* floatinlet_new(&x->x_obj, &x->x_gain); */	69	}
70	floatinlet_new(&x->x_obj, &x->x_bw);	70
71	if (f > 0.) x->x_freq = f;	71
72	if (bw > 0.) x->x_bw = bw;	72	static void *highpass_new(t_floatarg f,t_floatarg bw)
73	return (x);	73	{
74	}	74	t_rbjfilter x = (t_rbjfilter )pd_new(highpass_class);
75		75
76		76	x->x_rate = 44100.0;
77	void highpass_setup(void)	77	outlet_new(&x->x_obj,&s_float);
78	{	78	/* floatinlet_new(&x->x_obj, &x->x_gain); */
79	highpass_class = class_new(gensym("highpass"), (t_newmethod)highpass_new, 0,	79	floatinlet_new(&x->x_obj, &x->x_bw);
80	sizeof(t_rbjfilter), 0,A_DEFFLOAT,A_DEFFLOAT,0);	80	if (f > 0.) x->x_freq = f;
81	class_addbang(highpass_class,highpass_bang);	81	if (bw > 0.) x->x_bw = bw;
82	class_addfloat(highpass_class,highpass_float);	82	return (x);
83	}	83	}
84		84
		85
		86	void highpass_setup(void)
		87	{
		88	highpass_class = class_new(gensym("highpass"), (t_newmethod)highpass_new, 0,
		89	sizeof(t_rbjfilter), 0,A_DEFFLOAT,A_DEFFLOAT,0);
		90	class_addbang(highpass_class,highpass_bang);
		91	class_addfloat(highpass_class,highpass_float);
		92	}
		93
85		94