Pd-cvs December 2007

pd-cvs@lists.iem.at

12 participants
107 discussions

pd/portaudio/src/os/unix pa_unix_hostapis.c, 1.1, 1.2 pa_unix_util.c, 1.1, 1.2 pa_unix_util.h, 1.1, 1.2
by Miller Puckette 28 Dec '07

28 Dec '07

Update of /cvsroot/pure-data/pd/portaudio/src/os/unix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17649/pd/portaudio/src/os/unix Modified Files: pa_unix_hostapis.c pa_unix_util.c pa_unix_util.h Log Message: 0.41-10 test 10 - many patches, plus work on callback scheduling

1 0

pd/portaudio/include pa_asio.h, 1.1, 1.2 pa_linux_alsa.h, 1.1, 1.2 pa_win_wmme.h, 1.1, 1.2 portaudio.h, 1.1, 1.2
by Miller Puckette 28 Dec '07

28 Dec '07

Update of /cvsroot/pure-data/pd/portaudio/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17649/pd/portaudio/include Modified Files: pa_asio.h pa_linux_alsa.h pa_win_wmme.h portaudio.h Log Message: 0.41-10 test 10 - many patches, plus work on callback scheduling

1 0

externals/hcs sql_query.c,1.6,1.7
by Hans-Christoph Steiner 27 Dec '07

27 Dec '07

Update of /cvsroot/pure-data/externals/hcs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23161 Modified Files: sql_query.c Log Message: moved proxy_inlet_setup() to the main setup function on mjmogo's suggestion, makes much more sense this way Index: sql_query.c =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/sql_query.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** sql_query.c 23 Dec 2007 01:28:49 -0000 1.6 --- sql_query.c 27 Dec 2007 20:04:30 -0000 1.7 *************** *** 150,155 **** t_sql_query *x = (t_sql_query *)pd_new(sql_query_class); - proxy_inlet_setup(); - x->x_query_binbuf = binbuf_new(); binbuf_add(x->x_query_binbuf, argc, argv); --- 150,153 ---- *************** *** 192,195 **** --- 190,196 ---- class_addbang(sql_query_class, (t_method) sql_query_output); class_addanything(sql_query_class, (t_method) sql_query_anything); + + /* set up proxy inlet class */ + proxy_inlet_setup(); }

1 0

pd/src s_main.c,1.28.6.2,1.28.6.3
by Hans-Christoph Steiner 26 Dec '07

26 Dec '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26632 Modified Files: Tag: branch-v0-40-extended s_main.c Log Message: checked in Russell's security fix #1848295 Index: s_main.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_main.c,v retrieving revision 1.28.6.2 retrieving revision 1.28.6.3 diff -C2 -d -r1.28.6.2 -r1.28.6.3 *** s_main.c 27 Nov 2007 00:03:09 -0000 1.28.6.2 --- s_main.c 26 Dec 2007 21:45:02 -0000 1.28.6.3 *************** *** 288,292 **** char filename[MAXPDSTRING]; ! sprintf(filename, "%s.dll", sys_externalschedlibname); sys_bashfilename(filename, filename); ntdll = LoadLibrary(filename); --- 288,292 ---- char filename[MAXPDSTRING]; ! snprintf(filename, sizeof(filename), "%s.dll", sys_externalschedlibname); sys_bashfilename(filename, filename); ntdll = LoadLibrary(filename);

1 0

externals/hcs sql_query.c, 1.5, 1.6 sql_query-help.pd, 1.3, 1.4
by Hans-Christoph Steiner 23 Dec '07

23 Dec '07

Update of /cvsroot/pure-data/externals/hcs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7788 Modified Files: sql_query.c sql_query-help.pd Log Message: - first working version, called proxy_inlet_setup() function, and fixed proxy inlet ID assignment. - left inlet is now properly hot - cleaned out debug post()s Index: sql_query-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/sql_query-help.pd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** sql_query-help.pd 22 Dec 2007 23:39:13 -0000 1.3 --- sql_query-help.pd 23 Dec 2007 01:28:49 -0000 1.4 *************** *** 1,5 **** #N canvas 238 82 613 618 10; #X obj 362 244 hsl 128 15 0 127 0 0 empty empty empty -2 -8 0 10 -262144 ! -1 -1 0 1; #X floatatom 420 276 5 0 0 0 - - -; #X text 395 223 age; --- 1,5 ---- #N canvas 238 82 613 618 10; #X obj 362 244 hsl 128 15 0 127 0 0 empty empty empty -2 -8 0 10 -262144 ! -1 -1 4800 1; #X floatatom 420 276 5 0 0 0 - - -; #X text 395 223 age; *************** *** 27,30 **** --- 27,38 ---- #X msg 39 235 bang; #X msg 177 268 234; + #X msg 480 275 symbol twenty; + #X msg 116 76 fred; + #X msg 174 77 one; + #X msg 234 78 2; + #X msg 287 78 3; + #X msg 345 78 4; + #X obj 117 155 pddp/print; + #X obj 344 131 pddp/print; #X connect 0 0 11 1; #X connect 1 0 11 1; *************** *** 37,40 **** --- 45,56 ---- #X connect 11 0 3 0; #X connect 11 1 3 1; + #X connect 12 0 21 0; + #X connect 12 1 22 0; #X connect 13 0 11 0; #X connect 14 0 11 0; + #X connect 15 0 11 1; + #X connect 16 0 12 0; + #X connect 17 0 12 1; + #X connect 18 0 12 2; + #X connect 19 0 12 3; + #X connect 20 0 12 4; Index: sql_query.c =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/sql_query.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** sql_query.c 22 Dec 2007 23:39:13 -0000 1.5 --- sql_query.c 23 Dec 2007 01:28:49 -0000 1.6 *************** *** 35,40 **** #include <string.h> ! //#define DEBUG(x) ! #define DEBUG(x) x #define PLACEHOLDER '?' --- 35,40 ---- #include <string.h> ! #define DEBUG(x) ! //#define DEBUG(x) x #define PLACEHOLDER '?' *************** *** 60,64 **** t_binbuf* x_query_binbuf; // binbuf for converting args to string ! struct _proxy_inlet*inlets; // pointer to array of _proxy_inlets t_atom* atoms; // pointer to array of atoms unsigned int placeholder_count;// number of items in above arrays --- 60,64 ---- t_binbuf* x_query_binbuf; // binbuf for converting args to string ! t_proxy_inlet* inlets; // pointer to array of _proxy_inlets t_atom* atoms; // pointer to array of atoms unsigned int placeholder_count;// number of items in above arrays *************** *** 72,76 **** * FUNCTION PROTOTYPES */ ! static void sql_query_set_atom(t_sql_query *x, int atom_num, t_symbol *s, t_atom *atom); /*------------------------------------------------------------------------------ --- 72,77 ---- * FUNCTION PROTOTYPES */ ! static void sql_query_set_atom(t_sql_query *x, int atom_num, t_symbol *s, ! int argc, t_atom *a); /*------------------------------------------------------------------------------ *************** *** 80,83 **** --- 81,85 ---- static void proxy_inlet_new(t_proxy_inlet *p, t_object *owner, unsigned int id) { + DEBUG(post("proxy_inlet_new");); p->pd = proxy_inlet_class; p->owner = owner; *************** *** 86,96 **** } - - - static void proxy_inlet_anything(t_proxy_inlet *p, t_symbol *s, int argc, t_atom *argv) { ! post("proxy_inlet_anything: %s %d", s->s_name, argc); ! sql_query_set_atom(p->owner, p->id, s, argv); } --- 88,95 ---- } static void proxy_inlet_anything(t_proxy_inlet *p, t_symbol *s, int argc, t_atom *argv) { ! DEBUG(post("proxy_inlet_anything");); ! sql_query_set_atom(p->owner, p->id, s, argc, argv); } *************** *** 112,135 **** */ ! static void sql_query_set_atom(t_sql_query *x, int atom_num, t_symbol *s, t_atom *a) { DEBUG(post("sql_query_set_atom");); if( (s == &s_symbol) || (s == &s_list) || (s == &s_float) ) - { - char buf[MAXPDSTRING]; - atom_string(a, &buf, MAXPDSTRING); x->atoms[atom_num] = *a; - post("symbol/list set %s", buf); - } else - { SETSYMBOL(&x->atoms[atom_num], s); - post("selector set %s", s->s_name); - } - } - - static void sql_query_anything(t_sql_query *x, t_symbol *s, int argc, t_atom *argv) - { - sql_query_set_atom(x, 0, s, argv); } --- 111,122 ---- */ ! static void sql_query_set_atom(t_sql_query *x, int atom_num, t_symbol *s, ! int argc, t_atom *a) { DEBUG(post("sql_query_set_atom");); if( (s == &s_symbol) || (s == &s_list) || (s == &s_float) ) x->atoms[atom_num] = *a; else SETSYMBOL(&x->atoms[atom_num], s); } *************** *** 143,146 **** --- 130,139 ---- } + static void sql_query_anything(t_sql_query *x, t_symbol *s, int argc, t_atom *argv) + { + sql_query_set_atom(x, 0, s, argc, argv); + sql_query_output(x); + } + static void sql_query_free(t_sql_query *x) { *************** *** 157,160 **** --- 150,155 ---- t_sql_query *x = (t_sql_query *)pd_new(sql_query_class); + proxy_inlet_setup(); + x->x_query_binbuf = binbuf_new(); binbuf_add(x->x_query_binbuf, argc, argv); *************** *** 166,186 **** while (current != NULL) { - post("found placeholder %c", PLACEHOLDER); x->placeholder_count++; current = strchr(current + 1, PLACEHOLDER); } ! post("creating %d inlets", x->placeholder_count); x->inlets = getbytes(x->placeholder_count * sizeof(t_proxy_inlet)); ! for(i=1; i< x->placeholder_count; ++i) ! { ! proxy_inlet_new(&x->inlets[i], (t_object *)x, x->placeholder_count); ! post("\tinlet %d", i); ! } ! x->atoms = getbytes(x->placeholder_count * sizeof(t_atom)); ! for(i=0; i< x->placeholder_count; ++i) ! { SETSYMBOL(&x->atoms[i], &s_); - } x->x_data_outlet = outlet_new(&x->x_obj, 0); --- 161,175 ---- while (current != NULL) { x->placeholder_count++; current = strchr(current + 1, PLACEHOLDER); } ! x->inlets = getbytes(x->placeholder_count * sizeof(t_proxy_inlet)); ! for(i = 1; i < x->placeholder_count; ++i) ! proxy_inlet_new(&x->inlets[i], (t_object *)x, i); ! x->atoms = getbytes(x->placeholder_count * sizeof(t_atom)); ! for(i = 0; i < x->placeholder_count; ++i) SETSYMBOL(&x->atoms[i], &s_); x->x_data_outlet = outlet_new(&x->x_obj, 0); *************** *** 192,196 **** void sql_query_setup(void) { - DEBUG(post("sql_query_setup");); sql_query_class = class_new(gensym("sql_query"), (t_newmethod)sql_query_new, --- 181,184 ----

1 0

externals/hcs sql_query.c, 1.4, 1.5 sql_query-help.pd, 1.2, 1.3
by Hans-Christoph Steiner 23 Dec '07

23 Dec '07

Update of /cvsroot/pure-data/externals/hcs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1002 Modified Files: sql_query.c sql_query-help.pd Log Message: got data and sql query output working; added float handling to sql_query_set_atom() Index: sql_query-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/sql_query-help.pd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** sql_query-help.pd 22 Dec 2007 07:24:36 -0000 1.2 --- sql_query-help.pd 22 Dec 2007 23:39:13 -0000 1.3 *************** *** 26,29 **** --- 26,30 ---- #X obj 118 105 sql_query this is a test? more ? ? ? ?; #X msg 39 235 bang; + #X msg 177 268 234; #X connect 0 0 11 1; #X connect 1 0 11 1; *************** *** 37,38 **** --- 38,40 ---- #X connect 11 1 3 1; #X connect 13 0 11 0; + #X connect 14 0 11 0; Index: sql_query.c =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/sql_query.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** sql_query.c 22 Dec 2007 20:28:07 -0000 1.4 --- sql_query.c 22 Dec 2007 23:39:13 -0000 1.5 *************** *** 58,69 **** t_object x_obj; ! t_binbuf* x_query_binbuf; // store query in a binbuf for reuse ! struct _proxy_inlet*inlets; // pointer to array of _proxy_inlets ! t_atom* atoms; // pointer to array of atoms ! unsigned int placeholder_count; // number of items in above arrays ! t_outlet* x_data_outlet; // for list of data to plug into query ! t_outlet* x_query_outlet; // for SQL query } t_sql_query; --- 58,69 ---- t_object x_obj; ! t_binbuf* x_query_binbuf; // binbuf for converting args to string ! struct _proxy_inlet*inlets; // pointer to array of _proxy_inlets ! t_atom* atoms; // pointer to array of atoms ! unsigned int placeholder_count;// number of items in above arrays ! t_outlet* x_data_outlet; // for list of data to plug into query ! t_outlet* x_query_outlet; // for SQL query } t_sql_query; *************** *** 134,147 **** } ! static void sql_query_bang(t_sql_query *x) { ! DEBUG(post("sql_query_bang");); ! unsigned int i; ! char buf[MAXPDSTRING]; ! for(i=0; i < x->placeholder_count; ++i) ! { ! atom_string(&x->atoms[i], &buf, MAXPDSTRING); ! post("output atom %d: %s", i, buf); ! } } --- 134,144 ---- } ! static void sql_query_output(t_sql_query *x) { ! DEBUG(post("sql_query_output");); ! int natom = binbuf_getnatom(x->x_query_binbuf); ! t_atom *vec = binbuf_getvec(x->x_query_binbuf); ! outlet_anything(x->x_query_outlet, vec[0].a_w.w_symbol, natom - 1, vec + 1); ! outlet_list(x->x_data_outlet, &s_list, x->placeholder_count, x->atoms); } *************** *** 205,209 **** /* add inlet datatype methods */ ! class_addbang(sql_query_class, (t_method) sql_query_bang); class_addanything(sql_query_class, (t_method) sql_query_anything); } --- 202,206 ---- /* add inlet datatype methods */ ! class_addbang(sql_query_class, (t_method) sql_query_output); class_addanything(sql_query_class, (t_method) sql_query_anything); }

1 0

externals/hcs sql_query.c,1.2,1.3
by Hans-Christoph Steiner 22 Dec '07

22 Dec '07

Update of /cvsroot/pure-data/externals/hcs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22437 Modified Files: sql_query.c Log Message: got the set_atom function working on the first inlet with symbols, now got to get the rest of the inlets working Index: sql_query.c =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/sql_query.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** sql_query.c 22 Dec 2007 07:24:36 -0000 1.2 --- sql_query.c 22 Dec 2007 20:25:46 -0000 1.3 *************** *** 58,69 **** t_object x_obj; ! t_binbuf* x_query_binbuf; ! unsigned int placeholder_count; ! struct _proxy_inlet*inlets; ! t_atom** atoms; ! t_outlet* x_data_outlet; ! t_outlet* x_status_outlet; } t_sql_query; --- 58,69 ---- t_object x_obj; ! t_binbuf* x_query_binbuf; // store query in a binbuf for reuse ! struct _proxy_inlet*inlets; // pointer to array of _proxy_inlets ! t_atom* atoms; // pointer to array of atoms ! unsigned int placeholder_count; // number of items in above arrays ! t_outlet* x_data_outlet; // for list of data to plug into query ! t_outlet* x_query_outlet; // for SQL query } t_sql_query; *************** *** 86,89 **** --- 86,92 ---- } + + + static void proxy_inlet_anything(t_proxy_inlet *p, t_symbol *s, int argc, t_atom *argv) { *************** *** 109,126 **** */ ! static void sql_query_set_atom(t_sql_query *x, int atom_num, t_symbol *s, t_atom *atom) { ! char *buf; ! int bufsize; ! if( (&s == &s_symbol) || (&s == &s_list) ) { ! atom_string(atom, buf, bufsize); } else { ! atom_string(atom, buf, bufsize); } - post("set atom %s", buf); - x->atoms[atom_num] = atom; } --- 112,131 ---- */ ! static void sql_query_set_atom(t_sql_query *x, int atom_num, t_symbol *s, t_atom *a) { ! DEBUG(post("sql_query_set_atom");); ! if( (s == &s_symbol) || (s == &s_list) ) { ! char buf[MAXPDSTRING]; ! atom_string(a, &buf, MAXPDSTRING); ! x->atoms[atom_num] = *a; ! post("symbol/list set %s", buf); } else { ! post("blah"); ! SETSYMBOL(&x->atoms[atom_num], s); ! post("selector set %s", s->s_name); } } *************** *** 132,136 **** static void sql_query_bang(t_sql_query *x) { ! } --- 137,148 ---- static void sql_query_bang(t_sql_query *x) { ! DEBUG(post("sql_query_bang");); ! unsigned int i; ! char buf[MAXPDSTRING]; ! for(i=0; i < x->placeholder_count; ++i) ! { ! atom_string(&x->atoms[i], &buf, MAXPDSTRING); ! post("output atom %d: %s", i, buf); ! } } *************** *** 164,168 **** post("creating %d inlets", x->placeholder_count); x->inlets = getbytes(x->placeholder_count * sizeof(t_proxy_inlet)); - x->atoms = getbytes(x->placeholder_count * sizeof(t_atom *)); for(i=1; i< x->placeholder_count; ++i) { --- 176,179 ---- *************** *** 171,176 **** } x->x_data_outlet = outlet_new(&x->x_obj, 0); ! x->x_status_outlet = outlet_new(&x->x_obj, 0); return (x); --- 182,193 ---- } + x->atoms = getbytes(x->placeholder_count * sizeof(t_atom)); + for(i=0; i< x->placeholder_count; ++i) + { + SETSYMBOL(&x->atoms[i], &s_); + } + x->x_data_outlet = outlet_new(&x->x_obj, 0); ! x->x_query_outlet = outlet_new(&x->x_obj, 0); return (x);

1 0

externals/hcs sql_query.c, 1.1, 1.2 sql_query-help.pd, 1.1, 1.2
by Hans-Christoph Steiner 22 Dec '07

22 Dec '07

Update of /cvsroot/pure-data/externals/hcs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv916 Modified Files: sql_query.c sql_query-help.pd Log Message: parses ? placeholders and generates inlets; crashes when you try to do just about anything Index: sql_query-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/sql_query-help.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** sql_query-help.pd 22 Dec 2007 02:53:43 -0000 1.1 --- sql_query-help.pd 22 Dec 2007 07:24:36 -0000 1.2 *************** *** 1,4 **** ! #N canvas 403 84 613 618 10; ! #X obj 118 105 sql_query this is a test? more ?; #X obj 362 244 hsl 128 15 0 127 0 0 empty empty empty -2 -8 0 10 -262144 -1 -1 0 1; --- 1,3 ---- ! #N canvas 238 82 613 618 10; #X obj 362 244 hsl 128 15 0 127 0 0 empty empty empty -2 -8 0 10 -262144 -1 -1 0 1; *************** *** 25,34 **** #X obj 119 322 sql_query insert into table (name \, age) values (? \, ?); ! #X connect 4 0 5 0; ! #X connect 4 1 6 0; ! #X connect 4 1 7 0; ! #X connect 9 0 12 0; ! #X connect 10 0 12 0; ! #X connect 11 0 12 0; ! #X connect 12 0 4 0; ! #X connect 12 1 4 1; --- 24,38 ---- #X obj 119 322 sql_query insert into table (name \, age) values (? \, ?); ! #X obj 118 105 sql_query this is a test? more ? ? ? ?; ! #X msg 39 235 bang; ! #X connect 0 0 11 1; ! #X connect 1 0 11 1; ! #X connect 3 0 4 0; ! #X connect 3 1 5 0; ! #X connect 3 1 6 0; ! #X connect 8 0 11 0; ! #X connect 9 0 11 0; ! #X connect 10 0 11 0; ! #X connect 11 0 3 0; ! #X connect 11 1 3 1; ! #X connect 13 0 11 0; Index: sql_query.c =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/sql_query.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** sql_query.c 22 Dec 2007 02:53:43 -0000 1.1 --- sql_query.c 22 Dec 2007 07:24:36 -0000 1.2 *************** *** 45,48 **** --- 45,57 ---- static t_class *sql_query_class; + static t_class *proxy_inlet_class; + + typedef struct _proxy_inlet + { + t_pd pd; + void *owner; + unsigned int id; + } t_proxy_inlet; + typedef struct _sql_query { *************** *** 51,55 **** t_binbuf* x_query_binbuf; ! int inlet_count; t_outlet* x_data_outlet; --- 60,66 ---- t_binbuf* x_query_binbuf; ! unsigned int placeholder_count; ! struct _proxy_inlet*inlets; ! t_atom** atoms; t_outlet* x_data_outlet; *************** *** 58,86 **** /*------------------------------------------------------------------------------ * PROXY INLET FUNCTIONS */ - static t_class *proxy_inlet_class = NULL; ! typedef struct _proxy_inlet ! { ! t_pd pd; ! void *owner; ! unsigned int id; ! } t_proxy_inlet; ! ! static void proxy_inlet_new(t_proxy_inlet *p, void *owner, unsigned int id) { p->pd = proxy_inlet_class; p->owner = owner; p->id = id; } ! static void proxy_inlet_anything(t_proxy_inlet *x, t_symbol *s, int argc, t_atom *argv) { ! int i; ! char buf[MAXPDSTRING]; ! post("proxy_inlet_anything: %s", s -> s_name); } --- 69,93 ---- + /*------------------------------------------------------------------------------ + * FUNCTION PROTOTYPES + */ + static void sql_query_set_atom(t_sql_query *x, int atom_num, t_symbol *s, t_atom *atom); /*------------------------------------------------------------------------------ * PROXY INLET FUNCTIONS */ ! static void proxy_inlet_new(t_proxy_inlet *p, t_object *owner, unsigned int id) { p->pd = proxy_inlet_class; p->owner = owner; p->id = id; + inlet_new(owner, &p->pd, 0, 0); } ! static void proxy_inlet_anything(t_proxy_inlet *p, t_symbol *s, int argc, t_atom *argv) { ! post("proxy_inlet_anything: %s %d", s->s_name, argc); ! sql_query_set_atom(p->owner, p->id, s, argv); } *************** *** 102,106 **** */ ! static void *sql_query_free(t_sql_query *x) { binbuf_free(x->x_query_binbuf); --- 109,139 ---- */ ! static void sql_query_set_atom(t_sql_query *x, int atom_num, t_symbol *s, t_atom *atom) ! { ! char *buf; ! int bufsize; ! if( (&s == &s_symbol) || (&s == &s_list) ) ! { ! atom_string(atom, buf, bufsize); ! } ! else ! { ! atom_string(atom, buf, bufsize); ! } ! post("set atom %s", buf); ! x->atoms[atom_num] = atom; ! } ! ! static void sql_query_anything(t_sql_query *x, t_symbol *s, int argc, t_atom *argv) ! { ! sql_query_set_atom(x, 0, s, argv); ! } ! ! static void sql_query_bang(t_sql_query *x) ! { ! ! } ! ! static void sql_query_free(t_sql_query *x) { binbuf_free(x->x_query_binbuf); *************** *** 110,117 **** { DEBUG(post("sql_query_new");); ! char *buf; int bufsize; char *current = NULL; - unsigned int total_inlets = 0; t_sql_query *x = (t_sql_query *)pd_new(sql_query_class); --- 143,150 ---- { DEBUG(post("sql_query_new");); ! unsigned int i; int bufsize; + char *buf; char *current = NULL; t_sql_query *x = (t_sql_query *)pd_new(sql_query_class); *************** *** 121,132 **** buf[bufsize] = 0; current = strchr(buf, PLACEHOLDER); while (current != NULL) { post("found placeholder %c", PLACEHOLDER); ! total_inlets++; current = strchr(current + 1, PLACEHOLDER); } ! post("creating %d inlets", total_inlets); x->x_data_outlet = outlet_new(&x->x_obj, 0); x->x_status_outlet = outlet_new(&x->x_obj, 0); --- 154,174 ---- buf[bufsize] = 0; + x->placeholder_count = 0; current = strchr(buf, PLACEHOLDER); while (current != NULL) { post("found placeholder %c", PLACEHOLDER); ! x->placeholder_count++; current = strchr(current + 1, PLACEHOLDER); } ! post("creating %d inlets", x->placeholder_count); ! x->inlets = getbytes(x->placeholder_count * sizeof(t_proxy_inlet)); ! x->atoms = getbytes(x->placeholder_count * sizeof(t_atom *)); ! for(i=1; i< x->placeholder_count; ++i) ! { ! proxy_inlet_new(&x->inlets[i], (t_object *)x, x->placeholder_count); ! post("\tinlet %d", i); ! } ! x->x_data_outlet = outlet_new(&x->x_obj, 0); x->x_status_outlet = outlet_new(&x->x_obj, 0); *************** *** 140,144 **** sql_query_class = class_new(gensym("sql_query"), (t_newmethod)sql_query_new, ! (t_newmethod)sql_query_free, sizeof(t_sql_query), 0, --- 182,186 ---- sql_query_class = class_new(gensym("sql_query"), (t_newmethod)sql_query_new, ! (t_method)sql_query_free, sizeof(t_sql_query), 0, *************** *** 147,152 **** /* add inlet datatype methods */ ! // class_addbang(sql_query_class, (t_method) sql_query_bang); ! // class_addanything(sql_query_class, (t_method) sql_query_anything); } --- 189,194 ---- /* add inlet datatype methods */ ! class_addbang(sql_query_class, (t_method) sql_query_bang); ! class_addanything(sql_query_class, (t_method) sql_query_anything); }

1 0

externals/hcs sql_query.c, NONE, 1.1 sql_query-help.pd, NONE, 1.1
by Hans-Christoph Steiner 22 Dec '07

22 Dec '07

Update of /cvsroot/pure-data/externals/hcs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2106 Added Files: sql_query.c sql_query-help.pd Log Message: initial sketch, just counting ? placeholders and laying out proxy inlets --- NEW FILE: sql_query-help.pd --- #N canvas 403 84 613 618 10; #X obj 118 105 sql_query this is a test? more ?; #X obj 362 244 hsl 128 15 0 127 0 0 empty empty empty -2 -8 0 10 -262144 -1 -1 0 1; #X floatatom 420 276 5 0 0 0 - - -; #X text 395 223 age; #N canvas 402 387 450 300 sql 0; #X obj 73 37 inlet; #X obj 259 37 inlet; #X obj 63 251 outlet; #X obj 270 267 outlet; #X obj 255 78 print COLD; #X obj 61 82 print HOT; #X connect 0 0 5 0; #X connect 1 0 4 0; #X restore 267 428 pd sql; #X obj 223 495 print RESULTS; #X obj 349 496 print STATUS; #X obj 325 452 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1 -1; #X text 347 453 bang when done; #X msg 120 232 Chinua; #X msg 80 233 Mary; #X msg 172 231 symbol Ang; #X obj 119 322 sql_query insert into table (name \, age) values (? \, ?); #X connect 4 0 5 0; #X connect 4 1 6 0; #X connect 4 1 7 0; #X connect 9 0 12 0; #X connect 10 0 12 0; #X connect 11 0 12 0; #X connect 12 0 4 0; #X connect 12 1 4 1; --- NEW FILE: sql_query.c --- /* * object for generating SQL queries with SQL ? placeholders * Written by Hans-Christoph Steiner <hans(a)at.or.at> * * Copyright (c) 2007 Free Software Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. * * See file LICENSE for further informations on licensing terms. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * */ #include <m_pd.h> #ifdef _WIN32 #define _WIN32_WINNT 0x0400 #include <windows.h> #include <stdio.h> #else #include <stdlib.h> #endif #include <string.h> //#define DEBUG(x) #define DEBUG(x) x #define PLACEHOLDER '?' /*------------------------------------------------------------------------------ * CLASS DEF */ static t_class *sql_query_class; typedef struct _sql_query { t_object x_obj; t_binbuf* x_query_binbuf; int inlet_count; t_outlet* x_data_outlet; t_outlet* x_status_outlet; } t_sql_query; /*------------------------------------------------------------------------------ * PROXY INLET FUNCTIONS */ static t_class *proxy_inlet_class = NULL; typedef struct _proxy_inlet { t_pd pd; void *owner; unsigned int id; } t_proxy_inlet; static void proxy_inlet_new(t_proxy_inlet *p, void *owner, unsigned int id) { p->pd = proxy_inlet_class; p->owner = owner; p->id = id; } static void proxy_inlet_anything(t_proxy_inlet *x, t_symbol *s, int argc, t_atom *argv) { int i; char buf[MAXPDSTRING]; post("proxy_inlet_anything: %s", s -> s_name); } static void proxy_inlet_setup(void) { post("proxy_inlet_setup"); proxy_inlet_class = (t_class *)class_new(gensym("#__PROXY_INLET__"), 0, 0, sizeof(t_proxy_inlet), 0, A_GIMME, 0); class_addanything(proxy_inlet_class, (t_method)proxy_inlet_anything); } /*------------------------------------------------------------------------------ * STANDARD CLASS FUNCTIONS */ static void *sql_query_free(t_sql_query *x) { binbuf_free(x->x_query_binbuf); } static void *sql_query_new(t_symbol *s, int argc, t_atom *argv) { DEBUG(post("sql_query_new");); char *buf; int bufsize; char *current = NULL; unsigned int total_inlets = 0; t_sql_query *x = (t_sql_query *)pd_new(sql_query_class); x->x_query_binbuf = binbuf_new(); binbuf_add(x->x_query_binbuf, argc, argv); binbuf_gettext(x->x_query_binbuf, &buf, &bufsize); buf[bufsize] = 0; current = strchr(buf, PLACEHOLDER); while (current != NULL) { post("found placeholder %c", PLACEHOLDER); total_inlets++; current = strchr(current + 1, PLACEHOLDER); } post("creating %d inlets", total_inlets); x->x_data_outlet = outlet_new(&x->x_obj, 0); x->x_status_outlet = outlet_new(&x->x_obj, 0); return (x); } void sql_query_setup(void) { DEBUG(post("sql_query_setup");); sql_query_class = class_new(gensym("sql_query"), (t_newmethod)sql_query_new, (t_newmethod)sql_query_free, sizeof(t_sql_query), 0, A_GIMME, 0); /* add inlet datatype methods */ // class_addbang(sql_query_class, (t_method) sql_query_bang); // class_addanything(sql_query_class, (t_method) sql_query_anything); }

1 0

externals/markex tripleRand-help.pd, 1.1, 1.2 tripleRand.c, 1.4, 1.5
by IOhannes m zmölnig 17 Dec '07

17 Dec '07

Update of /cvsroot/pure-data/externals/markex In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16176 Modified Files: tripleRand-help.pd tripleRand.c Log Message: fixed bug that was exposed in help-patch; added example for list-ranges in help-patch Index: tripleRand-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/markex/tripleRand-help.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** tripleRand-help.pd 2 Oct 2003 03:39:51 -0000 1.1 --- tripleRand-help.pd 17 Dec 2007 20:32:47 -0000 1.2 *************** *** 1,4 **** #N canvas 132 108 604 504 10; - #X text 124 68 GEM object; #X obj 136 234 unpack 0 0 0; #X floatatom 136 280 4 0 0 0 - - -; --- 1,3 ---- *************** *** 10,19 **** #X obj 136 184 tripleRand 5; #X floatatom 215 146 5 0 0 0 - - -; ! #X obj 136 134 bng 15 250 50 0 empty empty empty 0 -6 32 8 -262144 ! -1 -1; ! #X connect 1 0 2 0; ! #X connect 1 1 3 0; ! #X connect 1 2 4 0; ! #X connect 7 0 1 0; ! #X connect 8 0 7 1; ! #X connect 9 0 7 0; --- 9,21 ---- #X obj 136 184 tripleRand 5; #X floatatom 215 146 5 0 0 0 - - -; ! #X obj 136 134 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 ! -1; ! #X text 123 68 MarkEx object; ! #X msg 278 142 1 5 10; ! #X connect 0 0 1 0; ! #X connect 0 1 2 0; ! #X connect 0 2 3 0; ! #X connect 6 0 0 0; ! #X connect 7 0 6 1; ! #X connect 8 0 6 0; ! #X connect 10 0 6 1; Index: tripleRand.c =================================================================== RCS file: /cvsroot/pure-data/externals/markex/tripleRand.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tripleRand.c 30 Sep 2006 15:56:17 -0000 1.4 --- tripleRand.c 17 Dec 2007 20:32:47 -0000 1.5 *************** *** 92,96 **** x->t_out1 = outlet_new(&x->x_obj, 0); ! inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_list, gensym("newVals")); return (x); } --- 92,96 ---- x->t_out1 = outlet_new(&x->x_obj, 0); ! inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_float, gensym("newVals")); return (x); } *************** *** 100,103 **** --- 100,104 ---- tripleRand_class = class_new(gensym("tripleRand"), (t_newmethod)tripleRand_new, 0, sizeof(t_tripleRand), 0, A_DEFFLOAT, A_DEFFLOAT, A_DEFFLOAT, 0); + class_addbang(tripleRand_class, (t_method)tripleRand_bang); class_addmethod(tripleRand_class, (t_method)setTripleRandVals,

1 0

← Newer
1
2
3
4
5
6
7
...
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs December 2007