Pd-cvs May 2008

pd-cvs@lists.iem.at

16 participants
271 discussions

SF.net SVN: pure-data: [9927] trunk/packages/patches/ show_whole_subpatch_name_in_window_title-0.41.4.patch
by eighthave＠users.sourceforge.net 27 May '08

27 May '08

Revision: 9927 http://pure-data.svn.sourceforge.net/pure-data/?rev=9927&view=rev Author: eighthave Date: 2008-05-27 08:20:12 -0700 (Tue, 27 May 2008) Log Message: ----------- patch # 1975056 show whole subpatch name in window title http://sourceforge.net/tracker/index.php?func=detail&aid=1975056&group_id=5… Added Paths: ----------- trunk/packages/patches/show_whole_subpatch_name_in_window_title-0.41.4.patch Added: trunk/packages/patches/show_whole_subpatch_name_in_window_title-0.41.4.patch =================================================================== --- trunk/packages/patches/show_whole_subpatch_name_in_window_title-0.41.4.patch (rev 0) +++ trunk/packages/patches/show_whole_subpatch_name_in_window_title-0.41.4.patch 2008-05-27 15:20:12 UTC (rev 9927) @@ -0,0 +1,39 @@ +Index: g_canvas.c +=================================================================== +--- g_canvas.c (revision 9910) ++++ g_canvas.c (working copy) +@@ -1133,10 +1133,22 @@ + + /* -------------------------- subcanvases ---------------------- */ + +-static void *subcanvas_new(t_symbol *s) ++static void *subcanvas_new(t_symbol *s, int argc, t_atom *argv) + { + t_atom a[6]; + t_canvas *x, *z = canvas_getcurrent(); ++ if (argc) ++ { ++ int bufsize; ++ char *buf; ++ t_binbuf *bb = binbuf_new(); ++ binbuf_addv(bb, "s", s); ++ binbuf_add(bb, argc, argv); ++ binbuf_gettext(bb, &buf, &bufsize); ++ buf[bufsize] = '\0'; ++ binbuf_free(bb); ++ s = gensym(buf); ++ } + if (!*s->s_name) s = gensym("/SUBPATCH/"); + SETFLOAT(a, 0); + SETFLOAT(a+1, GLIST_DEFCANVASYLOC); +@@ -1750,8 +1762,8 @@ + A_NULL); + + /* ----- subcanvases, which you get by typing "pd" in a box ---- */ +- class_addcreator((t_newmethod)subcanvas_new, gensym("pd"), A_DEFSYMBOL, 0); +- class_addcreator((t_newmethod)subcanvas_new, gensym("page"), A_DEFSYMBOL, 0); ++ class_addcreator((t_newmethod)subcanvas_new, gensym("pd"), A_GIMME, 0); ++ class_addcreator((t_newmethod)subcanvas_new, gensym("page"), A_GIMME, 0); + + class_addmethod(canvas_class, (t_method)canvas_click, + gensym("click"), A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9926] branches/pd-extended/v0-40/pd/src/g_canvas.c
by eighthave＠users.sourceforge.net 27 May '08

27 May '08

Revision: 9926 http://pure-data.svn.sourceforge.net/pure-data/?rev=9926&view=rev Author: eighthave Date: 2008-05-27 08:19:14 -0700 (Tue, 27 May 2008) Log Message: ----------- patch #1975056 show whole subpatch name in window title http://sourceforge.net/tracker/index.php?func=detail&aid=1975056&group_id=5… Modified Paths: -------------- branches/pd-extended/v0-40/pd/src/g_canvas.c Modified: branches/pd-extended/v0-40/pd/src/g_canvas.c =================================================================== --- branches/pd-extended/v0-40/pd/src/g_canvas.c 2008-05-27 11:27:13 UTC (rev 9925) +++ branches/pd-extended/v0-40/pd/src/g_canvas.c 2008-05-27 15:19:14 UTC (rev 9926) @@ -1133,10 +1133,22 @@ /* -------------------------- subcanvases ---------------------- */ -static void *subcanvas_new(t_symbol *s) +static void *subcanvas_new(t_symbol *s, int argc, t_atom *argv) { t_atom a[6]; t_canvas *x, *z = canvas_getcurrent(); + if (argc) + { + int bufsize; + char *buf; + t_binbuf *bb = binbuf_new(); + binbuf_addv(bb, "s", s); + binbuf_add(bb, argc, argv); + binbuf_gettext(bb, &buf, &bufsize); + buf[bufsize] = '\0'; + binbuf_free(bb); + s = gensym(buf); + } if (!*s->s_name) s = gensym("/SUBPATCH/"); SETFLOAT(a, 0); SETFLOAT(a+1, GLIST_DEFCANVASYLOC); @@ -1750,8 +1762,8 @@ A_NULL); /* ----- subcanvases, which you get by typing "pd" in a box ---- */ - class_addcreator((t_newmethod)subcanvas_new, gensym("pd"), A_DEFSYMBOL, 0); - class_addcreator((t_newmethod)subcanvas_new, gensym("page"), A_DEFSYMBOL, 0); + class_addcreator((t_newmethod)subcanvas_new, gensym("pd"), A_GIMME, 0); + class_addcreator((t_newmethod)subcanvas_new, gensym("page"), A_GIMME, 0); class_addmethod(canvas_class, (t_method)canvas_click, gensym("click"), A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9925] trunk/externals/io/hidio/hidio-help.pd
by eighthave＠users.sourceforge.net 27 May '08

27 May '08

Revision: 9925 http://pure-data.svn.sourceforge.net/pure-data/?rev=9925&view=rev Author: eighthave Date: 2008-05-27 04:27:13 -0700 (Tue, 27 May 2008) Log Message: ----------- first sketch of output message with variable atom types Modified Paths: -------------- trunk/externals/io/hidio/hidio-help.pd Modified: trunk/externals/io/hidio/hidio-help.pd =================================================================== --- trunk/externals/io/hidio/hidio-help.pd 2008-05-27 11:25:12 UTC (rev 9924) +++ trunk/externals/io/hidio/hidio-help.pd 2008-05-27 11:27:13 UTC (rev 9925) @@ -390,7 +390,7 @@ #X connect 2 0 4 0; #X connect 7 0 4 0; #X restore 174 37 pd open by vendor/product ID; -#X msg 225 309 key key_255 0 133004; +#X msg 225 309 relative x 0 -1; #X text 49 543 (C) Copyright 2004 Hans-Christoph Steiner <hans(a)at.or.at> ; #N canvas 162 133 570 420 serin 0; @@ -422,10 +422,10 @@ #X coords 0 -1 1 1 165 17 1 60 60; #X restore 25 134 pd serin; #N canvas 162 133 570 420 serin 0; -#X obj 286 61 cnv 15 30 15 empty \$0-open-canvas 0 4 8 0 14 -233017 +#X obj 286 61 cnv 15 30 15 empty \$0-open-canvas 6 4 8 0 14 -233017 -1 0; #X obj 60 61 hradio 15 1 1 15 empty empty empty 0 -6 0 8 -225271 -1 --1 0; +-1 6; #X obj 60 13 inlet; #X msg 200 202 label \$1; #X obj 200 180 makefilename %d; @@ -455,7 +455,6 @@ #X obj 544 315 unpack symbol symbol float float; #X floatatom 683 336 2 0 0 1 instance - -; #X obj 65 368 route x y z rx ry rz slider dial; -#X obj 27 425 route x y wheel; #X obj 10 314 route key relative absolute; #X text 218 341 [event_type event_code instance value(; #N canvas 0 22 454 304 remove 0; @@ -504,9 +503,9 @@ #X floatatom 63 401 6 0 0 0 - - -; #X obj 455 295 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1; -#X msg 262 104 open 0; -#N canvas 121 220 450 300 output 1; -#X obj 93 235 outlet; +#X msg 262 104 open 6; +#N canvas 766 107 771 427 output 1; +#X obj 286 341 outlet; #X msg 112 70 255; #X obj 108 112 pack 0 16; #X obj 159 92 + 16; @@ -526,7 +525,48 @@ #X obj 304 52 select 1 0; #X obj 303 29 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0 1; -#X msg 261 143 write led power 0 \$1; +#X msg 278 186 write led power 0 \$1; +#X msg 616 87 255; +#X msg 581 88 127; +#X msg 551 88 0; +#X obj 554 53 select 1 0; +#X obj 553 30 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0 +1; +#X text 179 13 taku's JxCore2 board; +#X text 511 12 Dan's CUI IO v1.0; +#X msg 511 144 write absolute slider 0 \$1; +#X obj 283 150 pack 0 symbol; +#X msg 392 117 kana; +#X msg 428 115 mute; +#X msg 422 265 write led 1 0 \$1; +#X obj 420 240 pack; +#X msg 421 295 write 8 1 0 \$1; +#X msg 419 197 write 0x000c 0x0001 0 1023; +#N canvas 552 22 800 488 ifeel 1; +#X obj 127 257 outlet; +#X msg 545 30 set 0x11 0x0a \$1 \$2 0x00 \$3 0x00; +#X msg 187 201 write 0xff00 0x0002 6 0; +#X text 300 80 0x11; +#X text 308 99 0x0a; +#X msg 197 221 write 0xff00 0x0002 7 0; +#X text 307 120 amplitude; +#X text 309 140 frequency (pulses/second); +#X msg 167 161 write 0xff00 0x0002 4 0; +#X text 331 181 pulse count (0-255); +#X msg 177 181 write 0xff00 0x0002 5 255; +#X msg 157 141 write 0xff00 0x0002 3 5; +#X msg 147 121 write 0xff00 0x0002 2 255; +#X msg 127 81 write 0xff00 0x0002 0 17; +#X msg 137 101 write 0xff00 0x0002 1 10; +#X connect 2 0 0 0; +#X connect 5 0 0 0; +#X connect 8 0 0 0; +#X connect 10 0 0 0; +#X connect 11 0 0 0; +#X connect 12 0 0 0; +#X connect 13 0 0 0; +#X connect 14 0 0 0; +#X restore 48 259 pd ifeel; #X connect 1 0 2 0; #X connect 2 0 11 0; #X connect 3 0 2 1; @@ -539,14 +579,30 @@ #X connect 10 0 9 0; #X connect 11 0 0 0; #X connect 11 0 6 0; -#X connect 12 0 17 0; -#X connect 13 0 17 0; -#X connect 14 0 17 0; +#X connect 12 0 26 0; +#X connect 13 0 26 0; +#X connect 14 0 26 0; #X connect 15 0 14 0; #X connect 15 1 12 0; #X connect 16 0 15 0; #X connect 17 0 0 0; +#X connect 18 0 25 0; +#X connect 19 0 25 0; +#X connect 20 0 25 0; +#X connect 21 0 20 0; +#X connect 21 1 18 0; +#X connect 22 0 21 0; +#X connect 25 0 0 0; +#X connect 26 0 17 0; +#X connect 27 0 26 1; +#X connect 28 0 26 1; +#X connect 29 0 0 0; +#X connect 31 0 0 0; +#X connect 32 0 0 0; +#X connect 33 0 0 0; #X restore 373 211 pd output support; +#X obj 27 420 route x y wheel rx ry; +#X obj 241 445 print NOT MAPPED; #X connect 2 0 60 0; #X connect 8 0 60 0; #X connect 9 0 60 0; @@ -556,48 +612,49 @@ #X connect 53 0 60 0; #X connect 54 0 60 0; #X connect 57 0 50 0; -#X connect 58 0 73 0; -#X connect 60 0 70 0; +#X connect 58 0 72 0; +#X connect 60 0 69 0; #X connect 60 0 62 0; #X connect 60 0 61 0; -#X connect 60 0 68 0; +#X connect 60 0 67 0; #X connect 60 1 52 0; #X connect 61 0 55 0; #X connect 62 0 5 0; #X connect 62 1 4 0; #X connect 62 2 63 0; #X connect 62 3 3 0; -#X connect 64 0 71 0; +#X connect 64 0 70 0; #X connect 64 1 29 0; #X connect 64 2 30 0; #X connect 64 3 31 0; #X connect 64 4 32 0; #X connect 64 5 33 0; #X connect 64 6 34 0; -#X connect 65 0 0 0; -#X connect 65 1 1 0; -#X connect 65 2 20 0; -#X connect 65 3 28 0; -#X connect 66 0 69 0; -#X connect 66 1 65 0; -#X connect 66 2 64 0; -#X connect 68 0 66 0; -#X connect 69 0 16 0; -#X connect 69 1 35 0; -#X connect 69 2 36 0; -#X connect 69 3 37 0; -#X connect 69 4 38 0; -#X connect 69 5 39 0; -#X connect 69 6 40 0; -#X connect 69 7 41 0; -#X connect 69 8 42 0; -#X connect 69 9 43 0; -#X connect 69 10 44 0; -#X connect 69 11 45 0; -#X connect 69 12 46 0; -#X connect 69 13 47 0; -#X connect 69 14 48 0; -#X connect 69 15 49 0; -#X connect 72 0 70 1; +#X connect 65 0 68 0; +#X connect 65 1 74 0; +#X connect 65 2 64 0; +#X connect 67 0 65 0; +#X connect 68 0 16 0; +#X connect 68 1 35 0; +#X connect 68 2 36 0; +#X connect 68 3 37 0; +#X connect 68 4 38 0; +#X connect 68 5 39 0; +#X connect 68 6 40 0; +#X connect 68 7 41 0; +#X connect 68 8 42 0; +#X connect 68 9 43 0; +#X connect 68 10 44 0; +#X connect 68 11 45 0; +#X connect 68 12 46 0; +#X connect 68 13 47 0; +#X connect 68 14 48 0; +#X connect 68 15 49 0; +#X connect 71 0 69 1; +#X connect 72 0 60 0; #X connect 73 0 60 0; -#X connect 74 0 60 0; +#X connect 74 0 0 0; +#X connect 74 1 1 0; +#X connect 74 2 20 0; +#X connect 74 4 28 0; +#X connect 74 5 75 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9924] trunk/externals/io/hidio
by eighthave＠users.sourceforge.net 27 May '08

27 May '08

Revision: 9924 http://pure-data.svn.sourceforge.net/pure-data/?rev=9924&view=rev Author: eighthave Date: 2008-05-27 04:25:12 -0700 (Tue, 27 May 2008) Log Message: ----------- first sketch of output message with variable atom types Modified Paths: -------------- trunk/externals/io/hidio/hidio.c trunk/externals/io/hidio/hidio_darwin.c trunk/externals/io/hidio/hidio_linux.c Modified: trunk/externals/io/hidio/hidio.c =================================================================== --- trunk/externals/io/hidio/hidio.c 2008-05-26 16:39:11 UTC (rev 9923) +++ trunk/externals/io/hidio/hidio.c 2008-05-27 11:25:12 UTC (rev 9924) @@ -95,193 +95,202 @@ void debug_post(t_int message_debug_level, const char *fmt, ...) { - if(message_debug_level <= global_debug_level) - { - char buf[MAXPDSTRING]; - va_list ap; - //t_int arg[8]; - va_start(ap, fmt); - vsnprintf(buf, MAXPDSTRING-1, fmt, ap); - post(buf); - va_end(ap); + if(message_debug_level <= global_debug_level) + { + char buf[MAXPDSTRING]; + va_list ap; + //t_int arg[8]; + va_start(ap, fmt); + vsnprintf(buf, MAXPDSTRING-1, fmt, ap); + post(buf); + va_end(ap); - } + } } void debug_error(t_hidio *x, t_int message_debug_level, const char *fmt, ...) { - if(message_debug_level <= global_debug_level) - { - char buf[MAXPDSTRING]; - va_list ap; - //t_int arg[8]; - va_start(ap, fmt); - vsnprintf(buf, MAXPDSTRING-1, fmt, ap); - pd_error(x, buf); - va_end(ap); - } + if(message_debug_level <= global_debug_level) + { + char buf[MAXPDSTRING]; + va_list ap; + //t_int arg[8]; + va_start(ap, fmt); + vsnprintf(buf, MAXPDSTRING-1, fmt, ap); + pd_error(x, buf); + va_end(ap); + } } static void output_status(t_hidio *x, t_symbol *selector, t_float output_value) { - t_atom *output_atom = (t_atom *)getbytes(sizeof(t_atom)); + t_atom *output_atom = (t_atom *)getbytes(sizeof(t_atom)); #ifdef PD - SETFLOAT(output_atom, output_value); + SETFLOAT(output_atom, output_value); #else /* Max */ - atom_setlong(output_atom, (long)output_value); + atom_setlong(output_atom, (long)output_value); #endif /* PD */ - outlet_anything( x->x_status_outlet, selector, 1, output_atom); - freebytes(output_atom,sizeof(t_atom)); + outlet_anything( x->x_status_outlet, selector, 1, output_atom); + freebytes(output_atom,sizeof(t_atom)); } static void output_open_status(t_hidio *x) { - output_status(x, ps_open, x->x_device_open); + output_status(x, ps_open, x->x_device_open); } static void output_device_number(t_hidio *x) { - output_status(x, ps_device, x->x_device_number); + output_status(x, ps_device, x->x_device_number); } static void output_poll_time(t_hidio *x) { - output_status(x, ps_poll, x->x_delay); + output_status(x, ps_poll, x->x_delay); } static void output_device_count(t_hidio *x) { - output_status(x, ps_total, device_count); + output_status(x, ps_total, device_count); } static void output_element_ranges(t_hidio *x) { - if( (x->x_device_number > -1) && (x->x_device_open) ) - { - unsigned int i; - t_atom output_data[4]; - - for(i=0;i<element_count[x->x_device_number];++i) - { + if( (x->x_device_number > -1) && (x->x_device_open) ) + { + unsigned int i; + t_atom output_data[4]; + + for(i=0;i<element_count[x->x_device_number];++i) + { #ifdef PD - SETSYMBOL(output_data, element[x->x_device_number][i]->type); - SETSYMBOL(output_data + 1, element[x->x_device_number][i]->name); - SETFLOAT(output_data + 2, element[x->x_device_number][i]->min); - SETFLOAT(output_data + 3, element[x->x_device_number][i]->max); + SETSYMBOL(output_data, element[x->x_device_number][i]->type); + SETSYMBOL(output_data + 1, element[x->x_device_number][i]->name); + SETFLOAT(output_data + 2, element[x->x_device_number][i]->min); + SETFLOAT(output_data + 3, element[x->x_device_number][i]->max); #else - atom_setsym(output_data, element[x->x_device_number][i]->type); - atom_setsym(output_data + 1, element[x->x_device_number][i]->name); - atom_setlong(output_data + 2, element[x->x_device_number][i]->min); - atom_setlong(output_data + 3, element[x->x_device_number][i]->max); + atom_setsym(output_data, element[x->x_device_number][i]->type); + atom_setsym(output_data + 1, element[x->x_device_number][i]->name); + atom_setlong(output_data + 2, element[x->x_device_number][i]->min); + atom_setlong(output_data + 3, element[x->x_device_number][i]->max); #endif /* PD */ - outlet_anything(x->x_status_outlet, ps_range, 4, output_data); - } - } + outlet_anything(x->x_status_outlet, ps_range, 4, output_data); + } + } } static unsigned int name_to_usage(char *usage_name) { // output usagepage << 16 + usage - if(strcmp(usage_name,"pointer") == 0) return 0x00010001; - if(strcmp(usage_name,"mouse") == 0) return 0x00010002; - if(strcmp(usage_name,"joystick") == 0) return 0x00010004; - if(strcmp(usage_name,"gamepad") == 0) return 0x00010005; - if(strcmp(usage_name,"keyboard") == 0) return 0x00010006; - if(strcmp(usage_name,"keypad") == 0) return 0x00010007; - if(strcmp(usage_name,"multiaxiscontroller") == 0) return 0x00010008; - return 0; + if(strcmp(usage_name,"pointer") == 0) return 0x00010001; + if(strcmp(usage_name,"mouse") == 0) return 0x00010002; + if(strcmp(usage_name,"joystick") == 0) return 0x00010004; + if(strcmp(usage_name,"gamepad") == 0) return 0x00010005; + if(strcmp(usage_name,"keyboard") == 0) return 0x00010006; + if(strcmp(usage_name,"keypad") == 0) return 0x00010007; + if(strcmp(usage_name,"multiaxiscontroller") == 0) return 0x00010008; + return 0; } +static t_int convert_symbol_hex_to_int(t_symbol *s) +{ + if(strncmp(s->s_name, "0x", 2) == 0) + return (t_int) strtoul(s->s_name, NULL, 16); + else + return -1; +} + + static short get_device_number_from_arguments(int argc, t_atom *argv) { #ifdef PD - short device_number = -1; - char device_type_string[MAXPDSTRING] = ""; - unsigned short device_type_instance; + short device_number = -1; + char device_type_string[MAXPDSTRING] = ""; + unsigned short device_type_instance; #else - long device_number = -1; - char *device_type_string; - long device_type_instance; + long device_number = -1; + char *device_type_string; + long device_type_instance; #endif /* PD */ - unsigned int usage; - unsigned short vendor_id; - unsigned short product_id; - t_symbol *first_argument; - t_symbol *second_argument; + unsigned int usage; + unsigned short vendor_id; + unsigned short product_id; + t_symbol *first_argument; + t_symbol *second_argument; - if(argc == 1) - { + if(argc == 1) + { #ifdef PD - first_argument = atom_getsymbolarg(0,argc,argv); - if(first_argument == &s_) + first_argument = atom_getsymbolarg(0,argc,argv); + if(first_argument == &s_) #else - atom_arg_getsym(&first_argument, 0,argc,argv); - if(first_argument == _sym_nothing) + atom_arg_getsym(&first_argument, 0,argc,argv); + if(first_argument == _sym_nothing) #endif /* PD */ - { // single float arg means device # - post("first_argument == &s_"); + { // single float arg means device # + post("first_argument == &s_"); #ifdef PD - device_number = (short) atom_getfloatarg(0,argc,argv); + device_number = (short) atom_getfloatarg(0,argc,argv); #else - atom_arg_getlong(&device_number, 0, argc, argv); + atom_arg_getlong(&device_number, 0, argc, argv); #endif /* PD */ - if(device_number < 0) device_number = -1; - debug_post(LOG_DEBUG,"[hidio] setting device# to %d",device_number); - } - else - { // single symbol arg means first instance of a device type + if(device_number < 0) device_number = -1; + debug_post(LOG_DEBUG,"[hidio] setting device# to %d",device_number); + } + else + { // single symbol arg means first instance of a device type #ifdef PD - atom_string(argv, device_type_string, MAXPDSTRING-1); + atom_string(argv, device_type_string, MAXPDSTRING-1); #else - device_type_string = atom_string(argv); - // LATER do we have to free this string manually??? + device_type_string = atom_string(argv); + // LATER do we have to free this string manually??? #endif /* PD */ - usage = name_to_usage(device_type_string); - device_number = get_device_number_from_usage(0, usage >> 16, - usage & 0xffff); - debug_post(LOG_INFO,"[hidio] using 0x%04x 0x%04x for %s", - usage >> 16, usage & 0xffff, device_type_string); - } - } - else if(argc == 2) - { + usage = name_to_usage(device_type_string); + device_number = get_device_number_from_usage(0, usage >> 16, + usage & 0xffff); + debug_post(LOG_INFO,"[hidio] using 0x%04x 0x%04x for %s", + usage >> 16, usage & 0xffff, device_type_string); + } + } + else if(argc == 2) + { #ifdef PD - first_argument = atom_getsymbolarg(0,argc,argv); - second_argument = atom_getsymbolarg(1,argc,argv); - if( second_argument == &s_ ) + first_argument = atom_getsymbolarg(0,argc,argv); + second_argument = atom_getsymbolarg(1,argc,argv); + if( second_argument == &s_ ) #else - atom_arg_getsym(&first_argument, 0,argc,argv); - atom_arg_getsym(&second_argument, 1,argc,argv); - if( second_argument == _sym_nothing ) + atom_arg_getsym(&first_argument, 0,argc,argv); + atom_arg_getsym(&second_argument, 1,argc,argv); + if( second_argument == _sym_nothing ) #endif /* PD */ - { /* a symbol then a float means match on usage */ + { /* a symbol then a float means match on usage */ #ifdef PD - atom_string(argv, device_type_string, MAXPDSTRING-1); - usage = name_to_usage(device_type_string); - device_type_instance = atom_getfloatarg(1,argc,argv); + atom_string(argv, device_type_string, MAXPDSTRING-1); + usage = name_to_usage(device_type_string); + device_type_instance = atom_getfloatarg(1,argc,argv); #else - device_type_string = atom_string(argv); - usage = name_to_usage(device_type_string); - atom_arg_getlong(&device_type_instance, 1, argc, argv); + device_type_string = atom_string(argv); + usage = name_to_usage(device_type_string); + atom_arg_getlong(&device_type_instance, 1, argc, argv); #endif /* PD */ - debug_post(LOG_DEBUG,"[hidio] looking for %s at #%d", - device_type_string, device_type_instance); - device_number = get_device_number_from_usage(device_type_instance, - usage >> 16, - usage & 0xffff); - } - else - { /* two symbols means idVendor and idProduct in hex */ - vendor_id = - (unsigned short) strtol(first_argument->s_name, NULL, 16); - product_id = - (unsigned short) strtol(second_argument->s_name, NULL, 16); - device_number = get_device_number_by_id(vendor_id,product_id); - } - } - return device_number; + debug_post(LOG_DEBUG,"[hidio] looking for %s at #%d", + device_type_string, device_type_instance); + device_number = get_device_number_from_usage(device_type_instance, + usage >> 16, + usage & 0xffff); + } + else + { /* two symbols means idVendor and idProduct in hex */ + vendor_id = + (unsigned short) strtol(first_argument->s_name, NULL, 16); + product_id = + (unsigned short) strtol(second_argument->s_name, NULL, 16); + device_number = get_device_number_by_id(vendor_id,product_id); + } + } + return device_number; } @@ -290,56 +299,63 @@ * of CPU time since this is run for every event that is output. */ void hidio_output_event(t_hidio *x, t_hid_element *output_element) { -/* debug_post(LOG_DEBUG,"hidio_output_event: instance %d/%d last: %llu", - x->x_instance+1, hidio_instance_count, - last_execute_time[x->x_device_number]);*/ +/* debug_post(LOG_DEBUG,"hidio_output_event: instance %d/%d last: %llu", + x->x_instance+1, hidio_instance_count, + last_execute_time[x->x_device_number]);*/ #ifdef PD - SETFLOAT(output_element->output_message + 2, output_element->value); + SETFLOAT(output_element->output_message + 2, output_element->value); #else /* Max */ - atom_setlong(output_element->output_message + 2, (long)output_element->value); + atom_setlong(output_element->output_message + 2, (long)output_element->value); #endif /* PD */ - outlet_anything(x->x_data_outlet, output_element->type, 3, - output_element->output_message); + outlet_anything(x->x_data_outlet, output_element->type, 3, + output_element->output_message); } void hidio_write_event(t_hidio *x, t_symbol *s, int argc, t_atom *argv) { - debug_post(LOG_DEBUG,"hidio_write_event_symbols"); + debug_post(LOG_DEBUG,"hidio_write_event"); t_symbol *first_argument; - t_symbol *second_argument; + t_symbol *second_argument; + t_int first_argument_int; + t_int second_argument_int; - if(argc == 4) - { - first_argument = atom_getsymbolarg(0,argc,argv); - if(first_argument == &s_) - { // first float arg means all float message - debug_post(LOG_DEBUG,"first_argument == &s_"); - hidio_write_event_ints(x, atom_getintarg(0,argc,argv), atom_getintarg(1,argc,argv), - atom_getintarg(2,argc,argv), atom_getintarg(3,argc,argv)); - } +/* TODO add symbol for value to allow for hex values. This would be useful + * for sending values greater than Pd's t_float can handle */ + if(argc != 4) + { + pd_error(x, "[hidio] write message must have exactly 4 atoms"); + return; + } + + first_argument = atom_getsymbolarg(0,argc,argv); + if(first_argument == &s_) + { // first float arg means all float message + debug_post(LOG_DEBUG,"first_argument == &s_"); + hidio_write_event_ints(x, atom_getintarg(0,argc,argv), atom_getintarg(1,argc,argv), + atom_getintarg(2,argc,argv), atom_getintarg(3,argc,argv)); + } + else + { + // if the symbol is a hex number, convert it to a t_int + first_argument_int = convert_symbol_hex_to_int(first_argument); + second_argument = atom_getsymbolarg(1,argc,argv); + if((second_argument == &s_) && (first_argument_int > -1)) + { // symbol page and float usage + debug_post(LOG_DEBUG,"second_argument == &s_"); + hidio_write_event_symbol_int(x, first_argument, + atom_getintarg(1,argc,argv), + atom_getintarg(2,argc,argv), + atom_getintarg(3,argc,argv)); + } else - { - second_argument = atom_getsymbolarg(1,argc,argv); - if(second_argument == &s_) - { // symbol page and float usage - debug_post(LOG_DEBUG,"second_argument == &s_"); - hidio_write_event_symbol_int(x, first_argument, - atom_getintarg(1,argc,argv), - atom_getintarg(2,argc,argv), - atom_getintarg(3,argc,argv)); - } - else - { // symbol page and usage - hidio_write_event_symbols(x, first_argument, second_argument, - atom_getintarg(2,argc,argv), atom_getintarg(3,argc,argv)); - } + { // symbol page and usage + // if the symbol is a hex number, convert it to a t_int + if( (first_argument->s_name[0] == '0') && (first_argument->s_name[1] == 'x') ) + first_argument_int = (t_int) strtoul(first_argument->s_name, 0, 16); + hidio_write_event_symbols(x, first_argument, second_argument, + atom_getintarg(2,argc,argv), atom_getintarg(3,argc,argv)); } - } - else - { - pd_error(x, "[hidio] write message format not supported"); - } } /* stop polling the device */ @@ -349,9 +365,9 @@ if (x->x_started) { - clock_unset(x->x_clock); - debug_post(LOG_INFO,"[hidio] polling stopped"); - x->x_started = 0; + clock_unset(x->x_clock); + debug_post(LOG_INFO,"[hidio] polling stopped"); + x->x_started = 0; } } @@ -365,63 +381,63 @@ */ void hidio_poll(t_hidio* x, t_float f) { - debug_post(LOG_DEBUG,"hidio_poll"); + debug_post(LOG_DEBUG,"hidio_poll"); -/* if the user sets the delay less than 2, set to block size */ - if( f > 2 ) - x->x_delay = (t_int)f; - else if( f > 0 ) //TODO make this the actual time between message processing - x->x_delay = 1.54; - if(x->x_device_number > -1) - { - if(!x->x_device_open) - { - hidio_open(x,ps_open,0,NULL); - } - if(!x->x_started) - { - clock_delay(x->x_clock, x->x_delay); - debug_post(LOG_DEBUG,"[hidio] polling started"); - x->x_started = 1; - } - } +/* if the user sets the delay less than 2, set to block size */ + if( f > 2 ) + x->x_delay = (t_int)f; + else if( f > 0 ) //TODO make this the actual time between message processing + x->x_delay = 1.54; + if(x->x_device_number > -1) + { + if(!x->x_device_open) + { + hidio_open(x,ps_open,0,NULL); + } + if(!x->x_started) + { + clock_delay(x->x_clock, x->x_delay); + debug_post(LOG_DEBUG,"[hidio] polling started"); + x->x_started = 1; + } + } } static void hidio_set_from_float(t_hidio *x, t_floatarg f) { /* values greater than 1 set the polling delay time */ /* 1 and 0 for start/stop so you can use a [tgl] */ - if(f > 1) - { - x->x_delay = (t_int)f; - hidio_poll(x,f); - } - else if(f == 1) - { - if(! x->x_started) - { - hidio_poll(x,f); - } - } - else if(f == 0) - { - hidio_stop_poll(x); - } + if(f > 1) + { + x->x_delay = (t_int)f; + hidio_poll(x,f); + } + else if(f == 1) + { + if(! x->x_started) + { + hidio_poll(x,f); + } + } + else if(f == 0) + { + hidio_stop_poll(x); + } } /* close the device */ static void hidio_close(t_hidio *x) { - debug_post(LOG_DEBUG,"hidio_close"); + debug_post(LOG_DEBUG,"hidio_close"); /* just to be safe, stop it first */ - hidio_stop_poll(x); + hidio_stop_poll(x); - if(! hidio_close_device(x)) - { - debug_post(LOG_INFO,"[hidio] closed device %d",x->x_device_number); - x->x_device_open = 0; - } + if(! hidio_close_device(x)) + { + debug_post(LOG_INFO,"[hidio] closed device %d",x->x_device_number); + x->x_device_open = 0; + } } @@ -435,117 +451,117 @@ */ static void hidio_open(t_hidio *x, t_symbol *s, int argc, t_atom *argv) { - short new_device_number = get_device_number_from_arguments(argc, argv); - t_int started = x->x_started; // store state to restore after device is opened - debug_post(LOG_DEBUG,"hid_%s",s->s_name); - - if (new_device_number > -1) - { - /* check whether we have to close previous device */ - if (x->x_device_open && new_device_number != x->x_device_number) - { - hidio_close(x); - } - /* no device open, so open one now */ - if (!x->x_device_open) - { - if(hidio_open_device(x, new_device_number) == EXIT_SUCCESS) - { - x->x_device_open = 1; - x->x_device_number = new_device_number; - /* restore the polling state so that when I [tgl] is used to - * start/stop [hidio], the [tgl]'s state will continue to - * accurately reflect [hidio]'s state */ - if (started) - hidio_set_from_float(x,x->x_delay); // TODO is this useful? - debug_post(LOG_DEBUG,"[hidio] set device# to %d",new_device_number); - output_device_number(x); - } - else - { - x->x_device_number = -1; - error("[hidio] can not open device %d",new_device_number); - } - } - } - else debug_post(LOG_WARNING,"[hidio] device does not exist"); - /* always output open result so you can test for success in Pd space */ - output_open_status(x); + short new_device_number = get_device_number_from_arguments(argc, argv); + t_int started = x->x_started; // store state to restore after device is opened + debug_post(LOG_DEBUG,"hid_%s",s->s_name); + + if (new_device_number > -1) + { + /* check whether we have to close previous device */ + if (x->x_device_open && new_device_number != x->x_device_number) + { + hidio_close(x); + } + /* no device open, so open one now */ + if (!x->x_device_open) + { + if(hidio_open_device(x, new_device_number) == EXIT_SUCCESS) + { + x->x_device_open = 1; + x->x_device_number = new_device_number; + /* restore the polling state so that when I [tgl] is used to + * start/stop [hidio], the [tgl]'s state will continue to + * accurately reflect [hidio]'s state */ + if (started) + hidio_set_from_float(x,x->x_delay); // TODO is this useful? + debug_post(LOG_DEBUG,"[hidio] set device# to %d",new_device_number); + output_device_number(x); + } + else + { + x->x_device_number = -1; + error("[hidio] can not open device %d",new_device_number); + } + } + } + else debug_post(LOG_WARNING,"[hidio] device does not exist"); + /* always output open result so you can test for success in Pd space */ + output_open_status(x); } static void hidio_tick(t_hidio *x) { -// debug_post(LOG_DEBUG,"hidio_tick"); - t_hid_element *current_element; - unsigned int i; - double right_now; +// debug_post(LOG_DEBUG,"hidio_tick"); + t_hid_element *current_element; + unsigned int i; + double right_now; #ifdef PD - right_now = clock_getlogicaltime(); + right_now = clock_getlogicaltime(); #else /* Max */ - clock_getftime(&right_now); + clock_getftime(&right_now); #endif /* PD */ -// debug_post(LOG_DEBUG,"# %u\tnow: %llu\tlast: %llu", x->x_device_number, -// right_now, last_execute_time[x->x_device_number]); - if(right_now > last_execute_time[x->x_device_number]) - { - hidio_get_events(x); - last_execute_time[x->x_device_number] = right_now; -/* debug_post(LOG_DEBUG,"executing: instance %d/%d at %llu last: %llu", - x->x_instance+1, hidio_instance_count, right_now, - last_execute_time[x->x_device_number]);*/ - } - for(i=0; i< element_count[x->x_device_number]; ++i) - { - /* TODO: since relative events need to be output every time, they need - * to be flagged when new relative events arrive. Otherwise, it'll - * just spam out relative events no matter if anything new has - * arrived */ - current_element = element[x->x_device_number][i]; - if(current_element->previous_value != current_element->value) - { - hidio_output_event(x, current_element); - if(!current_element->relative) - current_element->previous_value = current_element->value; - } - } - if (x->x_started) - { - clock_delay(x->x_clock, x->x_delay); - } +// debug_post(LOG_DEBUG,"# %u\tnow: %llu\tlast: %llu", x->x_device_number, +// right_now, last_execute_time[x->x_device_number]); + if(right_now > last_execute_time[x->x_device_number]) + { + hidio_get_events(x); + last_execute_time[x->x_device_number] = right_now; +/* debug_post(LOG_DEBUG,"executing: instance %d/%d at %llu last: %llu", + x->x_instance+1, hidio_instance_count, right_now, + last_execute_time[x->x_device_number]);*/ + } + for(i=0; i< element_count[x->x_device_number]; ++i) + { + /* TODO: since relative events need to be output every time, they need + * to be flagged when new relative events arrive. Otherwise, it'll + * just spam out relative events no matter if anything new has + * arrived */ + current_element = element[x->x_device_number][i]; + if(current_element->previous_value != current_element->value) + { + hidio_output_event(x, current_element); + if(!current_element->relative) + current_element->previous_value = current_element->value; + } + } + if (x->x_started) + { + clock_delay(x->x_clock, x->x_delay); + } } static void hidio_info(t_hidio *x) { - output_open_status(x); - output_device_number(x); - output_device_count(x); - output_poll_time(x); - output_element_ranges(x); - hidio_platform_specific_info(x); + output_open_status(x); + output_device_number(x); + output_device_count(x); + output_poll_time(x); + output_element_ranges(x); + hidio_platform_specific_info(x); } static void hidio_float(t_hidio* x, t_floatarg f) { - debug_post(LOG_DEBUG,"hid_float"); + debug_post(LOG_DEBUG,"hid_float"); - hidio_set_from_float(x,f); + hidio_set_from_float(x,f); } #ifndef PD /* Max */ static void hidio_int(t_hidio* x, long l) { - debug_post(LOG_DEBUG,"hid_int"); + debug_post(LOG_DEBUG,"hid_int"); - hidio_set_from_float(x, (float)l); + hidio_set_from_float(x, (float)l); } #endif /* NOT PD */ static void hidio_debug(t_hidio *x, t_float f) { - global_debug_level = f; + global_debug_level = f; } @@ -554,192 +570,192 @@ */ static void hidio_free(t_hidio* x) { - debug_post(LOG_DEBUG,"hidio_free"); + debug_post(LOG_DEBUG,"hidio_free"); - hidio_close(x); - clock_free(x->x_clock); - hidio_instance_count--; + hidio_close(x); + clock_free(x->x_clock); + hidio_instance_count--; - hidio_platform_specific_free(x); + hidio_platform_specific_free(x); } /* create a new instance of this class */ static void *hidio_new(t_symbol *s, int argc, t_atom *argv) { - unsigned int i; + unsigned int i; #ifdef PD - t_hidio *x = (t_hidio *)pd_new(hidio_class); - - x->x_clock = clock_new(x, (t_method)hidio_tick); + t_hidio *x = (t_hidio *)pd_new(hidio_class); + + x->x_clock = clock_new(x, (t_method)hidio_tick); - /* create anything outlet used for HID data */ - x->x_data_outlet = outlet_new(&x->x_obj, 0); - x->x_status_outlet = outlet_new(&x->x_obj, 0); + /* create anything outlet used for HID data */ + x->x_data_outlet = outlet_new(&x->x_obj, 0); + x->x_status_outlet = outlet_new(&x->x_obj, 0); #else /* Max */ - t_hidio *x = (t_hidio *)object_alloc(hidio_class); - - x->x_clock = clock_new(x, (method)hidio_tick); + t_hidio *x = (t_hidio *)object_alloc(hidio_class); + + x->x_clock = clock_new(x, (method)hidio_tick); - /* create anything outlet used for HID data */ - x->x_status_outlet = outlet_new(x, "anything"); - x->x_data_outlet = outlet_new(x, "anything"); + /* create anything outlet used for HID data */ + x->x_status_outlet = outlet_new(x, "anything"); + x->x_data_outlet = outlet_new(x, "anything"); #endif /* PD */ - /* init vars */ - global_debug_level = 9; /* high numbers here means see more messages */ - x->x_device_open = 0; - x->x_started = 0; - x->x_delay = DEFAULT_DELAY; - for(i=0; i<MAX_DEVICES; ++i) last_execute_time[i] = 0; -#ifdef _WINDOWS - x->x_hid_device = hidio_platform_specific_new(x); + /* init vars */ + global_debug_level = 9; /* high numbers here means see more messages */ + x->x_device_open = 0; + x->x_started = 0; + x->x_delay = DEFAULT_DELAY; + for(i=0; i<MAX_DEVICES; ++i) last_execute_time[i] = 0; +#ifdef _WIN32 + x->x_hid_device = hidio_platform_specific_new(x); #endif - x->x_device_number = get_device_number_from_arguments(argc, argv); + x->x_device_number = get_device_number_from_arguments(argc, argv); - x->x_instance = hidio_instance_count; - hidio_instance_count++; + x->x_instance = hidio_instance_count; + hidio_instance_count++; - return x; + return x; } #ifdef PD void hidio_setup(void) { - hidio_class = class_new(gensym("hidio"), - (t_newmethod)hidio_new, - (t_method)hidio_free, - sizeof(t_hidio), - CLASS_DEFAULT, - A_GIMME,0); - - /* add inlet datatype methods */ - class_addfloat(hidio_class,(t_method) hidio_float); - class_addbang(hidio_class,(t_method) hidio_tick); -/* class_addanything(hidio_class,(t_method) hidio_anything); */ - - /* add inlet message methods */ - class_addmethod(hidio_class,(t_method) hidio_debug,gensym("debug"),A_DEFFLOAT,0); - class_addmethod(hidio_class,(t_method) hidio_build_device_list,gensym("refresh"),0); + hidio_class = class_new(gensym("hidio"), + (t_newmethod)hidio_new, + (t_method)hidio_free, + sizeof(t_hidio), + CLASS_DEFAULT, + A_GIMME,0); + + /* add inlet datatype methods */ + class_addfloat(hidio_class,(t_method) hidio_float); + class_addbang(hidio_class,(t_method) hidio_tick); +/* class_addanything(hidio_class,(t_method) hidio_anything); */ + + /* add inlet message methods */ + class_addmethod(hidio_class,(t_method) hidio_debug,gensym("debug"),A_DEFFLOAT,0); + class_addmethod(hidio_class,(t_method) hidio_build_device_list,gensym("refresh"),0); /* TODO: [print( should be dumped for [devices( and [elements( messages */ - class_addmethod(hidio_class,(t_method) hidio_print,gensym("print"),0); - class_addmethod(hidio_class,(t_method) hidio_info,gensym("info"),0); - class_addmethod(hidio_class,(t_method) hidio_open,gensym("open"),A_GIMME,0); - class_addmethod(hidio_class,(t_method) hidio_close,gensym("close"),0); - class_addmethod(hidio_class,(t_method) hidio_poll,gensym("poll"),A_DEFFLOAT,0); + class_addmethod(hidio_class,(t_method) hidio_print,gensym("print"),0); + class_addmethod(hidio_class,(t_method) hidio_info,gensym("info"),0); + class_addmethod(hidio_class,(t_method) hidio_open,gensym("open"),A_GIMME,0); + class_addmethod(hidio_class,(t_method) hidio_close,gensym("close"),0); + class_addmethod(hidio_class,(t_method) hidio_poll,gensym("poll"),A_DEFFLOAT,0); /* test function for output support */ - class_addmethod(hidio_class,(t_method) hidio_write_event, gensym("write"), A_GIMME ,0); + class_addmethod(hidio_class,(t_method) hidio_write_event, gensym("write"), A_GIMME ,0); - post("[hidio] %d.%d, written by Hans-Christoph Steiner <hans(a)eds.org>", - HIDIO_MAJOR_VERSION, HIDIO_MINOR_VERSION); - post("\tcompiled on "__DATE__" at "__TIME__ " "); - - /* pre-generate often used symbols */ - ps_open = gensym("open"); - ps_device = gensym("device"); - ps_poll = gensym("poll"); - ps_total = gensym("total"); - ps_range = gensym("range"); + post("[hidio] %d.%d, written by Hans-Christoph Steiner <hans(a)eds.org>", + HIDIO_MAJOR_VERSION, HIDIO_MINOR_VERSION); + post("\tcompiled on "__DATE__" at "__TIME__ " "); + + /* pre-generate often used symbols */ + ps_open = gensym("open"); + ps_device = gensym("device"); + ps_poll = gensym("poll"); + ps_total = gensym("total"); + ps_range = gensym("range"); - generate_type_symbols(); - generate_event_symbols(); + generate_type_symbols(); + generate_event_symbols(); } #else /* Max */ static void hidio_notify(t_hidio *x, t_symbol *s, t_symbol *msg, void *sender, void *data) { - if (msg == _sym_free) // this message is sent when a child object is freeing - { - object_detach(gensym("_obex_hidio"), s, x); - object_unregister(sender); - } + if (msg == _sym_free) // this message is sent when a child object is freeing + { + object_detach(gensym("_obex_hidio"), s, x); + object_unregister(sender); + } } static void hidio_assist(t_hidio *x, void *b, long m, long a, char *s) { - if (m == 2) - { - switch (a) - { - case 0: - sprintf(s, "(list) Received Events"); - break; - case 1: - sprintf(s, "(list) Status Info"); - break; - } - } - else - { - switch (a) - { - case 0: - sprintf(s, "Control Messages"); - break; - case 1: - sprintf(s, "nothing"); - break; - } - } + if (m == 2) + { + switch (a) + { + case 0: + sprintf(s, "(list) Received Events"); + break; + case 1: + sprintf(s, "(list) Status Info"); + break; + } + } + else + { + switch (a) + { + case 0: + sprintf(s, "Control Messages"); + break; + case 1: + sprintf(s, "nothing"); + break; + } + } } int main() { - t_class *c; - - c = class_new("hidio", (method)hidio_new, (method)hidio_free, (short)sizeof(t_hidio), - 0L, A_GIMME, 0); - - /* initialize the common symbols, since we want to use them */ - common_symbols_init(); + t_class *c; + + c = class_new("hidio", (method)hidio_new, (method)hidio_free, (short)sizeof(t_hidio), + 0L, A_GIMME, 0); + + /* initialize the common symbols, since we want to use them */ + common_symbols_init(); - /* register the byte offset of obex with the class */ - class_obexoffset_set(c, calcoffset(t_hidio, x_obex)); - - /* add methods to the class */ - class_addmethod(c, (method)hidio_int, "int", A_LONG, 0); - class_addmethod(c, (method)hidio_float, "float", A_FLOAT, 0); - class_addmethod(c, (method)hidio_tick, "bang", A_GIMME, 0); - - /* add inlet message methods */ - class_addmethod(c, (method)hidio_debug, "debug",A_DEFFLOAT,0); - class_addmethod(c, (method)hidio_build_device_list, "refresh",0); + /* register the byte offset of obex with the class */ + class_obexoffset_set(c, calcoffset(t_hidio, x_obex)); + + /* add methods to the class */ + class_addmethod(c, (method)hidio_int, "int", A_LONG, 0); + class_addmethod(c, (method)hidio_float, "float", A_FLOAT, 0); + class_addmethod(c, (method)hidio_tick, "bang", A_GIMME, 0); + + /* add inlet message methods */ + class_addmethod(c, (method)hidio_debug, "debug",A_DEFFLOAT,0); + class_addmethod(c, (method)hidio_build_device_list, "refresh",0); /* TODO: [print( should be dumped for [devices( and [elements( messages */ - class_addmethod(c, (method)hidio_print, "print",0); - class_addmethod(c, (method)hidio_info, "info",0); - class_addmethod(c, (method)hidio_open, "open",A_GIMME,0); - class_addmethod(c, (method)hidio_close, "close",0); - class_addmethod(c, (method)hidio_poll, "poll",A_DEFFLOAT,0); - /* perfomrance / system stuff */ + class_addmethod(c, (method)hidio_print, "print",0); + class_addmethod(c, (method)hidio_info, "info",0); + class_addmethod(c, (method)hidio_open, "open",A_GIMME,0); + class_addmethod(c, (method)hidio_close, "close",0); + class_addmethod(c, (method)hidio_poll, "poll",A_DEFFLOAT,0); + /* perfomrance / system stuff */ - class_addmethod(c, (method)hidio_assist, "assist", A_CANT, 0); + class_addmethod(c, (method)hidio_assist, "assist", A_CANT, 0); - /* add a notify method, so we get notifications from child objects */ - class_addmethod(c, (method)hidio_notify, "notify", A_CANT, 0); - // add methods for dumpout and quickref - class_addmethod(c, (method)object_obex_dumpout, "dumpout", A_CANT, 0); - class_addmethod(c, (method)object_obex_quickref, "quickref", A_CANT, 0); + /* add a notify method, so we get notifications from child objects */ + class_addmethod(c, (method)hidio_notify, "notify", A_CANT, 0); + // add methods for dumpout and quickref + class_addmethod(c, (method)object_obex_dumpout, "dumpout", A_CANT, 0); + class_addmethod(c, (method)object_obex_quickref, "quickref", A_CANT, 0); - /* we want this class to instantiate inside of the Max UI; ergo CLASS_BOX */ - class_register(CLASS_BOX, c); - hidio_class = c; + /* we want this class to instantiate inside of the Max UI; ergo CLASS_BOX */ + class_register(CLASS_BOX, c); + hidio_class = c; - finder_addclass("Devices", "hidio"); - post("hidio %d.%d: \xA9 2006 by Hans-Christoph Steiner & Olaf Matthes", - HIDIO_MAJOR_VERSION, HIDIO_MINOR_VERSION); - post("hidio: compiled on "__DATE__" at "__TIME__ " "); - - /* pre-generate often used symbols */ - ps_open = gensym("open"); - ps_device = gensym("device"); - ps_poll = gensym("poll"); - ps_total = gensym("total"); - ps_range = gensym("range"); + finder_addclass("Devices", "hidio"); + post("hidio %d.%d: \xA9 2006 by Hans-Christoph Steiner & Olaf Matthes", + HIDIO_MAJOR_VERSION, HIDIO_MINOR_VERSION); + post("hidio: compiled on "__DATE__" at "__TIME__ " "); + + /* pre-generate often used symbols */ + ps_open = gensym("open"); + ps_device = gensym("device"); + ps_poll = gensym("poll"); + ps_total = gensym("total"); + ps_range = gensym("range"); - generate_type_symbols(); - generate_event_symbols(); + generate_type_symbols(); + generate_event_symbols(); - return EXIT_SUCCESS; + return EXIT_SUCCESS; } #endif /* PD */ Modified: trunk/externals/io/hidio/hidio_darwin.c =================================================================== --- trunk/externals/io/hidio/hidio_darwin.c 2008-05-26 16:39:11 UTC (rev 9923) +++ trunk/externals/io/hidio/hidio_darwin.c 2008-05-27 11:25:12 UTC (rev 9924) @@ -497,7 +497,7 @@ return; } post("[hidio] found %d elements:",element_count[x->x_device_number]); - post("\n TYPE\tCODE\t#\tEVENT NAME"); + post("\n TYPE\t\tCODE\t#\tcookie\tEVENT NAME"); post("-----------------------------------------------------------"); for(i=0; i<element_count[x->x_device_number]; i++) { @@ -506,8 +506,9 @@ HIDGetTypeName((IOHIDElementType) pCurrentHIDElement->type, type_name); HIDGetUsageName(pCurrentHIDElement->usagePage, pCurrentHIDElement->usage, usage_name); - post(" %s\t%s\t%d\t%s, %s", current_element->type->s_name, + post(" %s\t%s\t%d\t%d\t%s, %s", current_element->type->s_name, current_element->name->s_name,(int) current_element->instance, + pCurrentHIDElement->cookie, type_name, usage_name); } post(""); @@ -713,13 +714,21 @@ } } + +/* switch to transactions */ + +void hidio_write_packet(void) +{ +} + + void hidio_write_event_symbol_int(t_hidio *x, t_symbol *type, t_int code, t_int instance, t_int value) { debug_post(LOG_DEBUG,"hidio_write_event_symbol_float"); } -void hidio_write_event_symbols(t_hidio *x, t_symbol *type, t_symbol *code, +void hidio_write_event_symbols(t_hidio *x, t_symbol *type, t_symbol *name, t_int instance, t_int value) { /* TODO handle multiple instances of the same usage, i.e. arrays */ @@ -727,13 +736,14 @@ int i; t_hid_element *current_element; IOHIDEventStruct event; - int cookie = (int) instance; pRecDevice pCurrentHIDDevice = device_pointer[x->x_device_number]; pRecElement pCurrentHIDElement; for(i=0; i<element_count[x->x_device_number]; i++) { current_element = element[x->x_device_number][i]; - if((current_element->type == type) && (current_element->name == code)) + if((current_element->type == type) + && (current_element->name == name) + && (current_element->instance == instance)) { pCurrentHIDElement = current_element->pHIDElement; break; @@ -742,12 +752,12 @@ post("element usage page and usage: 0x%04x 0x%04x", pCurrentHIDElement->usagePage, pCurrentHIDElement->usage); event.elementCookie = (IOHIDElementCookie)pCurrentHIDElement->cookie; event.value = (SInt32)value; - post("pCurrentHIDElement->cookie, cookie, event.value, value: %d %d %d %f", - pCurrentHIDElement->cookie, cookie, event.value, value); + post("pCurrentHIDElement->cookie %d, event.elementCookie %d, event.value %d, value %d", + pCurrentHIDElement->cookie, event.elementCookie, event.value, value); HIDSetElementValue(pCurrentHIDDevice, pCurrentHIDElement, &event); } -void hidio_write_event_ints(t_hidio *x, t_int type, t_int code, +void hidio_write_event_ints(t_hidio *x, t_int type, t_int name, t_int instance, t_int value) { debug_post(LOG_DEBUG,"hidio_write_event_floats"); Modified: trunk/externals/io/hidio/hidio_linux.c =================================================================== --- trunk/externals/io/hidio/hidio_linux.c 2008-05-26 16:39:11 UTC (rev 9923) +++ trunk/externals/io/hidio/hidio_linux.c 2008-05-27 11:25:12 UTC (rev 9924) @@ -437,7 +437,31 @@ hidio_print_element_list(x); } +void hidio_write_packet(void) +{ + debug_post(LOG_DEBUG,"hidio_write_packet"); +} + +void hidio_write_event_symbol_int(t_hidio *x, t_symbol *type, t_int code, + t_int instance, t_int value) +{ + debug_post(LOG_DEBUG,"hidio_write_event_symbol_int"); +} + +void hidio_write_event_symbols(t_hidio *x, t_symbol *type, t_symbol *code, + t_int instance, t_int value) +{ + debug_post(LOG_DEBUG,"hidio_write_event_symbols"); +} + +void hidio_write_event_ints(t_hidio *x, t_int type, t_int code, + t_int instance, t_int value) +{ + debug_post(LOG_DEBUG,"hidio_write_event_ints"); +} + + t_int hidio_open_device(t_hidio *x, short device_number) { debug_post(LOG_DEBUG,"hidio_open_device"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

autobuild: pd-main+libs planetccrma6-i386 2008-05-27 04.33.34
by pd＠planetccrma6-i386.idmi.poly.edu 27 May '08

27 May '08

/home/pd/auto-build/pd-main+libs/externals/pdvjtools/videogrid/videogrid.cc:1112: warning: passing 't_floatarg' for argument 2 to 'void videogrid_grasp_selected(t_videogrid*, int)' /home/pd/auto-build/pd-main+libs/externals/pdvjtools/videogrid/videogrid.cc:1093: warning: unused variable 'maxim' /home/pd/auto-build/pd-main+libs/externals/pdvjtools/videogrid/videogrid.cc: At global scope: /home/pd/auto-build/pd-main+libs/externals/pdvjtools/videogrid/videogrid.cc:1117: warning: unused parameter 'glist' /home/pd/auto-build/pd-main+libs/externals/pdvjtools/videogrid/videogrid.cc:1117: warning: unused parameter 'shift' /home/pd/auto-build/pd-main+libs/externals/pdvjtools/videogrid/videogrid.cc:1117: warning: unused parameter 'alt' /home/pd/auto-build/pd-main+libs/externals/pdvjtools/videogrid/videogrid.cc:1117: warning: unused parameter 'dbl' /home/pd/auto-build/pd-main+libs/externals/pdvjtools/videogrid/videogrid.cc:1279: warning: unused parameter 'owner' /home/pd/auto-build/pd-main+libs/externals/pdvjtools/videogrid/videogrid.cc: In function 'void videogrid_dialog(t_videogrid*, t_symbol*, int, t_atom*)': /home/pd/auto-build/pd-main+libs/externals/pdvjtools/videogrid/videogrid.cc:1343: warning: converting to 'int' from 'double' /home/pd/auto-build/pd-main+libs/externals/pdvjtools/videogrid/videogrid.cc: At global scope: /home/pd/auto-build/pd-main+libs/externals/pdvjtools/videogrid/videogrid.cc:1291: warning: unused parameter 's' make[2]: *** [/home/pd/auto-build/pd-main+libs/externals/pdvjtools/videogrid/videogrid.pd_linux] Error 1 make[2]: Leaving directory `/home/pd/auto-build/pd-main+libs/externals' make[1]: *** [externals_install] Error 2 make[1]: Leaving directory `/home/pd/auto-build/pd-main+libs/packages' make: *** [install] Error 2 upload specs linux_make build tar.bz2 Uploading /home/pd/auto-build/pd-main+libs/packages/linux_make/build/Pd*.tar.bz2 ls: /home/pd/auto-build/pd-main+libs/packages/linux_make/build/Pd*.tar.bz2: No such file or directory

1 0

SF.net SVN: pure-data: [9923] trunk/externals/io/hidio/hidio.h
by eighthave＠users.sourceforge.net 26 May '08

26 May '08

Revision: 9923 http://pure-data.svn.sourceforge.net/pure-data/?rev=9923&view=rev Author: eighthave Date: 2008-05-26 09:39:11 -0700 (Mon, 26 May 2008) Log Message: ----------- added Pd-stype macros for building for Max/MSP Modified Paths: -------------- trunk/externals/io/hidio/hidio.h Modified: trunk/externals/io/hidio/hidio.h =================================================================== --- trunk/externals/io/hidio/hidio.h 2008-05-26 16:05:40 UTC (rev 9922) +++ trunk/externals/io/hidio/hidio.h 2008-05-26 16:39:11 UTC (rev 9923) @@ -217,8 +217,7 @@ /*============================================================================== * symbol pointers for pre-generated event symbols - *============================================================================== - */ + *============================================================================*/ extern t_symbol *ps_absolute, *ps_button, *ps_key, *ps_led, *ps_pid, *ps_relative; @@ -233,4 +232,14 @@ extern void generate_type_symbols(); +/*============================================================================== + * macros for compiling for Max/MSP using the Pd API + *============================================================================*/ + +#ifndef PD /* Max */ +# define SETSYMBOL(atom, s) atom_setsym(atom, s) +# define SETFLOAT(atom, f) atom_setlong(atom, (long)f) +#endif /* NOT PD */ + + #endif /* NOT _HIDIO_H */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9922] branches/pd-extended/v0-40/packages/ darwin_app/Makefile
by eighthave＠users.sourceforge.net 26 May '08

26 May '08

Revision: 9922 http://pure-data.svn.sourceforge.net/pure-data/?rev=9922&view=rev Author: eighthave Date: 2008-05-26 09:05:40 -0700 (Mon, 26 May 2008) Log Message: ----------- fixed up pdp_help_hack to work with the pdp and pidip help subfolders too Modified Paths: -------------- branches/pd-extended/v0-40/packages/darwin_app/Makefile Modified: branches/pd-extended/v0-40/packages/darwin_app/Makefile =================================================================== --- branches/pd-extended/v0-40/packages/darwin_app/Makefile 2008-05-26 11:16:30 UTC (rev 9921) +++ branches/pd-extended/v0-40/packages/darwin_app/Makefile 2008-05-26 16:05:40 UTC (rev 9922) @@ -174,6 +174,10 @@ pdp_help_hack: sed -i.bak 's|pdp_v4l|pdp_ieee1394|' $(helpdir)/pdp*-help.pd rm -f -- $(helpdir)/pdp*-help.pd.bak + sed -i.bak 's|pdp_v4l|pdp_ieee1394|' $(helpdir)/pdp/*.pd + rm -f -- $(helpdir)/pdp/*.pd + sed -i.bak 's|pdp_v4l|pdp_ieee1394|' $(helpdir)/pidip/*.pd + rm -f -- $(helpdir)/pidip/*.pd sed -i.bak 's|pdp_v4l|pdp_ieee1394|' $(examplesdir)/pdp/*.pd rm -f -- $(examplesdir)/pdp/*.pd.bak sed -i.bak 's|pdp_v4l|pdp_ieee1394|' $(examplesdir)/pidip/*.pd This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9921] branches/pd-extended/v0-40/pd/src/ s_audio_jack.c
by zmoelnig＠users.sourceforge.net 26 May '08

26 May '08

Revision: 9921 http://pure-data.svn.sourceforge.net/pure-data/?rev=9921&view=rev Author: zmoelnig Date: 2008-05-26 04:16:30 -0700 (Mon, 26 May 2008) Log Message: ----------- do not start jack-server automatically but hook into an already running server...does this fix things? Modified Paths: -------------- branches/pd-extended/v0-40/pd/src/s_audio_jack.c Modified: branches/pd-extended/v0-40/pd/src/s_audio_jack.c =================================================================== --- branches/pd-extended/v0-40/pd/src/s_audio_jack.c 2008-05-26 07:33:25 UTC (rev 9920) +++ branches/pd-extended/v0-40/pd/src/s_audio_jack.c 2008-05-26 11:16:30 UTC (rev 9921) @@ -80,12 +80,13 @@ static void jack_shutdown (void *arg) { - fprintf(stderr, "jack: JACK server shut down\n"); + verbose(1, "JACK-server shut down"); sys_close_audio(); jack_client = NULL; } static int jack_xrun(void* arg) { + verbose(1, "JACK-server xrun"); jack_dio_error = 1; return 0; } @@ -177,7 +178,7 @@ if (jack_ports) for (i=0;jack_ports[i] != NULL && i < sys_inchannels;i++) if (jack_connect (jack_client, jack_ports[i], jack_port_name (input_port[i]))) - fprintf (stderr, "cannot connect input ports %s -> %s\n", jack_ports[i],jack_port_name (input_port[i])); + error("JACK: cannot connect input ports %s -> %s", jack_ports[i],jack_port_name (input_port[i])); @@ -186,7 +187,7 @@ if (jack_ports) for (i=0;jack_ports[i] != NULL && i < sys_outchannels;i++) if (jack_connect (jack_client, jack_port_name (output_port[i]), jack_ports[i])) - fprintf (stderr, "cannot connect output ports %s -> %s\n", jack_port_name (output_port[i]),jack_ports[i]); + error("JACK: cannot connect output ports %s -> %s", jack_port_name (output_port[i]),jack_ports[i]); @@ -196,6 +197,7 @@ void jack_error(const char *desc) { + error("JACK error: %s", desc); return; } @@ -216,12 +218,12 @@ if ((inchans == 0) && (outchans == 0)) return 0; if (outchans > NUM_JACK_PORTS) { - fprintf(stderr,"%d output ports not supported, setting to %d\n",outchans, NUM_JACK_PORTS); + error("JACK: %d output ports not supported, setting to %d",outchans, NUM_JACK_PORTS); outchans = NUM_JACK_PORTS; } if (inchans > NUM_JACK_PORTS) { - fprintf(stderr,"%d input ports not supported, setting to %d\n",inchans, NUM_JACK_PORTS); + error("JACK: %d input ports not supported, setting to %d",inchans, NUM_JACK_PORTS); inchans = NUM_JACK_PORTS; } @@ -231,10 +233,10 @@ do { sprintf(port_name,"pure_data_%d",client_iterator); client_iterator++; - - jack_client = jack_client_open (port_name, JackNullOption, &status, NULL); + /* do not try to start the jack-server...seems to make problems... */ + jack_client = jack_client_open (port_name, JackNoStartServer, &status, NULL); if (status & JackServerFailed) { - fprintf(stderr,"unable to connect to JACK server\n"); + error("JACK: unable to connect to JACK server"); jack_client=NULL; break; } @@ -242,9 +244,9 @@ if(status) { if (status & JackServerStarted) { - fprintf(stderr, "started JACK server\n"); + post("JACK: started JACK server?"); } else { - fprintf(stderr, "jack returned status %d\n", status); + post("JACK: jack returned status %d", status); } } @@ -261,7 +263,7 @@ jack_set_process_callback (jack_client, process, 0); - jack_set_error_function (jack_error); + // jack_set_error_function (jack_error); #ifdef JACK_XRUN jack_set_xrun_callback (jack_client, jack_xrun, NULL); @@ -303,7 +305,7 @@ sprintf(port_name, "input%d", j); if (!input_port[j]) input_port[j] = jack_port_register (jack_client, port_name, JACK_DEFAULT_AUDIO_TYPE, JackPortIsInput, 0); if (!input_port[j]) { - fprintf (stderr, "jack: can only register %d input ports (instead of requested %d)\n", j, inchans); + error("JACK: can only register %d input ports (instead of requested %d)", j, inchans); sys_inchannels = inchans = j; break; } @@ -313,7 +315,7 @@ sprintf(port_name, "output%d", j); if (!output_port[j]) output_port[j] = jack_port_register (jack_client, port_name, JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0); if (!output_port[j]) { - fprintf (stderr, "jack: can only register %d output ports (instead of requested %d)\n", j, outchans); + error("JACK: can only register %d output ports (instead of requested %d)", j, outchans); sys_outchannels = outchans = j; break; } @@ -324,7 +326,7 @@ if (new_jack) { if (jack_activate (jack_client)) { - fprintf (stderr, "cannot activate client\n"); + error("JACK: cannot activate client"); sys_inchannels = sys_outchannels = 0; return 1; } @@ -406,7 +408,7 @@ void jack_listdevs( void) { - post("device listing not implemented for jack yet\n"); + error("device listing not implemented for jack yet"); } #endif /* JACK */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

autobuild: pd-main+libs planetccrma6-i386 2008-05-26 04.33.20
by pd＠planetccrma6-i386.idmi.poly.edu 26 May '08

26 May '08

1 0

SF.net SVN: pure-data: [9920] branches/pd-extended/v0-40/pd/src/m_class.c
by zmoelnig＠users.sourceforge.net 26 May '08

26 May '08

Revision: 9920 http://pure-data.svn.sourceforge.net/pure-data/?rev=9920&view=rev Author: zmoelnig Date: 2008-05-26 00:33:25 -0700 (Mon, 26 May 2008) Log Message: ----------- refixed bug #1930733 Modified Paths: -------------- branches/pd-extended/v0-40/pd/src/m_class.c Modified: branches/pd-extended/v0-40/pd/src/m_class.c =================================================================== --- branches/pd-extended/v0-40/pd/src/m_class.c 2008-05-26 00:42:38 UTC (rev 9919) +++ branches/pd-extended/v0-40/pd/src/m_class.c 2008-05-26 07:33:25 UTC (rev 9920) @@ -803,7 +803,7 @@ void pd_vmess(t_pd *x, t_symbol *sel, char *fmt, ...) { va_list ap; - t_atom arg[MAXPDARG], *at =arg; + t_atom arg[MAXPDARG+1], *at =arg; int nargs = 0; char *fp = fmt; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs May 2008