Pd-cvs October 2004

pd-cvs@lists.iem.at

12 participants
200 discussions

externals/hcs Makefile,1.10,1.11 linuxevent.c,1.8,1.9 linuxhid.h,1.8,1.9 linuxjoystick.c,1.6,1.7 linuxmouse.c,1.6,1.7
by Hans-Christoph Steiner 22 Oct '04

22 Oct '04

Update of /cvsroot/pure-data/externals/hcs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11996 Modified Files: Makefile linuxevent.c linuxhid.h linuxjoystick.c linuxmouse.c Log Message: cleaned up includes Index: linuxhid.h =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/linuxhid.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** linuxhid.h 23 Aug 2004 03:48:57 -0000 1.8 --- linuxhid.h 22 Oct 2004 02:34:32 -0000 1.9 *************** *** 1,9 **** - #include <m_pd.h> - - #ifdef PD_MAJOR_VERSION - #include "s_stuff.h" - #else - #include "m_imp.h" - #endif #ifdef __gnu_linux__ --- 1,2 ---- Index: linuxevent.c =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/linuxevent.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** linuxevent.c 30 May 2004 02:05:15 -0000 1.8 --- linuxevent.c 22 Oct 2004 02:34:32 -0000 1.9 *************** *** 1,280 **** ! #include "linuxhid.h" ! ! #define LINUXEVENT_DEVICE "/dev/input/event0" ! ! static char *version = "$Revision$"; ! ! /*------------------------------------------------------------------------------ ! * CLASS DEF ! */ ! static t_class *linuxevent_class; ! ! typedef struct _linuxevent { ! t_object x_obj; ! t_int x_fd; ! t_symbol *x_devname; ! t_clock *x_clock; ! int x_read_ok; ! int x_started; ! int x_delay; ! #ifdef __gnu_linux__ ! struct input_event x_input_event; ! #endif ! t_outlet *x_input_event_time_outlet; ! t_outlet *x_input_event_type_outlet; ! t_outlet *x_input_event_code_outlet; ! t_outlet *x_input_event_value_outlet; ! }t_linuxevent; ! ! /*------------------------------------------------------------------------------ ! * IMPLEMENTATION ! */ ! ! void linuxevent_stop(t_linuxevent* x) { ! DEBUG(post("linuxevent_stop");); ! ! if (x->x_fd >= 0 && x->x_started) { ! clock_unset(x->x_clock); ! post("linuxevent: polling stopped"); ! x->x_started = 0; ! } ! } ! ! static int linuxevent_close(t_linuxevent *x) { ! DEBUG(post("linuxevent_close");); ! ! /* just to be safe, stop it first */ ! linuxevent_stop(x); ! ! if (x->x_fd <0) return 0; ! close (x->x_fd); ! post ("[linuxevent] closed %s",x->x_devname->s_name); ! ! return 1; ! } ! ! static int linuxevent_open(t_linuxevent *x, t_symbol *s) { ! int eventType, eventCode, buttons, rel_axes, abs_axes, ff; ! #ifdef __gnu_linux__ ! unsigned long bitmask[EV_MAX][NBITS(KEY_MAX)]; ! #endif ! char devicename[256] = "Unknown"; ! DEBUG(post("linuxevent_open");) ! ! linuxevent_close(x); ! ! /* set obj device name to parameter ! * otherwise set to default ! */ ! if (s != &s_) ! x->x_devname = s; ! ! #ifdef __gnu_linux__ ! /* open device */ ! if (x->x_devname) { ! /* open the device read-only, non-exclusive */ ! x->x_fd = open (x->x_devname->s_name, O_RDONLY | O_NONBLOCK); ! /* test if device open */ ! if (x->x_fd < 0 ) { ! post("[linuxevent] open %s failed",x->x_devname->s_name); ! x->x_fd = -1; ! return 0; ! } ! } else return 1; ! ! /* read input_events from the LINUXEVENT_DEVICE stream ! * It seems that is just there to flush the event input buffer? ! */ ! while (read (x->x_fd, &(x->x_input_event), sizeof(struct input_event)) > -1); ! ! /* get name of device */ ! ioctl(x->x_fd, EVIOCGNAME(sizeof(devicename)), devicename); ! post ("Configuring %s on %s",devicename,x->x_devname->s_name); ! ! /* get bitmask representing supported events (axes, buttons, etc.) */ ! memset(bitmask, 0, sizeof(bitmask)); ! ioctl(x->x_fd, EVIOCGBIT(0, EV_MAX), bitmask[0]); ! post("\nSupported events:"); ! ! rel_axes = 0; ! abs_axes = 0; ! buttons = 0; ! ff = 0; ! ! /* cycle through all possible event types */ ! for (eventType = 0; eventType < EV_MAX; eventType++) { ! if (test_bit(eventType, bitmask[0])) { ! post(" %s (type %d) ", events[eventType] ? events[eventType] : "?", eventType); ! // post("Event type %d",eventType); ! ! /* get bitmask representing supported button types */ ! ioctl(x->x_fd, EVIOCGBIT(eventType, KEY_MAX), bitmask[eventType]); ! ! /* cycle through all possible event codes (axes, keys, etc.) ! * testing to see which are supported ! */ ! for (eventCode = 0; eventCode < KEY_MAX; eventCode++) ! if (test_bit(eventCode, bitmask[eventType])) { ! post(" Event code %d (%s)", eventCode, names[eventType] ? (names[eventType][eventCode] ? names[eventType][eventCode] : "?") : "?"); ! ! switch(eventType) { ! #ifdef EV_RST ! case EV_RST: ! break; ! #endif ! case EV_KEY: ! buttons++; ! break; ! case EV_REL: ! rel_axes++; ! break; ! case EV_ABS: ! abs_axes++; ! break; ! case EV_MSC: ! break; ! case EV_LED: ! break; ! case EV_SND: ! break; ! case EV_REP: ! break; ! case EV_FF: ! ff++; ! break; ! } ! } ! } ! } ! ! post ("\nUsing %d relative axes, %d absolute axes, and %d buttons.", rel_axes, abs_axes, buttons); ! if (ff > 0) post ("Detected %d force feedback types",ff); ! post ("\nWARNING * WARNING * WARNING * WARNING * WARNING * WARNING * WARNING"); ! post ("This object is under development! The interface could change at anytime!"); ! post ("As I write cross-platform versions, the interface might have to change."); ! post ("WARNING * WARNING * WARNING * WARNING * WARNING * WARNING * WARNING\n"); ! #endif ! ! return 1; ! } ! ! static int linuxevent_read(t_linuxevent *x,int fd) { ! if (x->x_fd < 0) return 0; ! ! #ifdef __gnu_linux__ ! while (read (x->x_fd, &(x->x_input_event), sizeof(struct input_event)) > -1) { ! outlet_float (x->x_input_event_value_outlet, (int)x->x_input_event.value); ! outlet_float (x->x_input_event_code_outlet, x->x_input_event.code); ! outlet_float (x->x_input_event_type_outlet, x->x_input_event.type); ! /* input_event.time is a timeval struct from <sys/time.h> */ ! /* outlet_float (x->x_input_event_time_outlet, x->x_input_event.time); */ ! } ! #endif ! ! if (x->x_started) { ! clock_delay(x->x_clock, x->x_delay); ! } ! ! return 1; ! } ! ! /* Actions */ ! static void linuxevent_float(t_linuxevent* x) { ! DEBUG(post("linuxevent_float");) ! ! } ! ! void linuxevent_delay(t_linuxevent* x, t_float f) { ! DEBUG(post("linuxevent_DELAY %f",f);) ! ! /* if the user sets the delay less than zero, reset to default */ ! if ( f > 0 ) { ! x->x_delay = (int)f; ! } else { ! x->x_delay = DEFAULT_DELAY; ! } ! } ! ! void linuxevent_start(t_linuxevent* x) { ! DEBUG(post("linuxevent_start");); ! ! if (x->x_fd >= 0 && !x->x_started) { ! clock_delay(x->x_clock, DEFAULT_DELAY); ! post("linuxevent: polling started"); ! x->x_started = 1; ! } else { ! post("You need to set a input device (i.e /dev/input/event0)"); ! } ! } ! ! /* setup functions */ ! static void linuxevent_free(t_linuxevent* x) { ! DEBUG(post("linuxevent_free");) ! ! if (x->x_fd < 0) return; ! ! linuxevent_stop(x); ! clock_free(x->x_clock); ! close (x->x_fd); ! } ! ! static void *linuxevent_new(t_symbol *s) { ! int i; ! t_linuxevent *x = (t_linuxevent *)pd_new(linuxevent_class); ! ! DEBUG(post("linuxevent_new");) ! ! post("[linuxevent] %s, written by Hans-Christoph Steiner <hans(a)eds.org>",version); ! #ifndef __linux__ ! post(" !! WARNING !! WARNING !! WARNING !! WARNING !! WARNING !! WARNING !!"); ! post(" This is a dummy, since this object only works with a Linux kernel!"); ! post(" !! WARNING !! WARNING !! WARNING !! WARNING !! WARNING !! WARNING !!"); ! #endif ! ! /* init vars */ ! x->x_fd = -1; ! x->x_read_ok = 1; ! x->x_started = 0; ! x->x_delay = DEFAULT_DELAY; ! x->x_devname = gensym(LINUXEVENT_DEVICE); ! ! x->x_clock = clock_new(x, (t_method)linuxevent_read); ! ! /* create outlets for each axis */ ! x->x_input_event_time_outlet = outlet_new(&x->x_obj, &s_float); ! x->x_input_event_type_outlet = outlet_new(&x->x_obj, &s_float); ! x->x_input_event_code_outlet = outlet_new(&x->x_obj, &s_float); ! x->x_input_event_value_outlet = outlet_new(&x->x_obj, &s_float); ! ! /* set to the value from the object argument, if that exists */ ! if (s != &s_) ! x->x_devname = s; ! ! /* Open the device and save settings */ ! ! if (!linuxevent_open(x,s)) return x; ! ! return (x); ! } ! ! void linuxevent_setup(void) { ! DEBUG(post("linuxevent_setup");) ! linuxevent_class = class_new(gensym("linuxevent"), ! (t_newmethod)linuxevent_new, ! (t_method)linuxevent_free, ! sizeof(t_linuxevent),0,A_DEFSYM,0); ! ! /* add inlet datatype methods */ ! class_addfloat(linuxevent_class,(t_method) linuxevent_float); ! class_addbang(linuxevent_class,(t_method) linuxevent_read); ! ! /* add inlet message methods */ ! class_addmethod(linuxevent_class,(t_method) linuxevent_delay,gensym("delay"),A_DEFFLOAT,0); ! class_addmethod(linuxevent_class,(t_method) linuxevent_open,gensym("open"),A_DEFSYM,0); ! class_addmethod(linuxevent_class,(t_method) linuxevent_close,gensym("close"),0); ! class_addmethod(linuxevent_class,(t_method) linuxevent_start,gensym("start"),0); ! class_addmethod(linuxevent_class,(t_method) linuxevent_start,gensym("poll"),0); ! class_addmethod(linuxevent_class,(t_method) linuxevent_stop,gensym("stop"),0); ! class_addmethod(linuxevent_class,(t_method) linuxevent_stop,gensym("nopoll"),0); ! } ! --- 1,285 ---- ! #include <m_pd.h> ! ! #include "linuxhid.h" ! ! #define LINUXEVENT_DEVICE "/dev/input/event0" ! ! static char *version = "$Revision$"; ! ! /*------------------------------------------------------------------------------ ! * CLASS DEF ! */ ! static t_class *linuxevent_class; ! ! typedef struct _linuxevent { ! t_object x_obj; ! t_int x_fd; ! t_symbol *x_devname; ! t_clock *x_clock; ! int x_read_ok; ! int x_started; ! int x_delay; ! #ifdef __gnu_linux__ ! struct input_event x_input_event; ! #endif ! t_outlet *x_input_event_time_outlet; ! t_outlet *x_input_event_type_outlet; ! t_outlet *x_input_event_code_outlet; ! t_outlet *x_input_event_value_outlet; ! }t_linuxevent; ! ! /*------------------------------------------------------------------------------ ! * IMPLEMENTATION ! */ ! ! void linuxevent_stop(t_linuxevent* x) { ! DEBUG(post("linuxevent_stop");); ! ! if (x->x_fd >= 0 && x->x_started) { ! clock_unset(x->x_clock); ! post("linuxevent: polling stopped"); ! x->x_started = 0; ! } ! } ! ! static int linuxevent_close(t_linuxevent *x) { ! DEBUG(post("linuxevent_close");); ! ! /* just to be safe, stop it first */ ! linuxevent_stop(x); ! ! if (x->x_fd <0) return 0; ! close (x->x_fd); ! post ("[linuxevent] closed %s",x->x_devname->s_name); ! ! return 1; ! } ! ! static int linuxevent_open(t_linuxevent *x, t_symbol *s) { ! int eventType, eventCode, buttons, rel_axes, abs_axes, ff; ! #ifdef __gnu_linux__ ! unsigned long bitmask[EV_MAX][NBITS(KEY_MAX)]; ! #endif ! char devicename[256] = "Unknown"; ! DEBUG(post("linuxevent_open");) ! ! linuxevent_close(x); ! ! /* set obj device name to parameter ! * otherwise set to default ! */ ! if (s != &s_) ! x->x_devname = s; ! ! #ifdef __gnu_linux__ ! /* open device */ ! if (x->x_devname) { ! /* open the device read-only, non-exclusive */ ! x->x_fd = open (x->x_devname->s_name, O_RDONLY | O_NONBLOCK); ! /* test if device open */ ! if (x->x_fd < 0 ) { ! post("[linuxevent] open %s failed",x->x_devname->s_name); ! x->x_fd = -1; ! return 0; ! } ! } else return 1; ! ! /* read input_events from the LINUXEVENT_DEVICE stream ! * It seems that is just there to flush the event input buffer? ! */ ! while (read (x->x_fd, &(x->x_input_event), sizeof(struct input_event)) > -1); ! ! /* get name of device */ ! ioctl(x->x_fd, EVIOCGNAME(sizeof(devicename)), devicename); ! post ("Configuring %s on %s",devicename,x->x_devname->s_name); ! ! /* get bitmask representing supported events (axes, buttons, etc.) */ ! memset(bitmask, 0, sizeof(bitmask)); ! ioctl(x->x_fd, EVIOCGBIT(0, EV_MAX), bitmask[0]); ! post("\nSupported events:"); ! ! rel_axes = 0; ! abs_axes = 0; ! buttons = 0; ! ff = 0; ! ! /* cycle through all possible event types */ ! for (eventType = 0; eventType < EV_MAX; eventType++) { ! if (test_bit(eventType, bitmask[0])) { ! post(" %s (type %d) ", events[eventType] ? events[eventType] : "?", eventType); ! // post("Event type %d",eventType); ! ! /* get bitmask representing supported button types */ ! ioctl(x->x_fd, EVIOCGBIT(eventType, KEY_MAX), bitmask[eventType]); ! ! /* cycle through all possible event codes (axes, keys, etc.) ! * testing to see which are supported ! */ ! for (eventCode = 0; eventCode < KEY_MAX; eventCode++) ! if (test_bit(eventCode, bitmask[eventType])) { ! post(" Event code %d (%s)", eventCode, names[eventType] ? (names[eventType][eventCode] ? names[eventType][eventCode] : "?") : "?"); ! ! switch(eventType) { ! // the API changed at some point... ! #ifdef EV_RST ! case EV_RST: ! #else ! case EV_SYN: ! #endif ! break; ! case EV_KEY: ! buttons++; ! break; ! case EV_REL: ! rel_axes++; ! break; ! case EV_ABS: ! abs_axes++; ! break; ! case EV_MSC: ! break; ! case EV_LED: ! break; ! case EV_SND: ! break; ! case EV_REP: ! break; ! case EV_FF: ! ff++; ! break; ! } ! } ! } ! } ! ! post ("\nUsing %d relative axes, %d absolute axes, and %d buttons.", rel_axes, abs_axes, buttons); ! if (ff > 0) post ("Detected %d force feedback types",ff); ! post ("\nWARNING * WARNING * WARNING * WARNING * WARNING * WARNING * WARNING"); ! post ("This object is under development! The interface could change at anytime!"); ! post ("As I write cross-platform versions, the interface might have to change."); ! post ("WARNING * WARNING * WARNING * WARNING * WARNING * WARNING * WARNING\n"); ! #endif ! ! return 1; ! } ! ! static int linuxevent_read(t_linuxevent *x,int fd) { ! if (x->x_fd < 0) return 0; ! ! #ifdef __gnu_linux__ ! while (read (x->x_fd, &(x->x_input_event), sizeof(struct input_event)) > -1) { ! outlet_float (x->x_input_event_value_outlet, (int)x->x_input_event.value); ! outlet_float (x->x_input_event_code_outlet, x->x_input_event.code); ! outlet_float (x->x_input_event_type_outlet, x->x_input_event.type); ! /* input_event.time is a timeval struct from <sys/time.h> */ ! /* outlet_float (x->x_input_event_time_outlet, x->x_input_event.time); */ ! } ! #endif ! ! if (x->x_started) { ! clock_delay(x->x_clock, x->x_delay); ! } ! ! return 1; ! } ! ! /* Actions */ ! static void linuxevent_float(t_linuxevent* x) { ! DEBUG(post("linuxevent_float");) ! ! } ! ! void linuxevent_delay(t_linuxevent* x, t_float f) { ! DEBUG(post("linuxevent_DELAY %f",f);) ! ! /* if the user sets the delay less than zero, reset to default */ ! if ( f > 0 ) { ! x->x_delay = (int)f; ! } else { ! x->x_delay = DEFAULT_DELAY; ! } ! } ! ! void linuxevent_start(t_linuxevent* x) { ! DEBUG(post("linuxevent_start");); ! ! if (x->x_fd >= 0 && !x->x_started) { ! clock_delay(x->x_clock, DEFAULT_DELAY); ! post("linuxevent: polling started"); ! x->x_started = 1; ! } else { ! post("You need to set a input device (i.e /dev/input/event0)"); ! } ! } ! ! /* setup functions */ ! static void linuxevent_free(t_linuxevent* x) { ! DEBUG(post("linuxevent_free");) ! ! if (x->x_fd < 0) return; ! ! linuxevent_stop(x); ! clock_free(x->x_clock); ! close (x->x_fd); ! } ! ! static void *linuxevent_new(t_symbol *s) { ! int i; ! t_linuxevent *x = (t_linuxevent *)pd_new(linuxevent_class); ! ! DEBUG(post("linuxevent_new");) ! ! post("[linuxevent] %s, written by Hans-Christoph Steiner <hans(a)eds.org>",version); ! #ifndef __linux__ ! post(" !! WARNING !! WARNING !! WARNING !! WARNING !! WARNING !! WARNING !!"); ! post(" This is a dummy, since this object only works with a Linux kernel!"); ! post(" !! WARNING !! WARNING !! WARNING !! WARNING !! WARNING !! WARNING !!"); ! #endif ! ! /* init vars */ ! x->x_fd = -1; ! x->x_read_ok = 1; ! x->x_started = 0; ! x->x_delay = DEFAULT_DELAY; ! x->x_devname = gensym(LINUXEVENT_DEVICE); ! ! x->x_clock = clock_new(x, (t_method)linuxevent_read); ! ! /* create outlets for each axis */ ! x->x_input_event_time_outlet = outlet_new(&x->x_obj, &s_float); ! x->x_input_event_type_outlet = outlet_new(&x->x_obj, &s_float); ! x->x_input_event_code_outlet = outlet_new(&x->x_obj, &s_float); ! x->x_input_event_value_outlet = outlet_new(&x->x_obj, &s_float); ! ! /* set to the value from the object argument, if that exists */ ! if (s != &s_) ! x->x_devname = s; ! ! /* Open the device and save settings */ ! ! if (!linuxevent_open(x,s)) return x; ! ! return (x); ! } ! ! void linuxevent_setup(void) { ! DEBUG(post("linuxevent_setup");) ! linuxevent_class = class_new(gensym("linuxevent"), ! (t_newmethod)linuxevent_new, ! (t_method)linuxevent_free, ! sizeof(t_linuxevent),0,A_DEFSYM,0); ! ! /* add inlet datatype methods */ ! class_addfloat(linuxevent_class,(t_method) linuxevent_float); ! class_addbang(linuxevent_class,(t_method) linuxevent_read); ! ! /* add inlet message methods */ ! class_addmethod(linuxevent_class,(t_method) linuxevent_delay,gensym("delay"),A_DEFFLOAT,0); ! class_addmethod(linuxevent_class,(t_method) linuxevent_open,gensym("open"),A_DEFSYM,0); ! class_addmethod(linuxevent_class,(t_method) linuxevent_close,gensym("close"),0); ! class_addmethod(linuxevent_class,(t_method) linuxevent_start,gensym("start"),0); ! class_addmethod(linuxevent_class,(t_method) linuxevent_start,gensym("poll"),0); ! class_addmethod(linuxevent_class,(t_method) linuxevent_stop,gensym("stop"),0); ! class_addmethod(linuxevent_class,(t_method) linuxevent_stop,gensym("nopoll"),0); ! } ! Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/Makefile,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Makefile 17 Nov 2003 21:09:44 -0000 1.10 --- Makefile 22 Oct 2004 02:34:32 -0000 1.11 *************** *** 1,3 **** ! CC=gcc-3.2 pd_linux: pan_gogins~.pd_linux range.pd_linux linuxmouse.pd_linux linuxevent.pd_linux linuxjoystick.pd_linux ifeel.pd_linux platformdummy.pd_linux --- 1,3 ---- ! CC=gcc pd_linux: pan_gogins~.pd_linux range.pd_linux linuxmouse.pd_linux linuxevent.pd_linux linuxjoystick.pd_linux ifeel.pd_linux platformdummy.pd_linux Index: linuxjoystick.c =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/linuxjoystick.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** linuxjoystick.c 28 May 2004 01:03:21 -0000 1.6 --- linuxjoystick.c 22 Oct 2004 02:34:32 -0000 1.7 *************** *** 1,2 **** --- 1,4 ---- + #include <m_pd.h> + #include "linuxhid.h" Index: linuxmouse.c =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/linuxmouse.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** linuxmouse.c 30 May 2004 01:59:05 -0000 1.6 --- linuxmouse.c 22 Oct 2004 02:34:32 -0000 1.7 *************** *** 1,276 **** ! #include "linuxhid.h" ! ! #define LINUXMOUSE_DEVICE "/dev/input/event0" ! #define LINUXMOUSE_AXES 3 ! ! static char *version = "$Revision$"; ! ! /*------------------------------------------------------------------------------ ! * CLASS DEF ! */ ! static t_class *linuxmouse_class; ! ! typedef struct _linuxmouse { ! t_object x_obj; ! t_int x_fd; ! t_symbol *x_devname; ! int x_read_ok; ! int x_started; ! #ifdef __gnu_linux__ ! struct input_event x_input_event; ! #endif ! t_outlet *x_axis_out[LINUXMOUSE_AXES]; ! t_outlet *x_button_num_out; ! t_outlet *x_button_val_out; ! unsigned char x_buttons; ! unsigned char x_axes; ! } t_linuxmouse; ! ! /*------------------------------------------------------------------------------ ! * IMPLEMENTATION ! */ ! ! /* Actions */ ! void linuxmouse_stop(t_linuxmouse* x) { ! DEBUG(post("linuxmouse_stop");); ! ! #ifdef __gnu_linux__ ! if (x->x_fd >= 0 && x->x_started) { ! sys_rmpollfn(x->x_fd); ! post("[linuxmouse] stopped"); ! x->x_started = 0; ! } ! #endif ! } ! ! static int linuxmouse_close(t_linuxmouse *x) { ! DEBUG(post("linuxmouse_close");); ! ! /* just to be safe, stop it first */ ! linuxmouse_stop(x); ! ! if (x->x_fd < 0) { ! return 0; ! } ! else { ! close (x->x_fd); ! post ("[linuxmouse] closed %s",x->x_devname->s_name); ! return 1; ! } ! } ! ! static int linuxmouse_open(t_linuxmouse *x, t_symbol *s) { ! int eventType, eventCode; ! char devicename[256] = "Unknown"; ! #ifdef __gnu_linux__ ! unsigned long bitmask[EV_MAX][NBITS(KEY_MAX)]; ! #endif ! ! DEBUG(post("linuxmouse_open");); ! ! linuxmouse_close(x); ! ! /* set obj device name to parameter otherwise set to default */ ! if ( s != &s_ ) ! x->x_devname = s; ! ! #ifdef __gnu_linux__ ! /* open device */ ! if (x->x_devname) { ! /* open the device read-only, non-exclusive */ ! x->x_fd = open (x->x_devname->s_name, O_RDONLY | O_NONBLOCK); ! /* test if device open */ ! if (x->x_fd < 0 ) { ! post("[linuxmouse] open %s failed",x->x_devname->s_name); ! x->x_fd = -1; ! return 0; ! } ! } else { ! post("[linuxmouse] no device set: %s",x->x_devname->s_name); ! return 1; ! } ! ! /* read input_events from the LINUXMOUSE_DEVICE stream ! * It seems that is just there to flush the event input buffer? ! */ ! while (read (x->x_fd, &(x->x_input_event), sizeof(struct input_event)) > -1); ! ! /* get name of device */ ! ioctl(x->x_fd, EVIOCGNAME(sizeof(devicename)), devicename); ! post ("Configuring %s on %s.",devicename,x->x_devname->s_name); ! post("\nSupported events:"); ! ! /* get bitmask representing supported events (axes, buttons, etc.) */ ! memset(bitmask, 0, sizeof(bitmask)); ! ioctl(x->x_fd, EVIOCGBIT(0, EV_MAX), bitmask[0]); ! ! x->x_axes = 0; ! x->x_buttons = 0; ! ! /* cycle through all possible event types */ ! for (eventType = 0; eventType < EV_MAX; eventType++) { ! if (test_bit(eventType, bitmask[0])) { ! post(" %s (type %d) ", events[eventType] ? events[eventType] : "?", eventType); ! // post("Event type %d",eventType); ! ! /* get bitmask representing supported button types */ ! ioctl(x->x_fd, EVIOCGBIT(eventType, KEY_MAX), bitmask[eventType]); ! ! /* cycle through all possible event codes (axes, keys, etc.) ! * testing to see which are supported ! */ ! for (eventCode = 0; eventCode < KEY_MAX; eventCode++) { ! if (test_bit(eventCode, bitmask[eventType])) { ! post(" Event code %d (%s)", eventCode, names[eventType] ? (names[eventType][eventCode] ? names[eventType][eventCode] : "?") : "?"); ! ! if ( eventType == EV_KEY ) ! x->x_buttons++; ! else if ( eventType == EV_REL ) ! x->x_axes++; ! } ! } ! } ! } ! ! post ("\nUsing %d axes and %d buttons.", x->x_axes, x->x_buttons); ! post ("\nWARNING * WARNING * WARNING * WARNING * WARNING * WARNING * WARNING"); ! post ("This object is under development! The interface could change at anytime!"); ! post ("As I write cross-platform versions, the interface might have to change."); ! post ("WARNING * WARNING * WARNING * WARNING * WARNING * WARNING * WARNING\n"); ! #endif ! ! return 1; ! } ! ! static int linuxmouse_read(t_linuxmouse *x,int fd) { ! int axis_num = 0; ! t_float button_num = 0; ! ! if (x->x_fd < 0) return 0; ! ! #ifdef __gnu_linux__ ! while (read (x->x_fd, &(x->x_input_event), sizeof(struct input_event)) > -1) { ! if ( x->x_input_event.type == EV_REL ) { ! /* Relative Axes Event Type */ ! switch ( x->x_input_event.code ) { ! case REL_X: ! axis_num = 0; ! break; ! case REL_Y: ! axis_num = 1; ! break; ! case REL_WHEEL: ! axis_num = 2; ! break; ! } ! outlet_float (x->x_axis_out[axis_num], (int)x->x_input_event.value); ! } ! else if ( x->x_input_event.type == EV_KEY ) { ! /* key/button event type */ ! switch ( x->x_input_event.code ) { ! case BTN_LEFT: ! button_num = 0; ! break; ! case BTN_RIGHT: ! button_num = 1; ! break; ! case BTN_MIDDLE: ! button_num = 2; ! break; ! case BTN_SIDE: ! button_num = 3; ! break; ! case BTN_EXTRA: ! button_num = 4; ! break; ! case BTN_FORWARD: ! button_num = 5; ! break; ! case BTN_BACK: ! button_num = 6; ! break; ! } ! outlet_float (x->x_button_val_out, x->x_input_event.value); ! outlet_float (x->x_button_num_out, button_num); ! } ! } ! #endif ! ! return 1; ! } ! ! void linuxmouse_start(t_linuxmouse* x) { ! DEBUG(post("linuxmouse_start");); ! ! /* if the device isn't open already, open it */ ! /* (I'll test this later -HCS) */ ! /* if (x->x_fd < 0) linuxmouse_open(x,&s_); */ ! ! #ifdef __gnu_linux__ ! if (x->x_fd >= 0 && !x->x_started) { ! sys_addpollfn(x->x_fd, (t_fdpollfn)linuxmouse_read, x); ! post("[linuxmouse] started"); ! x->x_started = 1; ! } else { ! post("You need to set a input device (i.e /dev/input/event0)"); ! } ! #endif ! } ! ! /* setup functions */ ! static void linuxmouse_free(t_linuxmouse* x) { ! DEBUG(post("linuxmouse_free");); ! ! if (x->x_fd < 0) return; ! linuxmouse_stop(x); ! close (x->x_fd); ! } ! ! static void *linuxmouse_new(t_symbol *s) { ! int i; ! t_linuxmouse *x = (t_linuxmouse *)pd_new(linuxmouse_class); ! ! DEBUG(post("linuxmouse_new");); ! ! post("[linuxmouse] %s, written by Hans-Christoph Steiner <hans(a)eds.org>",version); ! #ifndef __gnu_linux__ ! post(" !! WARNING !! WARNING !! WARNING !! WARNING !! WARNING !! WARNING !!"); ! post(" This is a dummy, since this object only works with a Linux kernel!"); ! post(" !! WARNING !! WARNING !! WARNING !! WARNING !! WARNING !! WARNING !!"); ! #endif ! ! /* init vars */ ! x->x_fd = -1; ! x->x_read_ok = 1; ! x->x_started = 0; ! x->x_devname = gensym("/dev/input/event0"); ! ! /* create outlets for each axis */ ! for (i = 0; i < LINUXMOUSE_AXES; i++) ! x->x_axis_out[i] = outlet_new(&x->x_obj, &s_float); ! ! /* create outlets for buttons */ ! x->x_button_num_out = outlet_new(&x->x_obj, &s_float); ! x->x_button_val_out = outlet_new(&x->x_obj, &s_float); ! ! if (!linuxmouse_open(x,s)) return x; ! ! return (x); ! } ! ! void linuxmouse_setup(void) { ! DEBUG(post("linuxmouse_setup");); ! linuxmouse_class = class_new(gensym("linuxmouse"), ! (t_newmethod)linuxmouse_new, ! (t_method)linuxmouse_free, ! sizeof(t_linuxmouse), 0, A_DEFSYM, 0); ! ! /* add inlet message methods */ ! class_addmethod(linuxmouse_class,(t_method) linuxmouse_open,gensym("open"),A_DEFSYM,0); ! class_addmethod(linuxmouse_class,(t_method) linuxmouse_close,gensym("close"),0); ! class_addmethod(linuxmouse_class,(t_method) linuxmouse_start,gensym("start"),0); ! class_addmethod(linuxmouse_class,(t_method) linuxmouse_stop,gensym("stop"),0); ! class_addmethod(linuxmouse_class,(t_method) linuxmouse_start,gensym("poll"),0); ! class_addmethod(linuxmouse_class,(t_method) linuxmouse_stop,gensym("nopoll"),0); ! } ! --- 1,284 ---- ! #include <m_pd.h> ! ! #ifdef PD_MAJOR_VERSION ! #include "s_stuff.h" ! #else ! #include "m_imp.h" ! #endif ! ! #include "linuxhid.h" ! ! #define LINUXMOUSE_DEVICE "/dev/input/event0" ! #define LINUXMOUSE_AXES 3 ! ! static char *version = "$Revision$"; ! ! /*------------------------------------------------------------------------------ ! * CLASS DEF ! */ ! static t_class *linuxmouse_class; ! ! typedef struct _linuxmouse { ! t_object x_obj; ! t_int x_fd; ! t_symbol *x_devname; ! int x_read_ok; ! int x_started; ! #ifdef __gnu_linux__ ! struct input_event x_input_event; ! #endif ! t_outlet *x_axis_out[LINUXMOUSE_AXES]; ! t_outlet *x_button_num_out; ! t_outlet *x_button_val_out; ! unsigned char x_buttons; ! unsigned char x_axes; ! } t_linuxmouse; ! ! /*------------------------------------------------------------------------------ ! * IMPLEMENTATION ! */ ! ! /* Actions */ ! void linuxmouse_stop(t_linuxmouse* x) { ! DEBUG(post("linuxmouse_stop");); ! ! #ifdef __gnu_linux__ ! if (x->x_fd >= 0 && x->x_started) { ! sys_rmpollfn(x->x_fd); ! post("[linuxmouse] stopped"); ! x->x_started = 0; ! } ! #endif ! } ! ! static int linuxmouse_close(t_linuxmouse *x) { ! DEBUG(post("linuxmouse_close");); ! ! /* just to be safe, stop it first */ ! linuxmouse_stop(x); ! ! if (x->x_fd < 0) { ! return 0; ! } ! else { ! close (x->x_fd); ! post ("[linuxmouse] closed %s",x->x_devname->s_name); ! return 1; ! } ! } ! ! static int linuxmouse_open(t_linuxmouse *x, t_symbol *s) { ! int eventType, eventCode; ! char devicename[256] = "Unknown"; ! #ifdef __gnu_linux__ ! unsigned long bitmask[EV_MAX][NBITS(KEY_MAX)]; ! #endif ! ! DEBUG(post("linuxmouse_open");); ! ! linuxmouse_close(x); ! ! /* set obj device name to parameter otherwise set to default */ ! if ( s != &s_ ) ! x->x_devname = s; ! ! #ifdef __gnu_linux__ ! /* open device */ ! if (x->x_devname) { ! /* open the device read-only, non-exclusive */ ! x->x_fd = open (x->x_devname->s_name, O_RDONLY | O_NONBLOCK); ! /* test if device open */ ! if (x->x_fd < 0 ) { ! post("[linuxmouse] open %s failed",x->x_devname->s_name); ! x->x_fd = -1; ! return 0; ! } ! } else { ! post("[linuxmouse] no device set: %s",x->x_devname->s_name); ! return 1; ! } ! ! /* read input_events from the LINUXMOUSE_DEVICE stream ! * It seems that is just there to flush the event input buffer? ! */ ! while (read (x->x_fd, &(x->x_input_event), sizeof(struct input_event)) > -1); ! ! /* get name of device */ ! ioctl(x->x_fd, EVIOCGNAME(sizeof(devicename)), devicename); ! post ("Configuring %s on %s.",devicename,x->x_devname->s_name); ! post("\nSupported events:"); ! ! /* get bitmask representing supported events (axes, buttons, etc.) */ ! memset(bitmask, 0, sizeof(bitmask)); ! ioctl(x->x_fd, EVIOCGBIT(0, EV_MAX), bitmask[0]); ! ! x->x_axes = 0; ! x->x_buttons = 0; ! ! /* cycle through all possible event types */ ! for (eventType = 0; eventType < EV_MAX; eventType++) { ! if (test_bit(eventType, bitmask[0])) { ! post(" %s (type %d) ", events[eventType] ? events[eventType] : "?", eventType); ! // post("Event type %d",eventType); ! ! /* get bitmask representing supported button types */ ! ioctl(x->x_fd, EVIOCGBIT(eventType, KEY_MAX), bitmask[eventType]); ! ! /* cycle through all possible event codes (axes, keys, etc.) ! * testing to see which are supported ! */ ! for (eventCode = 0; eventCode < KEY_MAX; eventCode++) { ! if (test_bit(eventCode, bitmask[eventType])) { ! post(" Event code %d (%s)", eventCode, names[eventType] ? (names[eventType][eventCode] ? names[eventType][eventCode] : "?") : "?"); ! ! if ( eventType == EV_KEY ) ! x->x_buttons++; ! else if ( eventType == EV_REL ) ! x->x_axes++; ! } ! } ! } ! } ! ! post ("\nUsing %d axes and %d buttons.", x->x_axes, x->x_buttons); ! post ("\nWARNING * WARNING * WARNING * WARNING * WARNING * WARNING * WARNING"); ! post ("This object is under development! The interface could change at anytime!"); ! post ("As I write cross-platform versions, the interface might have to change."); ! post ("WARNING * WARNING * WARNING * WARNING * WARNING * WARNING * WARNING\n"); ! #endif ! ! return 1; ! } ! ! static int linuxmouse_read(t_linuxmouse *x,int fd) { ! int axis_num = 0; ! t_float button_num = 0; ! ! if (x->x_fd < 0) return 0; ! ! #ifdef __gnu_linux__ ! while (read (x->x_fd, &(x->x_input_event), sizeof(struct input_event)) > -1) { ! if ( x->x_input_event.type == EV_REL ) { ! /* Relative Axes Event Type */ ! switch ( x->x_input_event.code ) { ! case REL_X: ! axis_num = 0; ! break; ! case REL_Y: ! axis_num = 1; ! break; ! case REL_WHEEL: ! axis_num = 2; ! break; ! } ! outlet_float (x->x_axis_out[axis_num], (int)x->x_input_event.value); ! } ! else if ( x->x_input_event.type == EV_KEY ) { ! /* key/button event type */ ! switch ( x->x_input_event.code ) { ! case BTN_LEFT: ! button_num = 0; ! break; ! case BTN_RIGHT: ! button_num = 1; ! break; ! case BTN_MIDDLE: ! button_num = 2; ! break; ! case BTN_SIDE: ! button_num = 3; ! break; ! case BTN_EXTRA: ! button_num = 4; ! break; ! case BTN_FORWARD: ! button_num = 5; ! break; ! case BTN_BACK: ! button_num = 6; ! break; ! } ! outlet_float (x->x_button_val_out, x->x_input_event.value); ! outlet_float (x->x_button_num_out, button_num); ! } ! } ! #endif ! ! return 1; ! } ! ! void linuxmouse_start(t_linuxmouse* x) { ! DEBUG(post("linuxmouse_start");); ! ! /* if the device isn't open already, open it */ ! /* (I'll test this later -HCS) */ ! /* if (x->x_fd < 0) linuxmouse_open(x,&s_); */ ! ! #ifdef __gnu_linux__ ! if (x->x_fd >= 0 && !x->x_started) { ! sys_addpollfn(x->x_fd, (t_fdpollfn)linuxmouse_read, x); ! post("[linuxmouse] started"); ! x->x_started = 1; ! } else { ! post("You need to set a input device (i.e /dev/input/event0)"); ! } ! #endif ! } ! ! /* setup functions */ ! static void linuxmouse_free(t_linuxmouse* x) { ! DEBUG(post("linuxmouse_free");); ! ! if (x->x_fd < 0) return; ! linuxmouse_stop(x); ! close (x->x_fd); ! } ! ! static void *linuxmouse_new(t_symbol *s) { ! int i; ! t_linuxmouse *x = (t_linuxmouse *)pd_new(linuxmouse_class); ! ! DEBUG(post("linuxmouse_new");); ! ! post("[linuxmouse] %s, written by Hans-Christoph Steiner <hans(a)eds.org>",version); ! #ifndef __gnu_linux__ ! post(" !! WARNING !! WARNING !! WARNING !! WARNING !! WARNING !! WARNING !!"); ! post(" This is a dummy, since this object only works with a Linux kernel!"); ! post(" !! WARNING !! WARNING !! WARNING !! WARNING !! WARNING !! WARNING !!"); ! #endif ! ! /* init vars */ ! x->x_fd = -1; ! x->x_read_ok = 1; ! x->x_started = 0; ! x->x_devname = gensym("/dev/input/event0"); ! ! /* create outlets for each axis */ ! for (i = 0; i < LINUXMOUSE_AXES; i++) ! x->x_axis_out[i] = outlet_new(&x->x_obj, &s_float); ! ! /* create outlets for buttons */ ! x->x_button_num_out = outlet_new(&x->x_obj, &s_float); ! x->x_button_val_out = outlet_new(&x->x_obj, &s_float); ! ! if (!linuxmouse_open(x,s)) return x; ! ! return (x); ! } ! ! void linuxmouse_setup(void) { ! DEBUG(post("linuxmouse_setup");); ! linuxmouse_class = class_new(gensym("linuxmouse"), ! (t_newmethod)linuxmouse_new, ! (t_method)linuxmouse_free, ! sizeof(t_linuxmouse), 0, A_DEFSYM, 0); ! ! /* add inlet message methods */ ! class_addmethod(linuxmouse_class,(t_method) linuxmouse_open,gensym("open"),A_DEFSYM,0); ! class_addmethod(linuxmouse_class,(t_method) linuxmouse_close,gensym("close"),0); ! class_addmethod(linuxmouse_class,(t_method) linuxmouse_start,gensym("start"),0); ! class_addmethod(linuxmouse_class,(t_method) linuxmouse_stop,gensym("stop"),0); ! class_addmethod(linuxmouse_class,(t_method) linuxmouse_start,gensym("poll"),0); ! class_addmethod(linuxmouse_class,(t_method) linuxmouse_stop,gensym("nopoll"),0); ! } !

1 0

externals/pdogg/oggwrite~ oggwrite~.c,1.5,1.6
by Hans-Christoph Steiner 22 Oct '04

22 Oct '04

Update of /cvsroot/pure-data/externals/pdogg/oggwrite~ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10689/oggwrite~ Modified Files: oggwrite~.c Log Message: #ifndef'ed malloc.h for MacOS X since the include breaks compilation there Index: oggwrite~.c =================================================================== RCS file: /cvsroot/pure-data/externals/pdogg/oggwrite~/oggwrite~.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** oggwrite~.c 22 May 2004 02:53:13 -0000 1.5 --- oggwrite~.c 22 Oct 2004 02:27:47 -0000 1.6 *************** *** 40,44 **** --- 40,46 ---- #include <fcntl.h> #include <sys/stat.h> + #ifndef __APPLE__ #include <malloc.h> + #endif #include <ctype.h> #include <time.h>

1 0

doc/pddp all_about_data_types.pd,1.2,1.3
by Hans-Christoph Steiner 22 Oct '04

22 Oct '04

Update of /cvsroot/pure-data/doc/pddp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23085 Modified Files: all_about_data_types.pd Log Message: defined atoms; reorged a bit Index: all_about_data_types.pd =================================================================== RCS file: /cvsroot/pure-data/doc/pddp/all_about_data_types.pd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** all_about_data_types.pd 31 May 2004 20:30:51 -0000 1.2 --- all_about_data_types.pd 22 Oct 2004 00:49:35 -0000 1.3 *************** *** 1,39 **** ! #N canvas 106 77 861 642 10; ! #X obj 434 490 route; ! #X obj 213 411 symbol; ! #X obj 153 432 int; ! #X floatatom 91 286 5 0 0 0 - - -; ! #X text 130 286 float; ! #X symbolatom 182 286 10 0 0 0 - - -; ! #X text 263 287 symbol; ! #X obj 271 411 pointer; ! #X obj 519 109 symbol; ! #X symbolatom 519 156 0 0 0 0 - - -; ! #X msg 528 133 word; ! #X msg 519 91 test; ! #X obj 42 414 bang; ! #X obj 42 434 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 ! -1; ! #X text 61 434 aka [bng]; ! #X msg 502 69 symbol this; ! #X text 576 111 casting as a symbol; ! #X text 593 68 set type directly; ! #X text 567 134 does not work (check console messages); ! #X floatatom 432 131 5 0 0 0 - - -; ! #X msg 437 110 12; ! #X msg 420 90 float 83; ! #X obj 18 556 int; ! #X obj 26 536 / 5.23; ! #X floatatom 26 508 5 0 0 0 - - -; ! #X floatatom 59 576 5 0 0 0 - - -; ! #X floatatom 18 576 5 0 0 0 - - -; ! #X text 5 308 casting and storage objects:; ! #X obj 153 412 float; ! #X text 5 326 There a number of objects which are used for storing ! messages \, or casting messages as a specific data type \, sometimes ! converting from one data type to another. The right inlet on these ! objects is stores that value \, which can be later output using a bang. ! ; ! #N canvas 770 126 478 328 Related_Objects 0; #X obj 32 54 ftos; #X obj 68 54 list2symbol; --- 1,20 ---- ! #N canvas 310 87 865 646 10; ! #X obj 462 499 route; ! #X floatatom 102 114 5 0 0 0 - - -; ! #X text 141 114 float; ! #X symbolatom 193 114 10 0 0 0 - - -; ! #X text 274 115 symbol; ! #X obj 105 210 symbol; ! #X symbolatom 105 257 0 0 0 0 - - -; ! #X msg 114 234 word; ! #X msg 105 192 test; ! #X msg 88 170 symbol this; ! #X text 162 212 casting as a symbol; ! #X text 179 169 set type directly; ! #X text 153 235 does not work (check console messages); ! #X floatatom 24 232 5 0 0 0 - - -; ! #X msg 29 211 12; ! #X msg 12 191 float 83; ! #N canvas 770 126 482 332 Related_Objects 0; #X obj 32 54 ftos; #X obj 68 54 list2symbol; *************** *** 51,128 **** #X obj 247 138 l2s; #X obj 247 158 s2l; ! #X restore 678 536 pd Related_Objects; ! #X text 10 240 Data types are known as 'atoms' in Pd. float and symbol ! atoms have 'atom boxes'for realtime display and control from within ! a patch.; ! #X obj 404 19 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; ! #X obj 404 594 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; ! #X text 411 239 Many objects cast the data they receive when they output it:; ! #X text 530 336 Some objects do not cast the data:; ! #X obj 428 307 trigger anything; ! #X msg 428 282 this is a list without a cast; ! #X obj 428 330 print; ! #X text 414 380 Some objects need to have the data explicitly declared in order to handle it. These are mostly symbol handling objects.; ! #X text 414 447 Objects which route data generally can handle explicitly or implicitly defined data.; ! #X obj 480 490 trigger; ! #X obj 538 490 niagara; ! #X obj 430 423 select; ! #X text 411 41 symbols need to be declared explicitly \, floats do ! not \, but can be:; ! #X obj 213 434 lister; #X obj 4 -3 cnv 15 850 20 empty empty all_about_data_types 20 10 1 18 -233017 -66577 0; #X obj 820 -2 pddp; #X text 17 604 by Hans-Christoph Steiner <hans(a)at.or.at>; ! #X text 12 81 the "anything" data type allows anything to pass through unchanged.; ! #X text 17 470 examples of casting:; ! #X text 424 517 click on these for more info:; #X text 629 606 updated for Pd version 0.37.1; ! #X text 82 49 anything bang float list pointer scalar symbol; ! #X text 6 34 data types (atoms):; ! #X text 0 68 "anything"; ! #X text 0 184 "list"; ! #X text 0 170 "float"; ! #X text 0 211 "symbol"; ! #X text 0 197 "scalar"; ! #X text 0 157 "bang"; ! #X msg 100 105 anything 1 two three; ! #X msg 251 105 one 2 3; ! #X obj 156 188 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; ! #X obj 160 162 t a b f l p s; ! #X obj 190 189 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; ! #X msg 253 139 list one 2 3; ! #X msg 292 169 1 2 3; ! #X obj 108 506 tosymbol; ! #X obj 172 507 fromsymbol; ! #X obj 255 506 list2symbol; ! #X obj 259 548 ftos; ! #X obj 425 537 all_about_lists_vs_anythings; ! #X obj 424 564 all_about_symbol_construction; ! #X obj 640 564 all_about_data_structures; ! #X connect 8 0 9 0; ! #X connect 10 0 9 0; ! #X connect 11 0 8 0; ! #X connect 15 0 9 0; ! #X connect 20 0 19 0; ! #X connect 21 0 19 0; ! #X connect 22 0 26 0; ! #X connect 23 0 22 0; ! #X connect 23 0 25 0; ! #X connect 24 0 23 0; ! #X connect 32 0 33 0; ! #X connect 36 0 38 0; ! #X connect 37 0 36 0; ! #X connect 61 0 64 0; ! #X connect 62 0 64 0; ! #X connect 64 0 63 0; ! #X connect 64 3 65 0; ! #X connect 66 0 64 0; ! #X connect 67 0 64 0; --- 32,132 ---- #X obj 247 138 l2s; #X obj 247 158 s2l; ! #X restore 706 549 pd Related_Objects; ! #X obj 419 19 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; ! #X obj 419 594 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; ! #X text 436 255 Many objects cast the data they receive when they output it:; ! #X text 555 336 Some objects do not cast the data:; ! #X obj 453 307 trigger anything; ! #X msg 453 282 this is a list without a cast; ! #X obj 453 330 print; ! #X text 439 390 Some objects need to have the data explicitly declared in order to handle it. These are mostly symbol handling objects.; ! #X text 439 466 Objects which route data generally can handle explicitly or implicitly defined data.; ! #X obj 509 499 trigger; ! #X obj 567 499 niagara; ! #X obj 455 433 select; ! #X text 3 142 symbols need to be declared explicitly \, floats do not ! \, but can be:; #X obj 4 -3 cnv 15 850 20 empty empty all_about_data_types 20 10 1 18 -233017 -66577 0; #X obj 820 -2 pddp; #X text 17 604 by Hans-Christoph Steiner <hans(a)at.or.at>; ! #X text 12 303 the "anything" data type allows anything to pass through unchanged.; ! #X text 441 530 click on these for more info:; #X text 629 606 updated for Pd version 0.37.1; ! #X text 0 290 "anything"; ! #X text 0 406 "list"; ! #X text 0 392 "float"; ! #X text 0 433 "symbol"; ! #X text 0 419 "scalar"; ! #X text 0 379 "bang"; ! #X msg 100 327 anything 1 two three; ! #X msg 251 327 one 2 3; ! #X obj 156 410 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; ! #X obj 160 384 t a b f l p s; ! #X obj 190 411 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; ! #X msg 253 361 list one 2 3; ! #X msg 292 391 1 2 3; ! #X obj 453 550 all_about_lists_vs_anythings; ! #X obj 452 571 all_about_symbol_construction; ! #X obj 668 571 all_about_data_structures; ! #X text 206 34 float symbol pointer; ! #X text 6 34 atoms (basic data types):; ! #X text 6 59 The basic data types are known as 'atoms' in Pd. "float" ! and "symbol" atoms have 'atom boxes' for realtime display and control ! from within a patch. "pointer" atoms are used for accessing data stored ! in graphical data structures.; ! #X obj 450 207 int; ! #X obj 458 187 / 5.23; ! #X floatatom 458 159 5 0 0 0 - - -; ! #X floatatom 491 227 5 0 0 0 - - -; ! #X floatatom 450 227 5 0 0 0 - - -; ! #X text 439 137 examples of casting:; ! #X obj 540 157 tosymbol; ! #X obj 604 158 fromsymbol; ! #X obj 687 157 list2symbol; ! #X obj 691 199 ftos; ! #X obj 646 42 symbol; ! #X obj 613 85 int; ! #X obj 728 42 pointer; ! #X obj 473 85 bang; ! #X obj 511 86 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 ! -1; ! #X text 528 86 aka [bng]; ! #X text 10 508 casting and storage objects:; ! #X obj 528 42 float; ! #X text 10 526 There a number of objects which are used for storing ! messages \, or casting messages as a specific data type \, sometimes ! converting from one data type to another. The right inlet on these ! objects is stores that value \, which can be later output using a bang. ! ; ! #X obj 641 85 lister; ! #X text 464 42 atoms:; ! #X text 569 43 aka; ! #X obj 595 42 f; ! #X connect 5 0 6 0; ! #X connect 7 0 6 0; ! #X connect 8 0 5 0; ! #X connect 9 0 6 0; ! #X connect 14 0 13 0; ! #X connect 15 0 13 0; ! #X connect 17 0 18 0; ! #X connect 21 0 23 0; ! #X connect 22 0 21 0; ! #X connect 42 0 45 0; ! #X connect 43 0 45 0; ! #X connect 45 0 44 0; ! #X connect 45 3 46 0; ! #X connect 47 0 45 0; ! #X connect 48 0 45 0; ! #X connect 55 0 59 0; ! #X connect 56 0 55 0; ! #X connect 56 0 58 0; ! #X connect 57 0 56 0;

1 0

pd/src m_memory.c,1.1.1.2.2.6,1.1.1.2.2.7
by Tim Blechmann 21 Oct '04

21 Oct '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20836 Modified Files: Tag: devel_0_37 m_memory.c Log Message: copyalignedbytes Index: m_memory.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_memory.c,v retrieving revision 1.1.1.2.2.6 retrieving revision 1.1.1.2.2.7 diff -C2 -d -r1.1.1.2.2.6 -r1.1.1.2.2.7 *** m_memory.c 20 Oct 2004 21:28:16 -0000 1.1.1.2.2.6 --- m_memory.c 21 Oct 2004 08:19:03 -0000 1.1.1.2.2.7 *************** *** 145,152 **** /* TB: copy to aligned vector memory */ ! void *copybytes(void *src, size_t nbytes) { void *ret; ! ret = getbytes(nbytes); if (nbytes) memcpy(ret, src, nbytes); --- 145,152 ---- /* TB: copy to aligned vector memory */ ! void *copyalignedbytes(void *src, size_t nbytes) { void *ret; ! ret = getalignedbytes(nbytes); if (nbytes) memcpy(ret, src, nbytes);

1 0

pd/src s_inter.c,1.1.1.3.2.19,1.1.1.3.2.20
by Tim Blechmann 21 Oct '04

21 Oct '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19201 Modified Files: Tag: devel_0_37 s_inter.c Log Message: tweaking memlock Index: s_inter.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v retrieving revision 1.1.1.3.2.19 retrieving revision 1.1.1.3.2.20 diff -C2 -d -r1.1.1.3.2.19 -r1.1.1.3.2.20 *** s_inter.c 20 Oct 2004 10:44:59 -0000 1.1.1.3.2.19 --- s_inter.c 21 Oct 2004 08:12:13 -0000 1.1.1.3.2.20 *************** *** 675,678 **** --- 675,682 ---- #endif + #ifdef _POSIX_MEMLOCK + #include <sys/resource.h> + #endif + void sys_set_priority(int higher) { *************** *** 693,696 **** --- 697,706 ---- #ifdef _POSIX_MEMLOCK + /* tb: force memlock to physical memory */ + struct rlimit mlock_limit; + mlock_limit.rlim_cur=0; + mlock_limit.rlim_max=0; + setrlimit(RLIMIT_MEMLOCK,&mlock_limit); + /* } tb */ if (mlockall(MCL_FUTURE) != -1) fprintf(stderr, "memory locking enabled.\n"); *************** *** 909,913 **** "TCL_LIBRARY=\"%s/tcl/library\" TK_LIBRARY=\"%s/tk/library\" \ \"%s/pd-gui\" %d\n", ! sys_libdir->s_name, sys_libdir->s_name, guidir, portno); #endif sys_guicmd = cmdbuf; --- 919,923 ---- "TCL_LIBRARY=\"%s/tcl/library\" TK_LIBRARY=\"%s/tk/library\" \ \"%s/pd-gui\" %d\n", ! sys_libdir->s_name, sys_libdir->s_name, guidir,portno); #endif sys_guicmd = cmdbuf;

1 0

pd/src m_memory.c,1.1.1.2.2.5,1.1.1.2.2.6 d_soundfile.c,1.1.1.2.2.25,1.1.1.2.2.26
by Tim Blechmann 20 Oct '04

20 Oct '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14096 Modified Files: Tag: devel_0_37 m_memory.c d_soundfile.c Log Message: added copyalignedbytes Index: m_memory.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_memory.c,v retrieving revision 1.1.1.2.2.5 retrieving revision 1.1.1.2.2.6 diff -C2 -d -r1.1.1.2.2.5 -r1.1.1.2.2.6 *** m_memory.c 10 Oct 2004 22:01:40 -0000 1.1.1.2.2.5 --- m_memory.c 20 Oct 2004 21:28:16 -0000 1.1.1.2.2.6 *************** *** 11,14 **** --- 11,23 ---- #include "m_simd.h" + /* T.Grill - bit alignment for signal vectors (must be a multiple of 8!) */ + /* if undefined no alignment occurs */ + #ifdef SIMD_BYTEALIGN + #define VECTORALIGNMENT (SIMD_BYTEALIGN*8) + #else + #define VECTORALIGNMENT 128 + #endif + + /* #define LOUD */ #ifdef LOUD *************** *** 27,31 **** ret = (void *)calloc(nbytes, 1); #ifdef LOUD ! fprintf(stderr, "new %x %d\n", (int)ret, nbytes); #endif /* LOUD */ #ifdef DEBUGMEM --- 36,40 ---- ret = (void *)calloc(nbytes, 1); #ifdef LOUD ! fprintf(stderr, "new %p %d\n", ret, nbytes); #endif /* LOUD */ #ifdef DEBUGMEM *************** *** 75,79 **** nbytes = 1; #ifdef LOUD ! fprintf(stderr, "free %x %d\n", (int)fatso, nbytes); #endif /* LOUD */ #ifdef DEBUGMEM --- 84,88 ---- nbytes = 1; #ifdef LOUD ! fprintf(stderr, "free %p %d\n",fatso, nbytes); #endif /* LOUD */ #ifdef DEBUGMEM *************** *** 92,99 **** */ void *vec = getbytes(nbytes+ (VECTORALIGNMENT/8-1)+sizeof(void *)); ! t_int alignment = ((t_int)vec+sizeof(void *))&(VECTORALIGNMENT/8-1); /* get alignment of first possible signal vector byte */ ! void *ret = (unsigned char *)vec+sizeof(void *)+(alignment == 0?0:VECTORALIGNMENT/8-alignment); /* calculate aligned pointer */ ! *(void **)((unsigned char *)ret-sizeof(void *)) = vec; /* save original memory location */ ! return ret; } --- 101,123 ---- */ void *vec = getbytes(nbytes+ (VECTORALIGNMENT/8-1)+sizeof(void *)); ! ! #ifdef LOUD ! fprintf(stderr, "getaligned %p %d\n",vec, nbytes); ! #endif /* LOUD */ ! ! if (vec != NULL) ! { ! t_int alignment = ((t_int)vec+sizeof(void *))&(VECTORALIGNMENT/8-1); /* get alignment of first possible signal vector byte */ ! void *ret = (unsigned char *)vec+sizeof(void *)+(alignment == 0?0:VECTORALIGNMENT/8-alignment); /* calculate aligned pointer */ ! *(void **)((unsigned char *)ret-sizeof(void *)) = vec; /* save original memory location */ ! ! #ifdef LOUD ! fprintf(stderr, " %p\n",ret); ! #endif /* LOUD */ ! return ret; ! } ! else ! return 0; ! } *************** *** 102,105 **** --- 126,133 ---- { void *ori = *(void **)((unsigned char *)ptr-sizeof(void *)); /* get original memory location */ + + #ifdef LOUD + fprintf(stderr, "freealigned %p %p %d\n",ptr, ori, nbytes); + #endif /* LOUD */ freebytes(ori,nbytes+(VECTORALIGNMENT/8-1)+sizeof(void *)); } *************** *** 116,119 **** --- 144,157 ---- } + /* TB: copy to aligned vector memory */ + void *copybytes(void *src, size_t nbytes) + { + void *ret; + ret = getbytes(nbytes); + if (nbytes) + memcpy(ret, src, nbytes); + return (ret); + } + #ifdef DEBUGMEM #include <stdio.h> Index: d_soundfile.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/d_soundfile.c,v retrieving revision 1.1.1.2.2.25 retrieving revision 1.1.1.2.2.26 diff -C2 -d -r1.1.1.2.2.25 -r1.1.1.2.2.26 *** d_soundfile.c 9 Oct 2004 00:11:56 -0000 1.1.1.2.2.25 --- d_soundfile.c 20 Oct 2004 21:28:16 -0000 1.1.1.2.2.26 *************** *** 1245,1259 **** static void soundfiler_t_read(t_soundfiler *x, t_symbol *s, ! int argc, t_atom *argv) { int headersize = -1, channels = 0, bytespersamp = 0, bigendian = 0, ! resize = 0, i, j; long skipframes = 0, ! nframes = 0, ! finalsize = 0, /* new size */ ! itemsleft, maxsize = DEFMAXSIZE, ! itemsread = 0, ! bytelimit = 0x7fffffff; int fd = -1; char endianness, *filename; --- 1245,1259 ---- static void soundfiler_t_read(t_soundfiler *x, t_symbol *s, ! int argc, t_atom *argv) { int headersize = -1, channels = 0, bytespersamp = 0, bigendian = 0, ! resize = 0, i, j; long skipframes = 0, ! nframes = 0, ! finalsize = 0, /* new size */ ! itemsleft, maxsize = DEFMAXSIZE, ! itemsread = 0, ! bytelimit = 0x7fffffff; int fd = -1; char endianness, *filename; *************** *** 1267,1324 **** while (argc > 0 && argv->a_type == A_SYMBOL && ! *argv->a_w.w_symbol->s_name == '-') { char *flag = argv->a_w.w_symbol->s_name + 1; ! if (!strcmp(flag, "skip")) ! { ! if (argc < 2 || argv[1].a_type != A_FLOAT || ! ((skipframes = argv[1].a_w.w_float) < 0)) goto usage; ! argc -= 2; argv += 2; ! } ! else if (!strcmp(flag, "nframes")) ! { ! if (argc < 2 || argv[1].a_type != A_FLOAT || ! ((nframes = argv[1].a_w.w_float) < 0)) goto usage; ! argc -= 2; argv += 2; ! } ! else if (!strcmp(flag, "raw")) ! { ! if (argc < 5 || ! argv[1].a_type != A_FLOAT || ! ((headersize = argv[1].a_w.w_float) < 0) || ! argv[2].a_type != A_FLOAT || ! ((channels = argv[2].a_w.w_float) < 1) || ! (channels > MAXSFCHANS) || ! argv[3].a_type != A_FLOAT || ! ((bytespersamp = argv[3].a_w.w_float) < 2) || ! (bytespersamp > 4) || ! argv[4].a_type != A_SYMBOL || ! ((endianness = argv[4].a_w.w_symbol->s_name[0]) != 'b' ! && endianness != 'l' && endianness != 'n')) ! goto usage; ! if (endianness == 'b') ! bigendian = 1; ! else if (endianness == 'l') ! bigendian = 0; ! else ! bigendian = garray_ambigendian(); ! argc -= 5; argv += 5; ! } ! else if (!strcmp(flag, "resize")) ! { ! resize = 1; ! argc -= 1; argv += 1; ! } ! else if (!strcmp(flag, "maxsize")) ! { ! if (argc < 2 || argv[1].a_type != A_FLOAT || ! ((maxsize = argv[1].a_w.w_float) < 0)) goto usage; ! resize = 1; /* maxsize implies resize. */ ! argc -= 2; argv += 2; ! } ! else goto usage; } if (argc < 2 || argc > MAXSFCHANS + 1 || argv[0].a_type != A_SYMBOL) --- 1267,1324 ---- while (argc > 0 && argv->a_type == A_SYMBOL && ! *argv->a_w.w_symbol->s_name == '-') { char *flag = argv->a_w.w_symbol->s_name + 1; ! if (!strcmp(flag, "skip")) ! { ! if (argc < 2 || argv[1].a_type != A_FLOAT || ! ((skipframes = argv[1].a_w.w_float) < 0)) goto usage; ! argc -= 2; argv += 2; ! } ! else if (!strcmp(flag, "nframes")) ! { ! if (argc < 2 || argv[1].a_type != A_FLOAT || ! ((nframes = argv[1].a_w.w_float) < 0)) goto usage; ! argc -= 2; argv += 2; ! } ! else if (!strcmp(flag, "raw")) ! { ! if (argc < 5 || ! argv[1].a_type != A_FLOAT || ! ((headersize = argv[1].a_w.w_float) < 0) || ! argv[2].a_type != A_FLOAT || ! ((channels = argv[2].a_w.w_float) < 1) || ! (channels > MAXSFCHANS) || ! argv[3].a_type != A_FLOAT || ! ((bytespersamp = argv[3].a_w.w_float) < 2) || ! (bytespersamp > 4) || ! argv[4].a_type != A_SYMBOL || ! ((endianness = argv[4].a_w.w_symbol->s_name[0]) != 'b' ! && endianness != 'l' && endianness != 'n')) ! goto usage; ! if (endianness == 'b') ! bigendian = 1; ! else if (endianness == 'l') ! bigendian = 0; ! else ! bigendian = garray_ambigendian(); ! argc -= 5; argv += 5; ! } ! else if (!strcmp(flag, "resize")) ! { ! resize = 1; ! argc -= 1; argv += 1; ! } ! else if (!strcmp(flag, "maxsize")) ! { ! if (argc < 2 || argv[1].a_type != A_FLOAT || ! ((maxsize = argv[1].a_w.w_float) < 0)) goto usage; ! resize = 1; /* maxsize implies resize. */ ! argc -= 2; argv += 2; ! } ! else goto usage; } if (argc < 2 || argc > MAXSFCHANS + 1 || argv[0].a_type != A_SYMBOL) *************** *** 1330,1358 **** { if (argv[i].a_type != A_SYMBOL) ! goto usage; ! if (!(garrays[i] = ! (t_garray *)pd_findbyclass(argv[i].a_w.w_symbol, garray_class))) ! { ! pd_error(x, "%s: no such table", argv[i].a_w.w_symbol->s_name); ! goto done; ! } else if (!garray_getfloatarray(garrays[i], &vecsize[i], &vecs[i])) error("%s: bad template for tabwrite", ! argv[i].a_w.w_symbol->s_name); if (finalsize && finalsize != vecsize[i] && !resize) ! { ! post("soundfiler_read: arrays have different lengths; resizing..."); ! resize = 1; ! } ! finalsize = vecsize[i]; } fd = open_soundfile(canvas_getdir(x->x_canvas)->s_name, filename, ! headersize, &bytespersamp, &bigendian, &channels, &bytelimit, ! skipframes); if (fd < 0) { ! pd_error(x, "soundfiler_read: %s: %s", filename, (errno == EIO ? ! "unknown or bad header format" : strerror(errno))); goto done; } --- 1330,1358 ---- { if (argv[i].a_type != A_SYMBOL) ! goto usage; ! if (!(garrays[i] = ! (t_garray *)pd_findbyclass(argv[i].a_w.w_symbol, garray_class))) ! { ! pd_error(x, "%s: no such table", argv[i].a_w.w_symbol->s_name); ! goto done; ! } else if (!garray_getfloatarray(garrays[i], &vecsize[i], &vecs[i])) error("%s: bad template for tabwrite", ! argv[i].a_w.w_symbol->s_name); if (finalsize && finalsize != vecsize[i] && !resize) ! { ! post("soundfiler_read: arrays have different lengths; resizing..."); ! resize = 1; ! } ! finalsize = vecsize[i]; } fd = open_soundfile(canvas_getdir(x->x_canvas)->s_name, filename, ! headersize, &bytespersamp, &bigendian, &channels, &bytelimit, ! skipframes); if (fd < 0) { ! pd_error(x, "soundfiler_read: %s: %s", filename, (errno == EIO ? ! "unknown or bad header format" : strerror(errno))); goto done; } *************** *** 1360,1383 **** if (resize) { ! /* figure out what to resize to */ long poswas, eofis, framesinfile; ! poswas = lseek(fd, 0, SEEK_CUR); ! eofis = lseek(fd, 0, SEEK_END); ! if (poswas < 0 || eofis < 0) ! { ! pd_error(x, "lseek failed"); ! goto done; ! } ! lseek(fd, poswas, SEEK_SET); ! framesinfile = (eofis - poswas) / (channels * bytespersamp); ! if (framesinfile > maxsize) ! { ! pd_error(x, "soundfiler_read: truncated to %d elements", maxsize); ! framesinfile = maxsize; ! } if (framesinfile > bytelimit / (channels * bytespersamp)) framesinfile = bytelimit / (channels * bytespersamp); ! finalsize = framesinfile; } --- 1360,1383 ---- if (resize) { ! /* figure out what to resize to */ long poswas, eofis, framesinfile; ! poswas = lseek(fd, 0, SEEK_CUR); ! eofis = lseek(fd, 0, SEEK_END); ! if (poswas < 0 || eofis < 0) ! { ! pd_error(x, "lseek failed"); ! goto done; ! } ! lseek(fd, poswas, SEEK_SET); ! framesinfile = (eofis - poswas) / (channels * bytespersamp); ! if (framesinfile > maxsize) ! { ! pd_error(x, "soundfiler_read: truncated to %d elements", maxsize); ! framesinfile = maxsize; ! } if (framesinfile > bytelimit / (channels * bytespersamp)) framesinfile = bytelimit / (channels * bytespersamp); ! finalsize = framesinfile; } *************** *** 1392,1516 **** post("channels: %d", channels); #endif ! ! /* allocate memory for new array */ ! if (resize) ! for (i = 0; i < argc; i++) ! { ! #ifdef SFDEBUG ! post("allocating buffer %d",i); ! #endif #ifdef _POSIX_MEMLOCK ! munlockall(); #endif ! nvecs[i]=getalignedbytes (finalsize * sizeof(t_float)); ! #ifdef _POSIX_MEMLOCK ! mlockall(MCL_FUTURE); #endif ! /* if we are out of memory, free it again and quit */ ! if (nvecs[i]==0) ! { ! pd_error(x, "resize failed"); ! for (j=0; j!=i;++j) ! /* if the resizing fails, we'll have to free all arrays again */ ! freealignedbytes (nvecs[i],finalsize * sizeof(t_float)); ! goto done; ! } ! /* zero samples */ ! if(i > channels) ! { ! memset(nvecs[i],0,vecsize[i] * sizeof(t_float)); ! } } ! else for (i = 0; i < argc; i++) { ! #ifdef _POSIX_MEMLOCK ! munlockall(); ! #endif ! nvecs[i] = getalignedbytes (vecsize[i] * sizeof(t_float)); ! #ifdef _POSIX_MEMLOCK ! mlockall(MCL_FUTURE); ! #endif ! /* if we are out of memory, free it again and quit */ ! if (nvecs[i]==0) ! { ! pd_error(x, "resize failed"); ! for (j=0; j!=i;++j) ! /* if the resizing fails, we'll have to free all arrays again */ ! freealignedbytes (nvecs[i],vecsize[i] * sizeof(t_float)); ! goto done; ! } ! /* zero samples */ ! if(i > channels) ! memset(nvecs[i],0,vecsize[i] * sizeof(t_float)); } ! for (itemsread = 0; itemsread < finalsize; ) ! { ! int thisread = finalsize - itemsread; ! thisread = (thisread > bufframes ? bufframes : thisread); ! nitems = fread(sampbuf, channels * bytespersamp, thisread, fp); ! if (nitems <= 0) break; ! soundfile_xferin(channels, argc, nvecs, itemsread, ! (unsigned char *)sampbuf, nitems, bytespersamp, bigendian); ! itemsread += nitems; ! } ! ! /* zero out remaining elements of vectors */ ! for (i = 0; i < argc; i++) ! { ! for (j = itemsread; j < finalsize; j++) ! nvecs[i][j] = 0; ! } ! ! /* lock the system and reset the garrays */ ! sys_lock(); ! for (i = 0; i < argc; i++) ! { #ifdef GARRAY_THREAD_LOCK ! garray_lock(garrays[i]); #endif ! garrays[i]->x_array.a_vec = (char *) nvecs[i]; ! garrays[i]->x_array.a_n = finalsize; #ifdef GARRAY_THREAD_LOCK ! garray_unlock(garrays[i]); #endif ! if (garrays[i]->x_usedindsp) canvas_update_dsp(); ! } ! sys_unlock(); ! /* do all graphics updates */ ! for (i = 0; i < argc; i++) ! { ! t_glist *gl; ! int n = finalsize; ! /* if this is the only array in the graph, ! reset the graph's coordinates */ ! gl = garrays[i]->x_glist; ! if (gl->gl_list == &garrays[i]->x_gobj && !garrays[i]->x_gobj.g_next) { ! vmess(&gl->gl_pd, gensym("bounds"), "ffff", ! 0., gl->gl_y1, (double)(n > 1 ? n-1 : 1), gl->gl_y2); ! /* close any dialogs that might have the wrong info now... */ ! gfxstub_deleteforkey(gl); ! } ! else garray_redraw(garrays[i]); ! } end: ! /* free the old arrays */ ! for (i = 0; i < argc; i++) ! freealignedbytes(vecs[i], vecsize[i] * sizeof(t_float)); fclose(fp); fd = -1; goto done; ! usage: pd_error(x, "usage: read [flags] filename tablename..."); post("flags: -skip <n> -nframes <n> -resize -maxsize <n> ..."); post("-raw <headerbytes> <channels> <bytespersamp> <endian (b, l, or n)>."); ! done: if (fd >= 0) close (fd); sys_lock(); outlet_float(x->x_obj.ob_outlet, (float)itemsread); --- 1392,1511 ---- post("channels: %d", channels); #endif ! #ifdef _POSIX_MEMLOCK ! munlockall(); #endif ! ! /* allocate memory for new array */ ! if (resize) ! for (i = 0; i < argc; i++) ! { ! #ifdef SFDEBUG ! post("allocating buffer %d",i); #endif ! nvecs[i]=getalignedbytes (finalsize * sizeof(t_float)); ! /* if we are out of memory, free it again and quit */ ! if (nvecs[i]==0) ! { ! pd_error(x, "resize failed"); ! for (j=0; j!=i;++j) ! /* if the resizing fails, we'll have to free all arrays again */ ! freealignedbytes (nvecs[i],finalsize * sizeof(t_float)); ! goto done; ! } ! /* zero samples */ ! if(i > channels) ! { ! memset(nvecs[i],0,vecsize[i] * sizeof(t_float)); ! } ! } ! else ! for (i = 0; i < argc; i++) ! { ! nvecs[i] = getalignedbytes (vecsize[i] * sizeof(t_float)); ! /* if we are out of memory, free it again and quit */ ! if (nvecs[i]==0) ! { ! pd_error(x, "resize failed"); ! for (j=0; j!=i;++j) ! /* if the resizing fails, we'll have to free all arrays again */ ! freealignedbytes (nvecs[i],vecsize[i] * sizeof(t_float)); ! goto done; ! } ! /* zero samples */ ! if(i > channels) ! memset(nvecs[i],0,vecsize[i] * sizeof(t_float)); ! } ! ! for (itemsread = 0; itemsread < finalsize; ) ! { ! int thisread = finalsize - itemsread; ! thisread = (thisread > bufframes ? bufframes : thisread); ! nitems = fread(sampbuf, channels * bytespersamp, thisread, fp); ! if (nitems <= 0) break; ! soundfile_xferin(channels, argc, nvecs, itemsread, ! (unsigned char *)sampbuf, nitems, bytespersamp, bigendian); ! itemsread += nitems; } ! ! /* zero out remaining elements of vectors */ for (i = 0; i < argc; i++) { ! for (j = itemsread; j < finalsize; j++) ! nvecs[i][j] = 0; } ! /* lock the system and reset the garrays */ ! sys_lock(); ! for (i = 0; i < argc; i++) ! { #ifdef GARRAY_THREAD_LOCK ! garray_lock(garrays[i]); #endif ! garrays[i]->x_array.a_vec = (char *) nvecs[i]; ! garrays[i]->x_array.a_n = finalsize; #ifdef GARRAY_THREAD_LOCK ! garray_unlock(garrays[i]); #endif ! if (garrays[i]->x_usedindsp) canvas_update_dsp(); ! } ! sys_unlock(); ! /* do all graphics updates */ ! for (i = 0; i < argc; i++) { ! t_glist *gl; ! int n = finalsize; ! /* if this is the only array in the graph, ! reset the graph's coordinates */ ! gl = garrays[i]->x_glist; ! if (gl->gl_list == &garrays[i]->x_gobj && !garrays[i]->x_gobj.g_next) ! { ! vmess(&gl->gl_pd, gensym("bounds"), "ffff", ! 0., gl->gl_y1, (double)(n > 1 ? n-1 : 1), gl->gl_y2); ! /* close any dialogs that might have the wrong info now... */ ! gfxstub_deleteforkey(gl); ! } ! else garray_redraw(garrays[i]); ! } end: ! /* free the old arrays */ ! for (i = 0; i < argc; i++) ! freealignedbytes(vecs[i], vecsize[i] * sizeof(t_float)); fclose(fp); fd = -1; goto done; ! usage: pd_error(x, "usage: read [flags] filename tablename..."); post("flags: -skip <n> -nframes <n> -resize -maxsize <n> ..."); post("-raw <headerbytes> <channels> <bytespersamp> <endian (b, l, or n)>."); ! done: if (fd >= 0) close (fd); + #ifdef _POSIX_MEMLOCK + mlockall(MCL_FUTURE); + #endif sys_lock(); outlet_float(x->x_obj.ob_outlet, (float)itemsread); *************** *** 1658,1662 **** */ static void soundfiler_t_resize(t_soundfiler *y, t_symbol *s, ! int argc, t_atom *argv) { int was, elemsize; /* array contains was elements of size elemsize */ --- 1653,1657 ---- */ static void soundfiler_t_resize(t_soundfiler *y, t_symbol *s, ! int argc, t_atom *argv) { int was, elemsize; /* array contains was elements of size elemsize */ *************** *** 1671,1680 **** if (!(x)) { ! pd_error(y, "%s: no such table", argv[0].a_w.w_symbol->s_name); ! goto usage; } - - vec = (t_float*) x->x_array.a_vec; was = x->x_array.a_n; --- 1666,1673 ---- if (!(x)) { ! pd_error(y, "%s: no such table", argv[0].a_w.w_symbol->s_name); ! goto usage; } vec = (t_float*) x->x_array.a_vec; was = x->x_array.a_n; *************** *** 1682,1729 **** if ((argv+1)->a_type == A_FLOAT) { ! n = (int) (argv+1)->a_w.w_float; } else { ! goto usage; } if (n == was) { ! return; } if (n < 1) n = 1; elemsize = template_findbyname(x->x_array.a_templatesym)->t_n * sizeof(t_word); ! ! if (was > n) ! { ! #ifdef _POSIX_MEMLOCK ! munlockall(); ! #endif ! nvec = copybytes(x->x_array.a_vec, was * elemsize); #ifdef _POSIX_MEMLOCK ! mlockall(MCL_FUTURE); #endif } else { ! #ifdef _POSIX_MEMLOCK ! munlockall(); ! #endif ! nvec = getalignedbytes(n * elemsize); ! #ifdef _POSIX_MEMLOCK ! mlockall(MCL_FUTURE); ! #endif ! memcpy (nvec, x->x_array.a_vec, was * elemsize); ! /* LATER should check t_resizebytes result */ ! memset(nvec + was*elemsize, ! 0, (n - was) * elemsize); } if (!nvec) { pd_error(x, "array resize failed: out of memory"); ! return; } --- 1675,1716 ---- if ((argv+1)->a_type == A_FLOAT) { ! n = (int) (argv+1)->a_w.w_float; } else { ! goto usage; } if (n == was) { ! return; } if (n < 1) n = 1; elemsize = template_findbyname(x->x_array.a_templatesym)->t_n * sizeof(t_word); ! #ifdef _POSIX_MEMLOCK ! munlockall(); #endif + if (was > n) + { + nvec = copyalignedbytes(x->x_array.a_vec, was * elemsize); } else { ! nvec = getalignedbytes(n * elemsize); ! memcpy (nvec, x->x_array.a_vec, was * elemsize); ! /* LATER should check t_resizebytes result */ ! memset(nvec + was*elemsize, ! 0, (n - was) * elemsize); } if (!nvec) { pd_error(x, "array resize failed: out of memory"); ! #ifdef _POSIX_MEMLOCK ! mlockall(MCL_FUTURE); ! #endif ! return; } *************** *** 1743,1754 **** ! /* if this is the only array in the graph, ! reset the graph's coordinates */ gl = x->x_glist; if (gl->gl_list == &x->x_gobj && !x->x_gobj.g_next) { vmess(&gl->gl_pd, gensym("bounds"), "ffff", ! 0., gl->gl_y1, (double)(n > 1 ? n-1 : 1), gl->gl_y2); ! /* close any dialogs that might have the wrong info now... */ gfxstub_deleteforkey(gl); } --- 1730,1741 ---- ! /* if this is the only array in the graph, ! reset the graph's coordinates */ gl = x->x_glist; if (gl->gl_list == &x->x_gobj && !x->x_gobj.g_next) { vmess(&gl->gl_pd, gensym("bounds"), "ffff", ! 0., gl->gl_y1, (double)(n > 1 ? n-1 : 1), gl->gl_y2); ! /* close any dialogs that might have the wrong info now... */ gfxstub_deleteforkey(gl); } *************** *** 1756,1759 **** --- 1743,1749 ---- freealignedbytes (vec, was * elemsize); + #ifdef _POSIX_MEMLOCK + mlockall(MCL_FUTURE); + #endif sys_lock(); outlet_float(y->x_obj.ob_outlet, (float)atom_getintarg(1,argc,argv)); *************** *** 1761,1765 **** return; ! usage: pd_error(x, "usage: resize tablename size"); } --- 1751,1755 ---- return; ! usage: pd_error(x, "usage: resize tablename size"); } *************** *** 1776,1784 **** ! /* TB: soundfiler_t_const ... ! usage: const table value ! */ static void soundfiler_t_const(t_soundfiler *y, t_symbol *s, ! int argc, t_atom *argv) { int size, elemsize; /* array contains was elements of size elemsize */ --- 1766,1774 ---- ! /* TB: soundfiler_t_const ... ! usage: const table value ! */ static void soundfiler_t_const(t_soundfiler *y, t_symbol *s, ! int argc, t_atom *argv) { int size, elemsize; /* array contains was elements of size elemsize */ *************** *** 1794,1799 **** if (!(x)) { ! pd_error(y, "%s: no such table", argv[0].a_w.w_symbol->s_name); ! goto usage; } --- 1784,1789 ---- if (!(x)) { ! pd_error(y, "%s: no such table", argv[0].a_w.w_symbol->s_name); ! goto usage; } *************** *** 1805,1813 **** if ((argv+1)->a_type == A_FLOAT) { ! val = (int) (argv+1)->a_w.w_float; } else { ! goto usage; } --- 1795,1803 ---- if ((argv+1)->a_type == A_FLOAT) { ! val = (int) (argv+1)->a_w.w_float; } else { ! goto usage; } *************** *** 1820,1831 **** #endif nvec = getalignedbytes(size * elemsize); - #ifdef _POSIX_MEMLOCK - mlockall(MCL_FUTURE); - #endif if (!nvec) { pd_error(x, "array resize failed: out of memory"); ! return; } --- 1810,1821 ---- #endif nvec = getalignedbytes(size * elemsize); if (!nvec) { pd_error(x, "array resize failed: out of memory"); ! #ifdef _POSIX_MEMLOCK ! mlockall(MCL_FUTURE); ! #endif ! return; } *************** *** 1833,1840 **** for (i=0; i!=size; ++i) { ! nvec[i]=val; } - /* TB: we'll have to be sure that no one is accessing the array */ sys_lock(); --- 1823,1829 ---- for (i=0; i!=size; ++i) { ! nvec[i]=val; } /* TB: we'll have to be sure that no one is accessing the array */ sys_lock(); *************** *** 1850,1861 **** ! /* if this is the only array in the graph, ! reset the graph's coordinates */ gl = x->x_glist; if (gl->gl_list == &x->x_gobj && !x->x_gobj.g_next) { vmess(&gl->gl_pd, gensym("bounds"), "ffff", ! 0., gl->gl_y1, (double)(size > 1 ? size-1 : 1), gl->gl_y2); ! /* close any dialogs that might have the wrong info now... */ gfxstub_deleteforkey(gl); } --- 1839,1850 ---- ! /* if this is the only array in the graph, ! reset the graph's coordinates */ gl = x->x_glist; if (gl->gl_list == &x->x_gobj && !x->x_gobj.g_next) { vmess(&gl->gl_pd, gensym("bounds"), "ffff", ! 0., gl->gl_y1, (double)(size > 1 ? size-1 : 1), gl->gl_y2); ! /* close any dialogs that might have the wrong info now... */ gfxstub_deleteforkey(gl); } *************** *** 1863,1872 **** freealignedbytes (vec, size * elemsize); ! sys_lock(), ! outlet_float(y->x_obj.ob_outlet, size); sys_unlock(); return; ! usage: pd_error(x, "usage: const tablename value"); } --- 1852,1864 ---- freealignedbytes (vec, size * elemsize); ! #ifdef _POSIX_MEMLOCK ! mlockall(MCL_FUTURE); ! #endif ! sys_lock(); ! outlet_float(y->x_obj.ob_outlet, size); sys_unlock(); return; ! usage: pd_error(x, "usage: const tablename value"); }

1 0

pd/src makefile.mingw,1.2.2.3,1.2.2.4 m_pd.h,1.1.1.4.2.23,1.1.1.4.2.24 s_inter.c,1.1.1.3.2.18,1.1.1.3.2.19
by carmen rocco 20 Oct '04

20 Oct '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18120 Modified Files: Tag: devel_0_37 makefile.mingw m_pd.h s_inter.c Log Message: simd-XP Index: s_inter.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v retrieving revision 1.1.1.3.2.18 retrieving revision 1.1.1.3.2.19 diff -C2 -d -r1.1.1.3.2.18 -r1.1.1.3.2.19 *** s_inter.c 8 Oct 2004 17:58:27 -0000 1.1.1.3.2.18 --- s_inter.c 20 Oct 2004 10:44:59 -0000 1.1.1.3.2.19 *************** *** 54,58 **** #ifndef WISHAPP ! #define WISHAPP "wish83.exe" #endif --- 54,58 ---- #ifndef WISHAPP ! #define WISHAPP "wish85.exe" #endif Index: m_pd.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v retrieving revision 1.1.1.4.2.23 retrieving revision 1.1.1.4.2.24 diff -C2 -d -r1.1.1.4.2.23 -r1.1.1.4.2.24 *** m_pd.h 18 Oct 2004 14:04:28 -0000 1.1.1.4.2.23 --- m_pd.h 20 Oct 2004 10:44:58 -0000 1.1.1.4.2.24 *************** *** 29,34 **** #endif /* MSW */ ! /* the external storage class is "extern" in UNIX; in MSW it's ugly. */ ! #ifdef MSW #ifdef PD_INTERNAL #define EXTERN __declspec(dllexport) extern --- 29,34 ---- #endif /* MSW */ ! /* the external storage class is "extern" in GCC; in MS-C it's ugly. */ ! #if defined(MSW) && !defined (__GNUC__) #ifdef PD_INTERNAL #define EXTERN __declspec(dllexport) extern Index: makefile.mingw =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/makefile.mingw,v retrieving revision 1.2.2.3 retrieving revision 1.2.2.4 diff -C2 -d -r1.2.2.3 -r1.2.2.4 *** makefile.mingw 24 Aug 2004 04:15:12 -0000 1.2.2.3 --- makefile.mingw 20 Oct 2004 10:44:58 -0000 1.2.2.4 *************** *** 20,27 **** LIB = -lm ! OPT_CFLAGS = ! WARN_CFLAGS = -Wall -W -Wstrict-prototypes \ -Wno-unused-parameter -Wno-parentheses -Wno-switch ! ARCH_CFLAGS = -DPD -DPD_INTERNAL -DMSW -DUSEAPI_MMIO -DUSEAPI_PORTAUDIO -DDONTUSESIMD CFLAGS += $(ARCH_CFLAGS) $(WARN_CFLAGS) $(OPT_CFLAGS) $(MORECFLAGS) --- 20,27 ---- LIB = -lm ! OPT_CFLAGS = -march=athlon-xp ! WARN_CFLAGS = -Wall -W -Wstrict-prototypes -Wno-unused \ -Wno-unused-parameter -Wno-parentheses -Wno-switch ! ARCH_CFLAGS = -DPD -DPD_INTERNAL -DMSW -DUSEAPI_MMIO -DUSEAPI_PORTAUDIO CFLAGS += $(ARCH_CFLAGS) $(WARN_CFLAGS) $(OPT_CFLAGS) $(MORECFLAGS) *************** *** 49,53 **** d_delay.c d_resample.c x_arithmetic.c x_connective.c x_interface.c \ x_midi.c x_misc.c x_time.c x_acoustics.c x_net.c x_qlist.c x_gui.c \ ! d_soundfile.c g_vslider.c g_vdial.c s_audio_mmio.c s_midi_mmio.c SRSRC = u_pdsend.c u_pdreceive.c --- 49,54 ---- d_delay.c d_resample.c x_arithmetic.c x_connective.c x_interface.c \ x_midi.c x_misc.c x_time.c x_acoustics.c x_net.c x_qlist.c x_gui.c \ ! d_soundfile.c g_vslider.c g_vdial.c s_audio_mmio.c s_midi_mmio.c \ ! m_simd.c m_simd_sse_gcc.c SRSRC = u_pdsend.c u_pdreceive.c

1 0

externals/hcs/hid Makefile,1.2,1.3 hid-help.pd,1.1,1.2 make-arrays-from-input.h.pl,1.2,1.3
by Hans-Christoph Steiner 20 Oct '04

20 Oct '04

Update of /cvsroot/pure-data/externals/hcs/hid In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15171 Modified Files: Makefile hid-help.pd make-arrays-from-input.h.pl Log Message: auto-generated event type/code listings as pd files Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/hid/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile 18 Oct 2004 21:10:48 -0000 1.2 --- Makefile 20 Oct 2004 02:55:12 -0000 1.3 *************** *** 45,51 **** input_arrays: ! ./make-arrays-from-input.h.pl > input_arrays.h ! clean: ; rm -f *.pd_* *.o *~ input_arrays.h --- 45,51 ---- input_arrays: ! ./make-arrays-from-input.h.pl ! clean: ; rm -f *.pd_* *.o *~ input_arrays.h ev*-list.pd Index: hid-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/hid/hid-help.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** hid-help.pd 20 Oct 2004 02:06:08 -0000 1.1 --- hid-help.pd 20 Oct 2004 02:55:12 -0000 1.2 *************** *** 1,37 **** ! #N canvas 282 80 613 460 10; ! #X msg 340 212 ev_rel rel_x 1 1.09824e+09; ! #X obj 340 191 prepend set; ! #X obj 102 357 route rel_x rel_y; ! #X floatatom 102 377 5 0 0 0 - - -; ! #X floatatom 159 377 5 0 0 0 - - -; ! #X obj 180 226 print; ! #X msg 106 48 start; ! #X msg 125 67 stop; ! #X obj 198 155 hid /dev/input/event0; ! #X floatatom 444 331 12 0 0 1 time - -; ! #X obj 351 311 unpack s s f f; ! #X msg 222 52 open /dev/input/event1; ! #X msg 214 29 open /dev/input/event0; ! #X msg 238 74 open /dev/input/event2; ! #X msg 250 95 open /dev/input/event3; ! #X msg 262 115 open /dev/input/event4; ! #X obj 43 292 route ev_key ev_rel ev_abs; ! #X floatatom 161 338 7 0 0 0 - - -; ! #X floatatom 219 338 7 0 0 0 - - -; ! #X obj 161 317 route abs_x abs_y; ! #X obj 44 52 tgl 35 0 empty empty empty 0 -6 0 8 -24198 -1 -1 1 1; ! #X floatatom 413 348 12 0 0 1 value - -; ! #X symbolatom 381 365 10 0 0 1 eventcode - -; ! #X symbolatom 351 384 15 0 0 1 eventtype - -; ! #X floatatom 43 422 5 0 0 0 - - -; ! #X floatatom 118 423 5 0 0 0 - - -; ! #X obj 43 400 route key_f key_leftctrl btn_left; ! #X floatatom 193 423 5 0 0 0 - - -; ! #X obj 11 166 bng 35 250 50 0 empty empty event_received 38 18 1 8 -225280 -1 -1; ! #X obj 2 2 cnv 15 600 20 empty empty "hid" 2 11 1 18 -233017 -66577 ! 0; ! #X text 312 234 outlet message format:; ! #X text 336 248 eventtype eventcode value timestamp; #X connect 1 0 0 0; #X connect 2 0 3 0; --- 1,50 ---- ! #N canvas 124 73 911 579 10; ! #X msg 382 241 ev_rel rel_x 5 1.09824e+09; ! #X obj 382 220 prepend set; ! #X obj 144 386 route rel_x rel_y; ! #X floatatom 144 406 5 0 0 0 - - -; ! #X floatatom 201 406 5 0 0 0 - - -; ! #X obj 222 255 print; ! #X msg 148 77 start; ! #X msg 167 96 stop; ! #X obj 240 184 hid /dev/input/event0; ! #X floatatom 486 360 12 0 0 1 time - -; ! #X obj 393 340 unpack s s f f; ! #X msg 264 81 open /dev/input/event1; ! #X msg 256 58 open /dev/input/event0; ! #X msg 280 103 open /dev/input/event2; ! #X msg 292 124 open /dev/input/event3; ! #X msg 304 144 open /dev/input/event4; ! #X obj 85 321 route ev_key ev_rel ev_abs; ! #X floatatom 203 367 7 0 0 0 - - -; ! #X floatatom 261 367 7 0 0 0 - - -; ! #X obj 203 346 route abs_x abs_y; ! #X obj 86 81 tgl 35 0 empty empty empty 0 -6 0 8 -24198 -1 -1 0 1; ! #X floatatom 455 377 12 0 0 1 value - -; ! #X symbolatom 423 394 10 0 0 1 eventcode - -; ! #X symbolatom 393 413 15 0 0 1 eventtype - -; ! #X floatatom 85 451 5 0 0 0 - - -; ! #X floatatom 160 452 5 0 0 0 - - -; ! #X obj 85 429 route key_f key_leftctrl btn_left; ! #X floatatom 235 452 5 0 0 0 - - -; ! #X obj 53 195 bng 35 250 50 0 empty empty event_received 38 18 1 8 -225280 -1 -1; ! #X obj 2 2 cnv 15 900 20 empty empty hid 2 11 1 18 -233017 -66577 0 ! ; ! #X text 354 263 outlet message format:; ! #X text 378 277 eventtype eventcode value timestamp; ! #X obj 742 104 ev-list; ! #X obj 742 155 ev_syn-list; ! #X obj 742 177 ev_key-list; ! #X obj 742 199 ev_rel-list; ! #X obj 742 221 ev_abs-list; ! #X obj 742 243 ev_msc-list; ! #X obj 742 265 ev_led-list; ! #X obj 742 287 ev_snd-list; ! #X obj 742 309 ev_rep-list; ! #X obj 742 331 ev_ff-list; ! #X obj 742 353 ev_ff_status-list; ! #X text 710 85 Event Types:; ! #X text 710 136 Event Codes:; #X connect 1 0 0 0; #X connect 2 0 3 0; Index: make-arrays-from-input.h.pl =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/hid/make-arrays-from-input.h.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** make-arrays-from-input.h.pl 18 Oct 2004 21:10:49 -0000 1.2 --- make-arrays-from-input.h.pl 20 Oct 2004 02:55:12 -0000 1.3 *************** *** 3,15 **** use Switch; - # BUGS: FF_STATUS, REP, SND, SYN are not building properly. Its still dropping the first element - - - #======================================================================== - # GLOBAL VARS - #======================================================================== - - $FILENAME = "linux/input.h"; - #======================================================================== # FUNCTIONS --- 3,6 ---- *************** *** 63,73 **** } #======================================================================== # MAIN #======================================================================== ! $FILENAME = "linux/input.h"; ! open(INPUT_H, "<$FILENAME"); while (<INPUT_H>) --- 54,101 ---- } + #------------------------------------------------------------------------ + # print an array out in a comment table in Pd + # + sub printPdFile + { + my @arrayToPrint = @_; + my $x; + my $y; + my $lineNum = 1; + + my $PDFILENAME = "$arrayToPrint[0]-list.pd"; + open(PDFILE, ">$PDFILENAME"); + + print(PDFILE "#N canvas 282 80 210 570 10;\n"); + if ($arrayToPrint[0] eq "ev") { print(PDFILE "#X text 5 5 Event Types;\n"); } + else { print(PDFILE "#X text 5 5 Codes for Type: $arrayToPrint[0];\n"); } + print(PDFILE "#X text 5 20 ----------------------------;\n"); + + for($i = 1; $i <= $#arrayToPrint; $i++) + { + # if the array element's data is null, print NULL + if ($arrayToPrint[$i]) + { + $x = 5; + $y = $lineNum * 20 + 20; + print(PDFILE "#X text $x $y $arrayToPrint[$i];\n"); + $lineNum++; + } + } + + close(PDFILE); + } + #======================================================================== # MAIN #======================================================================== ! # source file ! $SOURCEFILENAME = "linux/input.h"; ! open(INPUT_H, "<$SOURCEFILENAME"); ! # output files ! $ARRAYSFILENAME = "input_arrays.h"; ! open(ARRAYS, ">$ARRAYSFILENAME"); while (<INPUT_H>) *************** *** 102,105 **** --- 130,150 ---- } + # generate a .pd file for each array + printPdFile("ev",@EV); + printPdFile("ev_syn",@SYN); + printPdFile("ev_key",@KEY); + printPdFile("ev_rel",@REL); + printPdFile("ev_abs",@ABS); + printPdFile("ev_msc",@MSC); + printPdFile("ev_led",@LED); + printPdFile("ev_snd",@SND); + printPdFile("ev_rep",@REP); + printPdFile("ev_ff",@FF); + # there doesn't seem to be any PWR events yet... + #printPdFile("pwr",@PWR); + printPdFile("ev_ff_status",@FF_STATUS); + + # generate a C array for each array and stick them all in the same file + select ARRAYS; printCArray("ev",@EV); printCArray("ev_syn",@SYN); *************** *** 151,155 **** # print "FF_STATUS: $#FF_STATUS \n"; ! close(INPUT_H); --- 196,200 ---- # print "FF_STATUS: $#FF_STATUS \n"; ! close(ARRAYS); close(INPUT_H);

1 0

externals/hcs/hid hid-help.pd,NONE,1.1 hid.c,1.2,1.3
by Hans-Christoph Steiner 20 Oct '04

20 Oct '04

Update of /cvsroot/pure-data/externals/hcs/hid In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3977 Modified Files: hid.c Added Files: hid-help.pd Log Message: first functional first with new outlet format --- NEW FILE: hid-help.pd --- #N canvas 282 80 613 460 10; #X msg 340 212 ev_rel rel_x 1 1.09824e+09; #X obj 340 191 prepend set; #X obj 102 357 route rel_x rel_y; #X floatatom 102 377 5 0 0 0 - - -; #X floatatom 159 377 5 0 0 0 - - -; #X obj 180 226 print; #X msg 106 48 start; #X msg 125 67 stop; #X obj 198 155 hid /dev/input/event0; #X floatatom 444 331 12 0 0 1 time - -; #X obj 351 311 unpack s s f f; #X msg 222 52 open /dev/input/event1; #X msg 214 29 open /dev/input/event0; #X msg 238 74 open /dev/input/event2; #X msg 250 95 open /dev/input/event3; #X msg 262 115 open /dev/input/event4; #X obj 43 292 route ev_key ev_rel ev_abs; #X floatatom 161 338 7 0 0 0 - - -; #X floatatom 219 338 7 0 0 0 - - -; #X obj 161 317 route abs_x abs_y; #X obj 44 52 tgl 35 0 empty empty empty 0 -6 0 8 -24198 -1 -1 1 1; #X floatatom 413 348 12 0 0 1 value - -; #X symbolatom 381 365 10 0 0 1 eventcode - -; #X symbolatom 351 384 15 0 0 1 eventtype - -; #X floatatom 43 422 5 0 0 0 - - -; #X floatatom 118 423 5 0 0 0 - - -; #X obj 43 400 route key_f key_leftctrl btn_left; #X floatatom 193 423 5 0 0 0 - - -; #X obj 11 166 bng 35 250 50 0 empty empty event_received 38 18 1 8 -225280 -1 -1; #X obj 2 2 cnv 15 600 20 empty empty "hid" 2 11 1 18 -233017 -66577 0; #X text 312 234 outlet message format:; #X text 336 248 eventtype eventcode value timestamp; #X connect 1 0 0 0; #X connect 2 0 3 0; #X connect 2 1 4 0; #X connect 6 0 8 0; #X connect 7 0 8 0; #X connect 8 0 5 0; #X connect 8 0 1 0; #X connect 8 0 10 0; #X connect 8 0 16 0; #X connect 8 0 28 0; #X connect 10 0 23 0; #X connect 10 1 22 0; #X connect 10 2 21 0; #X connect 10 3 9 0; #X connect 11 0 8 0; #X connect 12 0 8 0; #X connect 13 0 8 0; #X connect 14 0 8 0; #X connect 15 0 8 0; #X connect 16 0 26 0; #X connect 16 1 2 0; #X connect 16 2 19 0; #X connect 19 0 17 0; #X connect 19 1 18 0; #X connect 20 0 8 0; #X connect 26 0 24 0; #X connect 26 1 25 0; #X connect 26 2 27 0; Index: hid.c =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/hid/hid.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** hid.c 18 Oct 2004 21:10:48 -0000 1.2 --- hid.c 20 Oct 2004 02:06:08 -0000 1.3 *************** *** 47,54 **** #ifndef __APPLE_CC__ #include "Carbon_Include.h" ! #endif #include <HID_Utilities.h> ! #endif #include "linuxhid.h" --- 47,54 ---- #ifndef __APPLE_CC__ #include "Carbon_Include.h" ! #endif /* #ifndef __APPLE_CC__ */ #include <HID_Utilities.h> ! #endif /* #ifdef __APPLE__ */ #include "linuxhid.h" *************** *** 62,73 **** static t_class *hid_class; ! typedef struct _hid { t_object x_obj; t_int x_fd; t_symbol *x_devname; t_clock *x_clock; ! int x_read_ok; ! int x_started; ! int x_delay; #ifdef __gnu_linux__ struct input_event x_input_event; --- 62,74 ---- static t_class *hid_class; ! typedef struct _hid ! { t_object x_obj; t_int x_fd; t_symbol *x_devname; t_clock *x_clock; ! t_int x_read_ok; ! t_int x_started; ! t_int x_delay; #ifdef __gnu_linux__ struct input_event x_input_event; *************** *** 75,92 **** IOHIDEventStruct event; #endif ! t_outlet *x_input_event_time_outlet; ! t_outlet *x_input_event_type_outlet; ! t_outlet *x_input_event_code_outlet; ! t_outlet *x_input_event_value_outlet; }t_hid; /*------------------------------------------------------------------------------ * IMPLEMENTATION */ ! void hid_stop(t_hid* x) { DEBUG(post("hid_stop");); ! if (x->x_fd >= 0 && x->x_started) { clock_unset(x->x_clock); post("hid: polling stopped"); --- 76,93 ---- IOHIDEventStruct event; #endif ! t_outlet *x_event_outlet; }t_hid; + /*------------------------------------------------------------------------------ * IMPLEMENTATION */ ! void hid_stop(t_hid* x) ! { DEBUG(post("hid_stop");); ! if (x->x_fd >= 0 && x->x_started) ! { clock_unset(x->x_clock); post("hid: polling stopped"); *************** *** 95,99 **** } ! static int hid_close(t_hid *x) { DEBUG(post("hid_close");); --- 96,101 ---- } ! static t_int hid_close(t_hid *x) ! { DEBUG(post("hid_close");); *************** *** 108,113 **** } ! static int hid_open(t_hid *x, t_symbol *s) { ! int eventType, eventCode, buttons, rel_axes, abs_axes, ff; #ifdef __gnu_linux__ unsigned long bitmask[EV_MAX][NBITS(KEY_MAX)]; --- 110,119 ---- } ! static t_int hid_open(t_hid *x, t_symbol *s) ! { ! t_int eventType, eventCode; ! char *eventTypeName = ""; ! /* counts for various event types */ ! t_int synCount,keyCount,relCount,absCount,mscCount,ledCount,sndCount,repCount,ffCount,pwrCount,ff_statusCount; #ifdef __gnu_linux__ unsigned long bitmask[EV_MAX][NBITS(KEY_MAX)]; *************** *** 126,135 **** #ifdef __gnu_linux__ /* open device */ ! if (x->x_devname) { /* open the device read-only, non-exclusive */ x->x_fd = open (x->x_devname->s_name, O_RDONLY | O_NONBLOCK); /* test if device open */ ! if (x->x_fd < 0 ) { ! post("[hid] open %s failed",x->x_devname->s_name); x->x_fd = -1; return 0; --- 132,143 ---- #ifdef __gnu_linux__ /* open device */ ! if (x->x_devname) ! { /* open the device read-only, non-exclusive */ x->x_fd = open (x->x_devname->s_name, O_RDONLY | O_NONBLOCK); /* test if device open */ ! if (x->x_fd < 0 ) ! { ! error("[hid] open %s failed",x->x_devname->s_name); x->x_fd = -1; return 0; *************** *** 138,142 **** /* read input_events from the HID_DEVICE stream ! * It seems that is just there to flush the event input buffer? */ while (read (x->x_fd, &(x->x_input_event), sizeof(struct input_event)) > -1); --- 146,150 ---- /* read input_events from the HID_DEVICE stream ! * It seems that is just there to flush the input event queue */ while (read (x->x_fd, &(x->x_input_event), sizeof(struct input_event)) > -1); *************** *** 144,241 **** /* get name of device */ ioctl(x->x_fd, EVIOCGNAME(sizeof(devicename)), devicename); ! post ("Configuring %s on %s",devicename,x->x_devname->s_name); ! /* get bitmask representing supported events (axes, buttons, etc.) */ memset(bitmask, 0, sizeof(bitmask)); ioctl(x->x_fd, EVIOCGBIT(0, EV_MAX), bitmask[0]); post("\nSupported events:"); ! rel_axes = 0; ! abs_axes = 0; ! buttons = 0; ! ff = 0; /* cycle through all possible event types */ for (eventType = 0; eventType < EV_MAX; eventType++) { ! if (test_bit(eventType, bitmask[0])) ! { ! post(" %s (type %d) ", ev[eventType] ? ev[eventType] : "?", eventType); ! // post("Event type %d",eventType); ! /* get bitmask representing supported button types */ ! ioctl(x->x_fd, EVIOCGBIT(eventType, KEY_MAX), bitmask[eventType]); ! /* cycle through all possible event codes (axes, keys, etc.) ! * testing to see which are supported ! */ ! for (eventCode = 0; eventCode < KEY_MAX; eventCode++) ! if (test_bit(eventCode, bitmask[eventType])) ! { ! post(" Event code %s (%d)", event_names[eventType] ? (event_names[eventType][eventCode] ? event_names[eventType][eventCode] : "?") : "?", eventCode); /* post(" Event code %d (%s)", eventCode, names[eventType] ? (names[eventType][eventCode] ? names[eventType][eventCode] : "?") : "?"); */ ! switch(eventType) { ! // the API changed at some point... #ifdef EV_RST ! case EV_RST: ! break; #else ! case EV_SYN: ! break; #endif ! case EV_KEY: ! buttons++; ! break; ! case EV_REL: ! rel_axes++; ! break; ! case EV_ABS: ! abs_axes++; ! break; ! case EV_MSC: ! break; ! case EV_LED: ! break; ! case EV_SND: ! break; ! case EV_REP: ! break; ! case EV_FF: ! ff++; ! break; ! } ! } ! } } ! post ("\nUsing %d relative axes, %d absolute axes, and %d buttons.", rel_axes, abs_axes, buttons); ! if (ff > 0) post ("Detected %d force feedback types",ff); ! post ("\nWARNING * WARNING * WARNING * WARNING * WARNING * WARNING * WARNING"); ! post ("This object is under development! The interface could change at anytime!"); ! post ("As I write cross-platform versions, the interface might have to change."); ! post ("WARNING * WARNING * WARNING * WARNING * WARNING * WARNING * WARNING\n"); ! #endif return 1; } ! static int hid_read(t_hid *x,int fd) { ! if (x->x_fd < 0) return 0; #ifdef __gnu_linux__ ! while (read (x->x_fd, &(x->x_input_event), sizeof(struct input_event)) > -1) { ! outlet_float (x->x_input_event_value_outlet, (int)x->x_input_event.value); ! outlet_symbol (x->x_input_event_code_outlet, gensym(event_names[x->x_input_event.type][x->x_input_event.code])); ! outlet_symbol (x->x_input_event_type_outlet, gensym(ev[x->x_input_event.type])); ! /* input_event.time is a timeval struct from <sys/time.h> */ ! /* outlet_float (x->x_input_event_time_outlet, x->x_input_event.time); */ } ! #endif #ifdef __APPLE__ pRecDevice pCurrentHIDDevice = GetSetCurrentDevice (gWindow); ! pRecElement pCurrentHIDElement = GetSetCurrentElement (gWindow); ! // if we have a good device and element which is not a collecion if (pCurrentHIDDevice && pCurrentHIDElement && (pCurrentHIDElement->type != kIOHIDElementTypeCollection)) --- 152,273 ---- /* get name of device */ ioctl(x->x_fd, EVIOCGNAME(sizeof(devicename)), devicename); ! post ("\nConfiguring %s on %s",devicename,x->x_devname->s_name); ! /* get bitmask representing supported events (axes, keys, etc.) */ memset(bitmask, 0, sizeof(bitmask)); ioctl(x->x_fd, EVIOCGBIT(0, EV_MAX), bitmask[0]); post("\nSupported events:"); ! /* init all count vars */ ! synCount=keyCount=relCount=absCount=mscCount=ledCount=0; ! sndCount=repCount=ffCount=pwrCount=ff_statusCount=0; /* cycle through all possible event types */ for (eventType = 0; eventType < EV_MAX; eventType++) { ! if (test_bit(eventType, bitmask[0])) ! { ! /* make pretty names for event types */ ! switch(eventType) ! { ! case EV_SYN: eventTypeName = "Synchronization"; break; ! case EV_KEY: eventTypeName = "Keys/Buttons"; break; ! case EV_REL: eventTypeName = "Relative Axes"; break; ! case EV_ABS: eventTypeName = "Absolute Axes"; break; ! case EV_MSC: eventTypeName = "Miscellaneous"; break; ! case EV_LED: eventTypeName = "LEDs"; break; ! case EV_SND: eventTypeName = "System Sounds"; break; ! case EV_REP: eventTypeName = "Autorepeat Values"; break; ! case EV_FF: eventTypeName = "Force Feedback"; break; ! case EV_PWR: eventTypeName = "Power"; break; ! case EV_FF_STATUS: eventTypeName = "Force Feedback Status"; break; ! } ! post(" %s (%s/type %d) ", eventTypeName, ev[eventType] ? ev[eventType] : "?", eventType); ! /* get bitmask representing supported button types */ ! ioctl(x->x_fd, EVIOCGBIT(eventType, KEY_MAX), bitmask[eventType]); ! /* cycle through all possible event codes (axes, keys, etc.) ! * testing to see which are supported ! */ ! for (eventCode = 0; eventCode < KEY_MAX; eventCode++) ! { ! if (test_bit(eventCode, bitmask[eventType])) ! { ! post(" %s (%d)", event_names[eventType] ? (event_names[eventType][eventCode] ? event_names[eventType][eventCode] : "?") : "?", eventCode); /* post(" Event code %d (%s)", eventCode, names[eventType] ? (names[eventType][eventCode] ? names[eventType][eventCode] : "?") : "?"); */ ! switch(eventType) { ! /* ! * the API changed at some point... EV_SYN seems to be the new name ! * from "Reset" events to "Syncronization" events ! */ #ifdef EV_RST ! case EV_RST: synCount++; break; #else ! case EV_SYN: synCount++; break; #endif ! case EV_KEY: keyCount++; break; ! case EV_REL: relCount++; break; ! case EV_ABS: absCount++; break; ! case EV_MSC: mscCount++; break; ! case EV_LED: ledCount++; break; ! case EV_SND: sndCount++; break; ! case EV_REP: repCount++; break; ! case EV_FF: ffCount++; break; ! case EV_PWR: pwrCount++; break; ! case EV_FF_STATUS: ff_statusCount++; break; ! } ! } ! } ! } } ! post("\nDetected:"); ! if (synCount > 0) post (" %d Sync types",synCount); ! if (keyCount > 0) post (" %d Key/Button types",keyCount); ! if (relCount > 0) post (" %d Relative Axis types",relCount); ! if (absCount > 0) post (" %d Absolute Axis types",absCount); ! if (mscCount > 0) post (" %d Misc types",mscCount); ! if (ledCount > 0) post (" %d LED types",ledCount); ! if (sndCount > 0) post (" %d System Sound types",sndCount); ! if (repCount > 0) post (" %d Key Repeat types",repCount); ! if (ffCount > 0) post (" %d Force Feedback types",ffCount); ! if (pwrCount > 0) post (" %d Power types",pwrCount); ! if (ff_statusCount > 0) post (" %d Force Feedback types",ff_statusCount); ! ! post("\nWARNING * WARNING * WARNING * WARNING * WARNING * WARNING * WARNING"); ! post("This object is under development! The interface could change at anytime!"); ! post("As I write cross-platform versions, the interface might have to change."); ! post("WARNING * WARNING * WARNING * WARNING * WARNING * WARNING * WARNING"); ! post("================================= [hid] =================================\n"); ! #endif /* #ifdef __gnu_linux__ */ return 1; } ! static t_int hid_read(t_hid *x,int fd) { ! t_atom event_data[5]; ! char *eventType; ! char *eventCode; #ifdef __gnu_linux__ ! if (x->x_fd < 0) return 0; ! ! while (read (x->x_fd, &(x->x_input_event), sizeof(struct input_event)) > -1) ! { ! /* build event_data list from event data */ ! SETSYMBOL(event_data, gensym(ev[x->x_input_event.type])); ! SETSYMBOL(event_data + 1, gensym(event_names[x->x_input_event.type][x->x_input_event.code])); ! SETFLOAT(event_data + 2, (t_float)x->x_input_event.value); ! SETFLOAT(event_data + 3, (t_float)(x->x_input_event.time).tv_sec); ! outlet_anything(x->x_obj.te_outlet,atom_gensym(event_data),3,event_data+1); } ! #endif /* #ifdef__gnu_linux__ */ #ifdef __APPLE__ pRecDevice pCurrentHIDDevice = GetSetCurrentDevice (gWindow); ! pRecElement pCurrentHIDElement = GetSetCurrenstElement (gWindow); ! r/l // if we have a good device and element which is not a collecion if (pCurrentHIDDevice && pCurrentHIDElement && (pCurrentHIDElement->type != kIOHIDElementTypeCollection)) *************** *** 245,250 **** SInt32 valueScale = HIDScaleValue (valueCal, pCurrentHIDElement); } ! #endif ! if (x->x_started) { --- 277,282 ---- SInt32 valueScale = HIDScaleValue (valueCal, pCurrentHIDElement); } ! #endif /* #ifdef __APPLE__ */ ! if (x->x_started) { *************** *** 256,310 **** /* Actions */ ! static void hid_float(t_hid* x) { ! DEBUG(post("hid_float");) ! ! } ! ! void hid_delay(t_hid* x, t_float f) { DEBUG(post("hid_DELAY %f",f);) /* if the user sets the delay less than zero, reset to default */ ! if ( f > 0 ) { ! x->x_delay = (int)f; ! } else { x->x_delay = DEFAULT_DELAY; } } ! void hid_start(t_hid* x) { DEBUG(post("hid_start");); ! if (x->x_fd >= 0 && !x->x_started) { clock_delay(x->x_clock, DEFAULT_DELAY); post("hid: polling started"); x->x_started = 1; ! } else { ! post("You need to set a input device (i.e /dev/input/event0)"); } } ! /* setup functions */ ! static void hid_free(t_hid* x) { ! DEBUG(post("hid_free");) ! ! if (x->x_fd < 0) return; ! hid_stop(x); ! clock_free(x->x_clock); ! close (x->x_fd); } ! static void *hid_new(t_symbol *s) { ! int i; t_hid *x = (t_hid *)pd_new(hid_class); ! DEBUG(post("hid_new");) post("[hid] %s, written by Hans-Christoph Steiner <hans(a)eds.org>",version); #ifndef __linux__ ! post(" !! WARNING !! WARNING !! WARNING !! WARNING !! WARNING !! WARNING !!"); ! post(" This is a dummy, since this object only works with a Linux kernel!"); ! post(" !! WARNING !! WARNING !! WARNING !! WARNING !! WARNING !! WARNING !!"); ! #endif /* init vars */ --- 288,358 ---- /* Actions */ ! void hid_delay(t_hid* x, t_float f) ! { DEBUG(post("hid_DELAY %f",f);) /* if the user sets the delay less than zero, reset to default */ ! if ( f > 0 ) ! { ! x->x_delay = (t_int)f; ! } ! else ! { x->x_delay = DEFAULT_DELAY; } } ! void hid_start(t_hid* x) ! { DEBUG(post("hid_start");); ! if (x->x_fd >= 0 && !x->x_started) ! { clock_delay(x->x_clock, DEFAULT_DELAY); post("hid: polling started"); x->x_started = 1; ! } ! else ! { ! error("You need to set a input device (i.e /dev/input/event0)"); } } ! static void hid_float(t_hid* x, t_floatarg f) ! { ! DEBUG(post("hid_float");); ! ! if(f == 1) ! hid_start(x); ! else if(f == 0) ! hid_stop(x); ! } ! /* setup functions */ ! static void hid_free(t_hid* x) ! { ! DEBUG(post("hid_free");); ! ! if (x->x_fd < 0) return; ! ! hid_stop(x); ! clock_free(x->x_clock); ! close (x->x_fd); } ! static void *hid_new(t_symbol *s) ! { ! t_int i; t_hid *x = (t_hid *)pd_new(hid_class); ! DEBUG(post("hid_new");); + post("================================= [hid] ================================="); post("[hid] %s, written by Hans-Christoph Steiner <hans(a)eds.org>",version); #ifndef __linux__ ! error(" !! WARNING !! WARNING !! WARNING !! WARNING !! WARNING !! WARNING !!"); ! error(" This is a dummy, since this object only works with a Linux kernel!"); ! error(" !! WARNING !! WARNING !! WARNING !! WARNING !! WARNING !! WARNING !!"); ! #endif /* __linux__ */ /* init vars */ *************** *** 316,325 **** x->x_clock = clock_new(x, (t_method)hid_read); ! ! /* create outlets for each axis */ ! x->x_input_event_time_outlet = outlet_new(&x->x_obj, &s_float); ! x->x_input_event_type_outlet = outlet_new(&x->x_obj, &s_float); ! x->x_input_event_code_outlet = outlet_new(&x->x_obj, &s_float); ! x->x_input_event_value_outlet = outlet_new(&x->x_obj, &s_float); /* set to the value from the object argument, if that exists */ --- 364,370 ---- x->x_clock = clock_new(x, (t_method)hid_read); ! ! /* create anything outlet */ ! outlet_new(&x->x_obj, 0); /* set to the value from the object argument, if that exists */ *************** *** 334,356 **** } ! void hid_setup(void) { ! DEBUG(post("hid_setup");) ! hid_class = class_new(gensym("hid"), ! (t_newmethod)hid_new, ! (t_method)hid_free, ! sizeof(t_hid),0,A_DEFSYM,0); ! ! /* add inlet datatype methods */ ! class_addfloat(hid_class,(t_method) hid_float); ! class_addbang(hid_class,(t_method) hid_read); ! ! /* add inlet message methods */ ! class_addmethod(hid_class,(t_method) hid_delay,gensym("delay"),A_DEFFLOAT,0); ! class_addmethod(hid_class,(t_method) hid_open,gensym("open"),A_DEFSYM,0); ! class_addmethod(hid_class,(t_method) hid_close,gensym("close"),0); ! class_addmethod(hid_class,(t_method) hid_start,gensym("start"),0); ! class_addmethod(hid_class,(t_method) hid_start,gensym("poll"),0); ! class_addmethod(hid_class,(t_method) hid_stop,gensym("stop"),0); ! class_addmethod(hid_class,(t_method) hid_stop,gensym("nopoll"),0); } --- 379,404 ---- } ! void hid_setup(void) ! { ! DEBUG(post("hid_setup");); ! hid_class = class_new(gensym("hid"), ! (t_newmethod)hid_new, ! (t_method)hid_free, ! sizeof(t_hid), ! CLASS_DEFAULT, ! A_DEFSYM,0); ! ! /* add inlet datatype methods */ ! class_addfloat(hid_class,(t_method) hid_float); ! class_addbang(hid_class,(t_method) hid_read); ! ! /* add inlet message methods */ ! class_addmethod(hid_class,(t_method) hid_delay,gensym("delay"),A_DEFFLOAT,0); ! class_addmethod(hid_class,(t_method) hid_open,gensym("open"),A_DEFSYM,0); ! class_addmethod(hid_class,(t_method) hid_close,gensym("close"),0); ! class_addmethod(hid_class,(t_method) hid_start,gensym("start"),0); ! class_addmethod(hid_class,(t_method) hid_start,gensym("poll"),0); ! class_addmethod(hid_class,(t_method) hid_stop,gensym("stop"),0); ! class_addmethod(hid_class,(t_method) hid_stop,gensym("nopoll"),0); }

1 0

pd/src g_io.c,1.1.1.1.16.6,1.1.1.1.16.7
by Tim Blechmann 19 Oct '04

19 Oct '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30024 Modified Files: Tag: devel_0_37 g_io.c Log Message: renaming simd functions Index: g_io.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_io.c,v retrieving revision 1.1.1.1.16.6 retrieving revision 1.1.1.1.16.7 diff -C2 -d -r1.1.1.1.16.6 -r1.1.1.1.16.7 *** g_io.c 7 Oct 2004 17:56:38 -0000 1.1.1.1.16.6 --- g_io.c 19 Oct 2004 21:35:40 -0000 1.1.1.1.16.7 *************** *** 139,144 **** for (; n; n -= 8, in += 8, out += 8) { ! out[0] = in[0]; out[1] = in[1]; out[2] = in[2]; out[3] = in[3]; ! out[4] = in[4]; out[5] = in[5]; out[6] = in[6]; out[7] = in[7]; } --- 139,144 ---- for (; n; n -= 8, in += 8, out += 8) { ! out[0] = in[0]; out[1] = in[1]; out[2] = in[2]; out[3] = in[3]; ! out[4] = in[4]; out[5] = in[5]; out[6] = in[6]; out[7] = in[7]; } *************** *** 153,157 **** t_vinlet *x = (t_vinlet *)(w[1]); t_float *in = x->x_read; ! copyvec((t_float *)w[2],in,w[3]); if (in == x->x_endbuf) in = x->x_buf; x->x_read = in; --- 153,157 ---- t_vinlet *x = (t_vinlet *)(w[1]); t_float *in = x->x_read; ! copyvec_simd((t_float *)w[2],in,w[3]); if (in == x->x_endbuf) in = x->x_buf; x->x_read = in;

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
20
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 October 2004