Pd-cvs July 2005

pd-cvs@lists.iem.at

14 participants
187 discussions

externals/iem16/src iem16_table.c, 1.1.1.1, 1.2 iem16_table.h, 1.1.1.1, 1.2
by IOhannes m zmölnig 01 Jul '05

01 Jul '05

Update of /cvsroot/pure-data/externals/iem16/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25770 Modified Files: iem16_table.c iem16_table.h Log Message: added "read16" message for the table16 added some prelaminary tabfudge that should make casting faster (LATER) Index: iem16_table.h =================================================================== RCS file: /cvsroot/pure-data/externals/iem16/src/iem16_table.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** iem16_table.h 23 Nov 2004 15:29:47 -0000 1.1.1.1 --- iem16_table.h 1 Jul 2005 12:07:50 -0000 1.2 *************** *** 18,24 **** t_symbol *x_tablename; long x_size; ! t_iem16_16bit *x_table; // hold the data int x_usedindsp; } t_table16; --- 18,25 ---- t_symbol *x_tablename; long x_size; ! t_iem16_16bit *x_table; /* hold the data */ int x_usedindsp; + t_canvas *x_canvas; /* for file i/o */ } t_table16; *************** *** 26,27 **** --- 27,93 ---- EXTERN int table16_getarray16(t_table16*x, int*size,t_iem16_16bit**vec); EXTERN void table16_usedindsp(t_table16*x); + + + #define UNITBIT32 1572864. /* 3*2^19; bit 32 has place value 1 */ + + /* machine-dependent definitions. These ifdefs really + should have been by CPU type and not by operating system! */ + #ifdef __irix__ + /* big-endian. Most significant byte is at low address in memory */ + #define HIOFFSET 0 /* word offset to find MSB */ + #define LOWOFFSET 1 /* word offset to find LSB */ + #define int32 long /* a data type that has 32 bits */ + #else + #ifdef __win32__ + /* little-endian; most significant byte is at highest address */ + #define HIOFFSET 1 + #define LOWOFFSET 0 + #define int32 long + #else + #ifdef __FreeBSD__ + #include <machine/endian.h> + #if BYTE_ORDER == LITTLE_ENDIAN + #define HIOFFSET 1 + #define LOWOFFSET 0 + #else + #define HIOFFSET 0 /* word offset to find MSB */ + #define LOWOFFSET 1 /* word offset to find LSB */ + #endif /* BYTE_ORDER */ + #include <sys/types.h> + #define int32 int32_t + #endif + #ifdef __linux__ + + #include <endian.h> + + #if !defined(__BYTE_ORDER) || !defined(__LITTLE_ENDIAN) + #error No byte order defined + #endif + + #if __BYTE_ORDER == __LITTLE_ENDIAN + #define HIOFFSET 1 + #define LOWOFFSET 0 + #else + #define HIOFFSET 0 /* word offset to find MSB */ + #define LOWOFFSET 1 /* word offset to find LSB */ + #endif /* __BYTE_ORDER */ + + #include <sys/types.h> + #define int32 int32_t + + #else + #ifdef __apple__ + #define HIOFFSET 0 /* word offset to find MSB */ + #define LOWOFFSET 1 /* word offset to find LSB */ + #define int32 int /* a data type that has 32 bits */ + + #endif /* MACOSX */ + #endif /* __linux__ */ + #endif /* MSW */ + #endif /* SGI */ + + union tabfudge + { + double tf_d; + int32 tf_i[2]; + }; Index: iem16_table.c =================================================================== RCS file: /cvsroot/pure-data/externals/iem16/src/iem16_table.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** iem16_table.c 23 Nov 2004 15:29:47 -0000 1.1.1.1 --- iem16_table.c 1 Jul 2005 12:07:50 -0000 1.2 *************** *** 8,11 **** --- 8,22 ---- #include "iem16_table.h" + + #include <stdio.h> /* for read/write to files */ + + static int am_bigendian(void){ + /* actually this should be in m_pd.h */ + unsigned short s = 1; + unsigned char c = *(char *)(&s); + return (c==0); + } + + static void table16_const(t_table16*x, t_float f); *************** *** 19,22 **** --- 30,34 ---- x->x_usedindsp=0; pd_bind(&x->x_obj.ob_pd, x->x_tablename); + x->x_canvas = canvas_getcurrent(); table16_const(x, 0); *************** *** 64,68 **** t_garray *a=0; int npoints; ! t_float *vec, *src; t_iem16_16bit *dest; --- 76,80 ---- t_garray *a=0; int npoints; ! t_float *vec=(0), *src=(0); t_iem16_16bit *dest; *************** *** 121,125 **** i=length; while(i--)*dest++=(*src++)*scale; ! post("from %s (%d, %d) --> (%d, %d)\tresize=%s", s->s_name, startfrom, endfrom, startto, endto, (resize)?"yes":"no"); } --- 133,201 ---- i=length; while(i--)*dest++=(*src++)*scale; ! //post("from %s (%d, %d) --> (%d, %d)\tresize=%s", s->s_name, startfrom, endfrom, startto, endto, (resize)?"yes":"no"); ! } ! ! #define BINREADMODE "rb" ! #define BINWRITEMODE "wb" ! static void table16_read16(t_table16 *x, t_symbol *filename, t_symbol *endian, t_floatarg fskip) ! { ! int skip = fskip, filedesc; ! int i, nelem; ! t_iem16_16bit *vec; ! FILE *fd; ! char buf[MAXPDSTRING], *bufptr; ! short s; ! int cpubig = am_bigendian(), swap = 0; ! char c = endian->s_name[0]; ! if (c == 'b') ! { ! if (!cpubig) swap = 1; ! } ! else if (c == 'l') ! { ! if (cpubig) swap = 1; ! } ! else if (c) ! { ! error("array_read16: endianness is 'l' (low byte first ala INTEL)"); ! post("... or 'b' (high byte first ala MIPS,DEC,PPC)"); ! } ! if (!table16_getarray16(x, &nelem, &vec)) ! { ! error("%s: not a 16bit array", x->x_tablename->s_name); ! return; ! } ! if ((filedesc = open_via_path( ! canvas_getdir(x->x_canvas)->s_name, ! filename->s_name, "", buf, &bufptr, MAXPDSTRING, 1)) < 0 ! || !(fd = fdopen(filedesc, BINREADMODE))) ! { ! error("%s: can't open", filename->s_name); ! return; ! } ! if (skip) ! { ! long pos = fseek(fd, (long)skip, SEEK_SET); ! if (pos < 0) ! { ! error("%s: can't seek to byte %d", buf, skip); ! fclose(fd); ! return; ! } ! } ! ! for (i = 0; i < nelem; i++) ! { ! if (fread(&s, sizeof(s), 1, fd) < 1) ! { ! post("%s: read %d elements into table of size %d", ! filename->s_name, i, nelem); ! break; ! } ! if (swap) s = ((s & 0xff) << 8) | ((s & 0xff00) >> 8); ! vec[i] = s; ! } ! while (i < nelem) vec[i++] = 0; ! fclose(fd); } *************** *** 132,135 **** --- 208,213 ---- class_addmethod(table16_class, (t_method)table16_const, gensym("const"), A_DEFFLOAT); class_addmethod(table16_class, (t_method)table16_from, gensym("from"), A_GIMME); + class_addmethod(table16_class, (t_method)table16_read16, gensym("read16"), A_SYMBOL, + A_DEFFLOAT, A_DEFSYM, A_NULL); }

1 0

externals/footils/fluid/pd-darwin - New directory
by Frank Barknecht 01 Jul '05

01 Jul '05

Update of /cvsroot/pure-data/externals/footils/fluid/pd-darwin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13748/pd-darwin Log Message: Directory /cvsroot/pure-data/externals/footils/fluid/pd-darwin added to the repository

1 0

externals/ggee/include g_canvas.h,1.3,1.4
by Guenter Geiger 01 Jul '05

01 Jul '05

Update of /cvsroot/pure-data/externals/ggee/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4351/include Added Files: g_canvas.h Log Message: added --- NEW FILE: g_canvas.h --- /* Copyright (c) 1997-1999 Miller Puckette. * For information on usage and redistribution, and for a DISCLAIMER OF ALL * WARRANTIES, see the file, "LICENSE.txt," in this distribution. */ /* this file defines the structure for "glists" and related structures and functions. "Glists" and "canvases" and "graphs" used to be different structures until being unified in version 0.35. A glist occupies its own window if the "gl_havewindow" flag is set. Its appearance on its "parent" or "owner" (if it has one) is as a graph if "gl_isgraph" is set, and otherwise as a text box. A glist is "root" if it has no owner, i.e., a document window. In this case "gl_havewindow" is always set. We maintain a list of root windows, so that we can traverse the whole collection of everything in a Pd process. If a glist has a window it may still not be "mapped." Miniaturized windows aren't mapped, for example, but a window is also not mapped immediately upon creation. In either case gl_havewindow is true but gl_mapped is false. Closing a non-root window makes it invisible; closing a root destroys it. A glist that's just a text object on its parent is always "toplevel." An embedded glist can switch back and forth to appear as a toplevel by double- clicking on it. Single-clicking a text box makes the toplevel become visible and raises the window it's in. If a glist shows up as a graph on its parent, the graph is blanked while the glist has its own window, even if miniaturized. */ /* NOTE: this file describes Pd implementation details which may change in future releases. The public (stable) API is in m_pd.h. */ #ifndef __G_CANVAS_H #if defined(_LANGUAGE_C_PLUS_PLUS) || defined(__cplusplus) extern "C" { #endif #ifdef GARRAY_THREAD_LOCK #include <pthread.h> /* TB: for t_garray */ #endif /* --------------------- geometry ---------------------------- */ #define IOWIDTH 7 /* width of an inlet/outlet in pixels */ #define IOMIDDLE ((IOWIDTH-1)/2) #define GLIST_DEFGRAPHWIDTH 200 #define GLIST_DEFGRAPHHEIGHT 140 /* ----------------------- data ------------------------------- */ typedef struct _updateheader { struct _updateheader *upd_next; unsigned int upd_array:1; /* true if array, false if glist */ unsigned int upd_queued:1; /* true if we're queued */ } t_updateheader; /* types to support glists grabbing mouse motion or keys from parent */ typedef void (*t_glistmotionfn)(void *z, t_floatarg dx, t_floatarg dy); typedef void (*t_glistkeyfn)(void *z, t_floatarg key); EXTERN_STRUCT _rtext; #define t_rtext struct _rtext EXTERN_STRUCT _gtemplate; #define t_gtemplate struct _gtemplate EXTERN_STRUCT _guiconnect; #define t_guiconnect struct _guiconnect EXTERN_STRUCT _tscalar; #define t_tscalar struct _tscalar EXTERN_STRUCT _canvasenvironment; #define t_canvasenvironment struct _canvasenvironment typedef struct _selection { t_gobj *sel_what; struct _selection *sel_next; } t_selection; /* this structure is instantiated whenever a glist becomes visible. */ typedef struct _editor { t_updateheader e_upd; /* update header structure */ t_selection *e_updlist; /* list of objects to update */ t_rtext *e_rtext; /* text responder linked list */ t_selection *e_selection; /* head of the selection list */ t_rtext *e_textedfor; /* the rtext if any that we are editing */ t_gobj *e_grab; /* object being "dragged" */ t_glistmotionfn e_motionfn; /* ... motion callback */ t_glistkeyfn e_keyfn; /* ... keypress callback */ t_binbuf *e_connectbuf; /* connections to deleted objects */ t_binbuf *e_deleted; /* last stuff we deleted */ t_guiconnect *e_guiconnect; /* GUI connection for filtering messages */ struct _glist *e_glist; /* glist which owns this */ int e_xwas; /* xpos on last mousedown or motion event */ int e_ywas; /* ypos, similarly */ int e_selectline_index1; /* indices for the selected line if any */ int e_selectline_outno; /* (only valid if e_selectedline is set) */ int e_selectline_index2; int e_selectline_inno; t_outconnect *e_selectline_tag; unsigned int e_onmotion: 3; /* action to take on motion */ unsigned int e_lastmoved: 1; /* one if mouse has moved since click */ unsigned int e_textdirty: 1; /* one if e_textedfor has changed */ unsigned int e_selectedline: 1; /* one if a line is selected */ } t_editor; #define MA_NONE 0 /* e_onmotion: do nothing on mouse motion */ #define MA_MOVE 1 /* drag the selection around */ #define MA_CONNECT 2 /* make a connection */ #define MA_REGION 3 /* selection region */ #define MA_PASSOUT 4 /* send on to e_grab */ #define MA_DRAGTEXT 5 /* drag in text editor to alter selection */ /* editor structure for "garrays". We don't bother to delete and regenerate this structure when the "garray" becomes invisible or visible, although we could do so if the structure gets big (like the "editor" above.) */ typedef struct _arrayvis { t_updateheader av_upd; /* update header structure */ t_garray *av_garray; /* owning structure */ } t_arrayvis; /* the t_tick structure describes where to draw x and y "ticks" for a glist */ typedef struct _tick /* where to put ticks on x or y axes */ { float k_point; /* one point to draw a big tick at */ float k_inc; /* x or y increment per little tick */ int k_lperb; /* little ticks per big; 0 if no ticks to draw */ } t_tick; /* the t_glist structure, which describes a list of elements that live on an area of a window. */ struct _glist { t_object gl_obj; /* header in case we're a glist */ t_gobj *gl_list; /* the actual data */ struct _gstub *gl_stub; /* safe pointer handler */ int gl_valid; /* incremented when pointers might be stale */ struct _glist *gl_owner; /* parent glist, supercanvas, or 0 if none */ int gl_pixwidth; /* width in pixels (on parent, if a graph) */ int gl_pixheight; float gl_x1; /* bounding rectangle in our own coordinates */ float gl_y1; float gl_x2; float gl_y2; int gl_screenx1; /* screen coordinates when toplevel */ int gl_screeny1; int gl_screenx2; int gl_screeny2; t_tick gl_xtick; /* ticks marking X values */ int gl_nxlabels; /* number of X coordinate labels */ t_symbol **gl_xlabel; /* ... an array to hold them */ float gl_xlabely; /* ... and their Y coordinates */ t_tick gl_ytick; /* same as above for Y ticks and labels */ int gl_nylabels; t_symbol **gl_ylabel; float gl_ylabelx; t_editor *gl_editor; /* editor structure when visible */ t_symbol *gl_name; /* symbol bound here */ int gl_font; /* nominal font size in points, e.g., 10 */ struct _glist *gl_next; /* link in list of toplevels */ t_canvasenvironment *gl_env; /* root canvases and abstractions only */ unsigned int gl_havewindow:1; /* true if we own a window */ unsigned int gl_mapped:1; /* true if, moreover, it's "mapped" */ unsigned int gl_dirty:1; /* (root canvas only:) patch has changed */ unsigned int gl_loading:1; /* am now loading from file */ unsigned int gl_willvis:1; /* make me visible after loading */ unsigned int gl_edit:1; /* edit mode */ unsigned int gl_isdeleting:1; /* we're inside glist_delete -- hack! */ unsigned int gl_stretch:1; /* stretch contents on resize */ unsigned int gl_isgraph:1; /* show as graph on parent */ }; #define gl_gobj gl_obj.te_g #define gl_pd gl_gobj.g_pd /* a data structure to describe a field in a pure datum */ #define DT_FLOAT 0 #define DT_SYMBOL 1 #define DT_LIST 2 #define DT_ARRAY 3 typedef struct _dataslot { int ds_type; t_symbol *ds_name; t_symbol *ds_arraytemplate; /* filled in for arrays only */ } t_dataslot; /* T.Grill - changed t_pd member to t_pdobj to avoid name clashed */ typedef struct _template { t_pd t_pdobj; /* header */ struct _gtemplate *t_list; /* list of "struct"/gtemplate objects */ t_symbol *t_sym; /* name */ int t_n; /* number of dataslots (fields) */ t_dataslot *t_vec; /* array of dataslots */ } t_template; struct _array { int a_n; /* number of elements */ int a_elemsize; /* size in bytes; LATER get this from template */ char *a_vec; /* array of elements */ t_symbol *a_templatesym; /* template for elements */ int a_valid; /* protection against stale pointers into array */ t_gpointer a_gp; /* pointer to scalar or array element we're in */ t_gstub *a_stub; }; struct _garray { t_gobj x_gobj; t_glist *x_glist; t_array x_array; /* actual array; note only 4 fields used as below */ t_symbol *x_name; t_symbol *x_realname; /* name with "$" expanded */ t_float x_firstx; /* X value of first item */ t_float x_xinc; /* X increment */ char x_usedindsp; /* true if some DSP routine is using this */ char x_saveit; /* true if we should save this with parent */ char x_drawasrects; /* draw as rectangles, not a polygon */ double x_lastupdate; /* T.Grill - clock_getlogicaltime() of last array update */ #ifdef GARRAY_THREAD_LOCK pthread_mutex_t * x_mutex; /* TB: mutex */ #endif }; /* structure for traversing all the connections in a glist */ typedef struct _linetraverser { t_canvas *tr_x; t_object *tr_ob; int tr_nout; int tr_outno; t_object *tr_ob2; t_outlet *tr_outlet; t_inlet *tr_inlet; int tr_nin; int tr_inno; int tr_x11, tr_y11, tr_x12, tr_y12; int tr_x21, tr_y21, tr_x22, tr_y22; int tr_lx1, tr_ly1, tr_lx2, tr_ly2; t_outconnect *tr_nextoc; int tr_nextoutno; } t_linetraverser; /* function types used to define graphical behavior for gobjs, a bit like X widgets. We don't use Pd methods because Pd's typechecking can't specify the types of pointer arguments. Also it's more convenient this way, since every "patchable" object can just get the "text" behaviors. */ /* Call this to get a gobj's bounding rectangle in pixels */ typedef void (*t_getrectfn)(t_gobj *x, struct _glist *glist, int *x1, int *y1, int *x2, int *y2); /* and this to displace a gobj: */ typedef void (*t_displacefn)(t_gobj *x, struct _glist *glist, int dx, int dy); /* change color to show selection: */ typedef void (*t_selectfn)(t_gobj *x, struct _glist *glist, int state); /* change appearance to show activation/deactivation: */ typedef void (*t_activatefn)(t_gobj *x, struct _glist *glist, int state); /* warn a gobj it's about to be deleted */ typedef void (*t_deletefn)(t_gobj *x, struct _glist *glist); /* making visible or invisible */ typedef void (*t_visfn)(t_gobj *x, struct _glist *glist, int flag); /* field a mouse click (when not in "edit" mode) */ typedef int (*t_clickfn)(t_gobj *x, struct _glist *glist, int xpix, int ypix, int shift, int alt, int dbl, int doit); /* ... and later, resizing; getting/setting font or color... */ struct _widgetbehavior { t_getrectfn w_getrectfn; t_displacefn w_displacefn; t_selectfn w_selectfn; t_activatefn w_activatefn; t_deletefn w_deletefn; t_visfn w_visfn; t_clickfn w_clickfn; }; /* -------- behaviors for scalars defined by objects in template --------- */ /* these are set by "drawing commands" in g_template.c which add appearance to scalars, which live in some other window. If the scalar is just included in a canvas the "parent" is a misnomer. There is also a text scalar object which really does draw the scalar on the parent window; see g_scalar.c. */ /* note how the click function wants the whole scalar, not the "data", so doesn't work on array elements... LATER reconsider this */ /* bounding rectangle: */ typedef void (*t_parentgetrectfn)(t_gobj *x, struct _glist *glist, t_word *data, t_template *tmpl, float basex, float basey, int *x1, int *y1, int *x2, int *y2); /* displace it */ typedef void (*t_parentdisplacefn)(t_gobj *x, struct _glist *glist, t_word *data, t_template *tmpl, float basex, float basey, int dx, int dy); /* change color to show selection */ typedef void (*t_parentselectfn)(t_gobj *x, struct _glist *glist, t_word *data, t_template *tmpl, float basex, float basey, int state); /* change appearance to show activation/deactivation: */ typedef void (*t_parentactivatefn)(t_gobj *x, struct _glist *glist, t_word *data, t_template *tmpl, float basex, float basey, int state); /* making visible or invisible */ typedef void (*t_parentvisfn)(t_gobj *x, struct _glist *glist, t_word *data, t_template *tmpl, float basex, float basey, int flag); /* field a mouse click */ typedef int (*t_parentclickfn)(t_gobj *x, struct _glist *glist, t_scalar *sc, t_template *tmpl, float basex, float basey, int xpix, int ypix, int shift, int alt, int dbl, int doit); struct _parentwidgetbehavior { t_parentgetrectfn w_parentgetrectfn; t_parentdisplacefn w_parentdisplacefn; t_parentselectfn w_parentselectfn; t_parentactivatefn w_parentactivatefn; t_parentvisfn w_parentvisfn; t_parentclickfn w_parentclickfn; }; /* cursor definitions; used as return value for t_parentclickfn */ #define CURSOR_RUNMODE_NOTHING 0 #define CURSOR_RUNMODE_CLICKME 1 #define CURSOR_RUNMODE_THICKEN 2 #define CURSOR_RUNMODE_ADDPOINT 3 #define CURSOR_EDITMODE_NOTHING 4 #define CURSOR_EDITMODE_CONNECT 5 #define CURSOR_EDITMODE_DISCONNECT 6 EXTERN void canvas_setcursor(t_glist *x, unsigned int cursornum); extern t_canvas *canvas_editing; /* last canvas to start text edting */ extern t_canvas *canvas_whichfind; /* last canvas we did a find in */ extern t_canvas *canvas_list; /* list of all root canvases */ extern t_class *vinlet_class, *voutlet_class; extern int glist_valid; /* incremented when pointers might be stale */ /* ------------------- functions on any gobj ----------------------------- */ EXTERN void gobj_getrect(t_gobj *x, t_glist *owner, int *x1, int *y1, int *x2, int *y2); EXTERN void gobj_displace(t_gobj *x, t_glist *owner, int dx, int dy); EXTERN void gobj_select(t_gobj *x, t_glist *owner, int state); EXTERN void gobj_activate(t_gobj *x, t_glist *owner, int state); EXTERN void gobj_delete(t_gobj *x, t_glist *owner); EXTERN void gobj_vis(t_gobj *x, t_glist *glist, int flag); EXTERN int gobj_click(t_gobj *x, struct _glist *glist, int xpix, int ypix, int shift, int alt, int dbl, int doit); EXTERN void gobj_save(t_gobj *x, t_binbuf *b); EXTERN void gobj_properties(t_gobj *x, struct _glist *glist); EXTERN void gobj_save(t_gobj *x, t_binbuf *b); EXTERN void gobj_redraw(t_gobj *gobj, t_glist *glist); /* -------------------- functions on glists --------------------- */ EXTERN t_glist *glist_new( void); EXTERN void glist_init(t_glist *x); EXTERN void glist_add(t_glist *x, t_gobj *g); EXTERN void glist_cleanup(t_glist *x); EXTERN void glist_free(t_glist *x); EXTERN void glist_clear(t_glist *x); EXTERN t_canvas *glist_getcanvas(t_glist *x); EXTERN int glist_isselected(t_glist *x, t_gobj *y); EXTERN void glist_select(t_glist *x, t_gobj *y); EXTERN void glist_deselect(t_glist *x, t_gobj *y); EXTERN void glist_noselect(t_glist *x); EXTERN void glist_selectall(t_glist *x); EXTERN void glist_delete(t_glist *x, t_gobj *y); EXTERN void glist_retext(t_glist *x, t_text *y); EXTERN void glist_grab(t_glist *x, t_gobj *y, t_glistmotionfn motionfn, t_glistkeyfn keyfn, int xpos, int ypos); EXTERN int glist_isvisible(t_glist *x); EXTERN int glist_istoplevel(t_glist *x); EXTERN t_glist *glist_findgraph(t_glist *x); EXTERN int glist_getfont(t_glist *x); EXTERN void glist_sort(t_glist *canvas); EXTERN void glist_read(t_glist *x, t_symbol *filename, t_symbol *format); EXTERN void glist_mergefile(t_glist *x, t_symbol *filename, t_symbol *format); EXTERN float glist_pixelstox(t_glist *x, float xpix); EXTERN float glist_pixelstoy(t_glist *x, float ypix); EXTERN float glist_xtopixels(t_glist *x, float xval); EXTERN float glist_ytopixels(t_glist *x, float yval); EXTERN float glist_dpixtodx(t_glist *x, float dxpix); EXTERN float glist_dpixtody(t_glist *x, float dypix); EXTERN void glist_redrawitem(t_glist *owner, t_gobj *gobj); EXTERN void glist_getnextxy(t_glist *gl, int *xval, int *yval); EXTERN void glist_glist(t_glist *g, t_symbol *s, int argc, t_atom *argv); EXTERN t_glist *glist_addglist(t_glist *g, t_symbol *sym, float x1, float y1, float x2, float y2, float px1, float py1, float px2, float py2); EXTERN void glist_arraydialog(t_glist *parent, t_symbol *name, t_floatarg size, t_floatarg saveit, t_floatarg newgraph); EXTERN t_binbuf *glist_writetobinbuf(t_glist *x, int wholething); EXTERN int glist_isgraph(t_glist *x); EXTERN void glist_redraw(t_glist *x); EXTERN void glist_drawiofor(t_glist *glist, t_object *ob, int firsttime, char *tag, int x1, int y1, int x2, int y2); EXTERN void glist_eraseiofor(t_glist *glist, t_object *ob, char *tag); EXTERN void canvas_create_editor(t_glist *x, int createit); void canvas_deletelinesforio(t_canvas *x, t_text *text, t_inlet *inp, t_outlet *outp); /* -------------------- functions on texts ------------------------- */ EXTERN void text_setto(t_text *x, t_glist *glist, char *buf, int bufsize); EXTERN void text_drawborder(t_text *x, t_glist *glist, char *tag, int width, int height, int firsttime); EXTERN void text_eraseborder(t_text *x, t_glist *glist, char *tag); EXTERN int text_xcoord(t_text *x, t_glist *glist); EXTERN int text_ycoord(t_text *x, t_glist *glist); EXTERN int text_xpix(t_text *x, t_glist *glist); EXTERN int text_ypix(t_text *x, t_glist *glist); EXTERN int text_shouldvis(t_text *x, t_glist *glist); /* -------------------- functions on rtexts ------------------------- */ #define RTEXT_DOWN 1 #define RTEXT_DRAG 2 #define RTEXT_DBL 3 #define RTEXT_SHIFT 4 EXTERN t_rtext *rtext_new(t_glist *glist, t_text *who); EXTERN t_rtext *glist_findrtext(t_glist *gl, t_text *who); EXTERN void rtext_draw(t_rtext *x); EXTERN void rtext_erase(t_rtext *x); EXTERN t_rtext *rtext_remove(t_rtext *first, t_rtext *x); EXTERN int rtext_height(t_rtext *x); EXTERN void rtext_displace(t_rtext *x, int dx, int dy); EXTERN void rtext_select(t_rtext *x, int state); EXTERN void rtext_activate(t_rtext *x, int state); EXTERN void rtext_free(t_rtext *x); EXTERN void rtext_key(t_rtext *x, int n, t_symbol *s); EXTERN void rtext_mouse(t_rtext *x, int xval, int yval, int flag); EXTERN void rtext_retext(t_rtext *x); EXTERN int rtext_width(t_rtext *x); EXTERN int rtext_height(t_rtext *x); EXTERN char *rtext_gettag(t_rtext *x); EXTERN void rtext_gettext(t_rtext *x, char **buf, int *bufsize); EXTERN void rtext_getseltext(t_rtext *x, char **buf, int *bufsize); /* -------------------- functions on canvases ------------------------ */ EXTERN t_class *canvas_class; EXTERN t_canvas *canvas_new(void *dummy, t_symbol *sel, int argc, t_atom *argv); EXTERN t_symbol *canvas_makebindsym(t_symbol *s); EXTERN void canvas_vistext(t_canvas *x, t_text *y); EXTERN void canvas_fixlinesfor(t_canvas *x, t_text *text); EXTERN void canvas_deletelinesfor(t_canvas *x, t_text *text); EXTERN void canvas_stowconnections(t_canvas *x); EXTERN void canvas_restoreconnections(t_canvas *x); EXTERN void canvas_redraw(t_canvas *x); EXTERN t_inlet *canvas_addinlet(t_canvas *x, t_pd *who, t_symbol *sym, t_symbol* h); EXTERN void canvas_rminlet(t_canvas *x, t_inlet *ip); EXTERN t_outlet *canvas_addoutlet(t_canvas *x, t_pd *who, t_symbol *sym); EXTERN void canvas_rmoutlet(t_canvas *x, t_outlet *op); EXTERN void canvas_redrawallfortemplate(t_canvas *tmpl); EXTERN void canvas_zapallfortemplate(t_canvas *tmpl); EXTERN void canvas_setusedastemplate(t_canvas *x); EXTERN t_canvas *canvas_getcurrent(void); EXTERN void canvas_setcurrent(t_canvas *x); EXTERN void canvas_unsetcurrent(t_canvas *x); EXTERN t_symbol *canvas_realizedollar(t_canvas *x, t_symbol *s); EXTERN t_canvas *canvas_getrootfor(t_canvas *x); EXTERN void canvas_dirty(t_canvas *x, t_int n); EXTERN int canvas_getfont(t_canvas *x); typedef int (*t_canvasapply)(t_canvas *x, t_int x1, t_int x2, t_int x3); EXTERN t_int *canvas_recurapply(t_canvas *x, t_canvasapply *fn, t_int x1, t_int x2, t_int x3); EXTERN void canvas_resortinlets(t_canvas *x); EXTERN void canvas_resortoutlets(t_canvas *x); EXTERN void canvas_free(t_canvas *x); EXTERN void canvas_updatewindowlist( void); EXTERN void canvas_editmode(t_canvas *x, t_floatarg yesplease); EXTERN int canvas_isabstraction(t_canvas *x); EXTERN int canvas_istable(t_canvas *x); EXTERN int canvas_showtext(t_canvas *x); EXTERN void canvas_vis(t_canvas *x, t_floatarg f); EXTERN t_canvasenvironment *canvas_getenv(t_canvas *x); EXTERN void canvas_rename(t_canvas *x, t_symbol *s, t_symbol *dir); EXTERN void canvas_loadbang(t_canvas *x); EXTERN int canvas_hitbox(t_canvas *x, t_gobj *y, int xpos, int ypos, int *x1p, int *y1p, int *x2p, int *y2p); EXTERN int canvas_setdeleting(t_canvas *x, int flag); typedef void (*t_undofn)(t_canvas *canvas, void *buf, int action); /* a function that does UNDO/REDO */ #define UNDO_FREE 0 /* free current undo/redo buffer */ #define UNDO_UNDO 1 /* undo */ #define UNDO_REDO 2 /* redo */ EXTERN void canvas_setundo(t_canvas *x, t_undofn undofn, void *buf, const char *name); EXTERN void canvas_noundo(t_canvas *x); EXTERN int canvas_getindex(t_canvas *x, t_gobj *y); /* T.Grill - made public for dynamic object creation */ /* in g_editor.c */ EXTERN void canvas_connect(t_canvas *x, t_floatarg fwhoout, t_floatarg foutno,t_floatarg fwhoin, t_floatarg finno); EXTERN void canvas_disconnect(t_canvas *x, float index1, float outno, float index2, float inno); EXTERN int canvas_isconnected (t_canvas *x, t_text *ob1, int n1, t_text *ob2, int n2); EXTERN void canvas_selectinrect(t_canvas *x, int lox, int loy, int hix, int hiy); /* ---- functions on canvasses as objects --------------------- */ EXTERN void canvas_fattenforscalars(t_canvas *x, int *x1, int *y1, int *x2, int *y2); EXTERN void canvas_visforscalars(t_canvas *x, t_glist *glist, int vis); EXTERN int canvas_clicksub(t_canvas *x, int xpix, int ypix, int shift, int alt, int dbl, int doit); EXTERN t_glist *canvas_getglistonsuper(void); EXTERN void linetraverser_start(t_linetraverser *t, t_canvas *x); EXTERN t_outconnect *linetraverser_next(t_linetraverser *t); EXTERN void linetraverser_skipobject(t_linetraverser *t); /* --------------------- functions on tscalars --------------------- */ EXTERN void tscalar_getrect(t_tscalar *x, t_glist *owner, int *xp1, int *yp1, int *xp2, int *yp2); EXTERN void tscalar_vis(t_tscalar *x, t_glist *owner, int flag); EXTERN int tscalar_click(t_tscalar *x, int xpix, int ypix, int shift, int alt, int dbl, int doit); /* --------- functions on garrays (graphical arrays) -------------------- */ EXTERN t_template *garray_template(t_garray *x); /* -------------------- arrays --------------------- */ EXTERN t_garray *graph_array(t_glist *gl, t_symbol *s, t_symbol *tmpl, t_floatarg f, t_floatarg saveit); EXTERN t_array *array_new(t_symbol *templatesym, t_gpointer *parent); EXTERN void array_resize(t_array *x, t_template *tmpl, int n); EXTERN void array_free(t_array *x); /* --------------------- gpointers and stubs ---------------- */ EXTERN t_gstub *gstub_new(t_glist *gl, t_array *a); EXTERN void gstub_cutoff(t_gstub *gs); EXTERN void gpointer_setglist(t_gpointer *gp, t_glist *glist, t_scalar *x); /* --------------------- scalars ------------------------- */ EXTERN void word_init(t_word *wp, t_template *tmpl, t_gpointer *gp); EXTERN void word_restore(t_word *wp, t_template *tmpl, int argc, t_atom *argv); EXTERN t_scalar *scalar_new(t_glist *owner, t_symbol *templatesym); EXTERN void scalar_getbasexy(t_scalar *x, float *basex, float *basey); /* ------helper routines for "garrays" and "plots" -------------- */ EXTERN int array_doclick(t_array *array, t_glist *glist, t_gobj *gobj, t_symbol *elemtemplatesym, float linewidth, float xloc, float xinc, float yloc, int xpix, int ypix, int shift, int alt, int dbl, int doit); EXTERN void array_getcoordinate(t_glist *glist, char *elem, int xonset, int yonset, int wonset, int indx, float basex, float basey, float xinc, float *xp, float *yp, float *wp); EXTERN int array_getfields(t_symbol *elemtemplatesym, t_canvas **elemtemplatecanvasp, t_template **elemtemplatep, int *elemsizep, int *xonsetp, int *yonsetp, int *wonsetp); /* --------------------- templates ------------------------- */ EXTERN t_template *template_new(t_symbol *sym, int argc, t_atom *argv); EXTERN void template_free(t_template *x); EXTERN int template_match(t_template *x1, t_template *x2); EXTERN int template_find_field(t_template *x, t_symbol *name, int *p_onset, int *p_type, t_symbol **p_arraytype); EXTERN t_float template_getfloat(t_template *x, t_symbol *fieldname, t_word *wp, int loud); EXTERN void template_setfloat(t_template *x, t_symbol *fieldname, t_word *wp, t_float f, int loud); EXTERN t_symbol *template_getsymbol(t_template *x, t_symbol *fieldname, t_word *wp, int loud); EXTERN void template_setsymbol(t_template *x, t_symbol *fieldname, t_word *wp, t_symbol *s, int loud); EXTERN t_template *gtemplate_get(t_gtemplate *x); EXTERN t_template *template_findbyname(t_symbol *s); EXTERN t_canvas *template_findcanvas(t_template *tmpl); EXTERN t_float template_getfloat(t_template *x, t_symbol *fieldname, t_word *wp, int loud); EXTERN void template_setfloat(t_template *x, t_symbol *fieldname, t_word *wp, t_float f, int loud); EXTERN t_symbol *template_getsymbol(t_template *x, t_symbol *fieldname, t_word *wp, int loud); EXTERN void template_setsymbol(t_template *x, t_symbol *fieldname, t_word *wp, t_symbol *s, int loud); /* ----------------------- guiconnects, g_guiconnect.c --------- */ EXTERN t_guiconnect *guiconnect_new(t_pd *who, t_symbol *sym); EXTERN void guiconnect_notarget(t_guiconnect *x, double timedelay); /* ------------- IEMGUI routines used in other g_ files ---------------- */ EXTERN t_symbol *iemgui_raute2dollar(t_symbol *s); EXTERN t_symbol *iemgui_dollar2raute(t_symbol *s); #if defined(_LANGUAGE_C_PLUS_PLUS) || defined(__cplusplus) } #endif #else #define __G_CANVAS_H #endif

1 0

externals/ggee makefile,NONE,1.1 makefile.sub,NONE,1.1
by Guenter Geiger 01 Jul '05

01 Jul '05

Update of /cvsroot/pure-data/externals/ggee In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4351 Added Files: makefile makefile.sub Log Message: added --- NEW FILE: makefile.sub --- prefix=$(DESTDIR)/usr EXTERNALS = $(shell ls *.c) STRIP = strip --strip-unneeded -R .note -R .comment linux: $(EXTERNALS:.c=.pd_linux) win: $(EXTERNALS:.c=.dll) osx: $(EXTERNALS:.c=.pd_darwin) .SUFFIXES: .pd_linux .pd_darwin .dll WARNFLAGS = -Wall -W -Wshadow -Wstrict-prototypes \ -Wno-unused -Wno-parentheses -Wno-switch CFLAGS + = -fPIC -DPD $(WARNFLAGS) INCLUDES = -I.. -I../include # the linux compilation target %.pd_linux: %.c $(CC) $(CFLAGS) $(INCLUDES) -o "$*.o" -c $*.c gcc -Wl,-export_dynamic -shared -o "$*.pd_linux" "$*.o" -lc -lm chmod a-x "$*.pd_linux" rm -f "$*.o" # the windows mingw target %.dll: ../src/%.c $(CC) -mms-bitfields $(CFLAGS) $(DEFINES) $(INCLUDE) -o "$*.o" -c "../src/$*.c" gcc -shared -o "$*.dll" "$*.o" $(PDPATH)/bin/pd.dll strip: $(STRIP) *.pd_linux clean: -rm *.pd_linux *~ *.dll *.pd_darwin *.o --- NEW FILE: makefile --- VERSION=$(shell cat VERSION) compile: make -f ../makefile.sub -C control make -f ../makefile.sub -C filters make -f ../makefile.sub -C gui make -f ../makefile.sub -C signal make -f ../makefile.sub -C experimental clean: rm -r ggee-$(VERSION) make -f ../makefile.sub -C control clean make -f ../makefile.sub -C filters clean make -f ../makefile.sub -C gui clean make -f ../makefile.sub -C signal clean make -f ../makefile.sub -C experimental clean package: -mkdir ggee-$(VERSION) -cp `find . -name "*.pd_linux"` ggee-$(VERSION) -cp `find . -name "*.pd_darwin"` ggee-$(VERSION) -cp `find . -name "*.dll"` ggee-$(VERSION) cp `find . -name "*help.pd"` ggee-$(VERSION)

1 0

externals/ggee/experimental makefile,1.1,NONE
by Guenter Geiger 01 Jul '05

01 Jul '05

Update of /cvsroot/pure-data/externals/ggee/experimental In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4351/experimental Removed Files: makefile Log Message: added --- makefile DELETED ---

1 0

externals/ggee/experimental tabwrite4~.c,NONE,1.1
by Guenter Geiger 01 Jul '05

01 Jul '05

Update of /cvsroot/pure-data/externals/ggee/experimental In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1184 Added Files: tabwrite4~.c Log Message: blurb --- NEW FILE: tabwrite4~.c --- #include <m_pd.h> #include <math.h> #include <stdio.h> // fprintf /* ------------------------- tabwrite4~ -------------------------- */ static t_class *tabwrite4_tilde_class; typedef struct _tabwrite4_tilde { t_object x_obj; int x_phase; int x_npoints; float *x_vec; t_symbol *x_arrayname; float x_f; t_sample x_1; t_sample x_2; t_sample x_3; t_sample x_4; float x_index; } t_tabwrite4_tilde; static void tabwrite4_tilde_tick(t_tabwrite4_tilde *x); static void *tabwrite4_tilde_new(t_symbol *s) { t_tabwrite4_tilde *x = (t_tabwrite4_tilde *)pd_new(tabwrite4_tilde_class); x->x_phase = 0x7fffffff; x->x_arrayname = s; x->x_f = 0; x->x_1 = 0.; x->x_2 = 0.; x->x_3 = 0.; inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_signal, &s_signal); outlet_new(&x->x_obj, &s_signal); return (x); } static void tabwrite4_tilde_redraw(t_tabwrite4_tilde *x) { t_garray *a = (t_garray *)pd_findbyclass(x->x_arrayname, garray_class); if (!a) bug("tabwrite4_tilde_redraw"); else garray_redraw(a); } static t_int *tabwrite4_tilde_perform(t_int *w) { t_tabwrite4_tilde *x = (t_tabwrite4_tilde *)(w[1]); t_float *in1 = (t_float *)(w[2]); t_float *in2 = (t_float *)(w[3]); int n = (int)(w[4]); t_float* end = in1 + n; t_float* end2 = in2 + n; float *buf = x->x_vec, *fp, a,b,c,d; float findex = *in2; float frac; int iindex = (int)findex; int wraparound = 0; int maxindex = x->x_npoints-1; if (!buf) return (w+5); b = x->x_1; c = x->x_2; d = x->x_3; while (n--) { float cminusb; findex = *in2++; #if 0 while ((int)findex > iindex) { iindex++; *(buf+iindex) = *(buf+iindex-1); } #endif iindex = (int)findex; // post("iindex %d, findex %f",iindex,findex); if (in2 < end2 && findex > *in2) { wraparound = 1; post("wraparound"); } a=b; b=c; c=d; d = *in1++; frac = findex - iindex; iindex +=64; // one blocksize and 4 points if (iindex < 0) { iindex += maxindex+1; } else if (iindex > maxindex) { iindex -= maxindex; } fp = buf + iindex; cminusb = c-b; *fp = b + frac * ( cminusb - 0.1666667f * (1.-frac) * ( (d - a - 3.0f * cminusb) * frac + (d + 2.0f*a - 3.0f*b) ) ); } post("written to %d",iindex); x->x_1 = b; x->x_2 = c; x->x_3 = d; #if 0 buf[maxindex-2] = buf[maxindex-3]*0.5; buf[maxindex-1] = buf[maxindex-2]*0.5; buf[maxindex] = buf[maxindex-1]*0.5; buf[2] = buf[3]*0.5; buf[1] = buf[2]*0.5; buf[0] = buf[1]*0.5; #endif if (wraparound) tabwrite4_tilde_redraw(x); return (w+5); } void tabwrite4_tilde_set(t_tabwrite4_tilde *x, t_symbol *s) { t_garray *a; x->x_arrayname = s; if (!(a = (t_garray *)pd_findbyclass(x->x_arrayname, garray_class))) { if (*s->s_name) pd_error(x, "tabwrite4~: %s: no such array", x->x_arrayname->s_name); x->x_vec = 0; } else if (!garray_getfloatarray(a, &x->x_npoints, &x->x_vec)) { pd_error(x, "%s: bad template for tabwrite4~", x->x_arrayname->s_name); x->x_vec = 0; } else garray_usedindsp(a); } static void tabwrite4_tilde_dsp(t_tabwrite4_tilde *x, t_signal **sp) { tabwrite4_tilde_set(x, x->x_arrayname); dsp_add(tabwrite4_tilde_perform, 4, x, sp[0]->s_vec, sp[1]->s_vec, sp[0]->s_n); } static void tabwrite4_tilde_bang(t_tabwrite4_tilde *x) { x->x_phase = 0; } static void tabwrite4_tilde_start(t_tabwrite4_tilde *x, t_floatarg f) { x->x_phase = (f > 0 ? f : 0); } static void tabwrite4_tilde_stop(t_tabwrite4_tilde *x) { if (x->x_phase != 0x7fffffff) { tabwrite4_tilde_redraw(x); x->x_phase = 0x7fffffff; } } void tabwrite4_tilde_setup(void) { tabwrite4_tilde_class = class_new(gensym("tabwrite4~"), (t_newmethod)tabwrite4_tilde_new, 0, sizeof(t_tabwrite4_tilde), 0, A_DEFSYM, 0); CLASS_MAINSIGNALIN(tabwrite4_tilde_class, t_tabwrite4_tilde, x_f); class_addmethod(tabwrite4_tilde_class, (t_method)tabwrite4_tilde_dsp, gensym("dsp"), 0); class_addmethod(tabwrite4_tilde_class, (t_method)tabwrite4_tilde_set, gensym("set"), A_SYMBOL, 0); class_addmethod(tabwrite4_tilde_class, (t_method)tabwrite4_tilde_stop, gensym("stop"), 0); class_addmethod(tabwrite4_tilde_class, (t_method)tabwrite4_tilde_start, gensym("start"), A_DEFFLOAT, 0); class_addbang(tabwrite4_tilde_class, tabwrite4_tilde_bang); }

1 0

externals/ggee/gui envgen.c, 1.9, 1.10 slider.c, 1.11, 1.12 sliderh.c, 1.5, 1.6
by Guenter Geiger 01 Jul '05

01 Jul '05

Update of /cvsroot/pure-data/externals/ggee/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26862 Modified Files: envgen.c slider.c sliderh.c Log Message: who knows what Index: sliderh.c =================================================================== RCS file: /cvsroot/pure-data/externals/ggee/gui/sliderh.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** sliderh.c 24 Feb 2005 14:55:29 -0000 1.5 --- sliderh.c 1 Jul 2005 07:51:03 -0000 1.6 *************** *** 19,34 **** t_fatom *x = (t_fatom *)z; ! binbuf_addv(b, "ssiisiiisss", gensym("#X"),gensym("obj"), x->x_obj.te_xpix, x->x_obj.te_ypix , ! gensym("sliderh"),x->x_max,x->x_min,x->x_width,x->x_send,x->x_color,x->x_bgcolor); binbuf_addv(b, ";"); } ! static void *sliderh_new(t_symbol* s, int argc, t_atom* argv) { t_fatom *x = (t_fatom *)pd_new(sliderh_class); x->x_type = gensym("hslider"); ! return fatom_new(x,argc,argv); } --- 19,34 ---- t_fatom *x = (t_fatom *)z; ! binbuf_addv(b, "ssiisiii", gensym("#X"),gensym("obj"), x->x_obj.te_xpix, x->x_obj.te_ypix , ! gensym("sliderh"),x->x_max,x->x_min,x->x_width); binbuf_addv(b, ";"); } ! static void *sliderh_new(t_floatarg max, t_floatarg min,t_floatarg h) { t_fatom *x = (t_fatom *)pd_new(sliderh_class); x->x_type = gensym("hslider"); ! return fatom_new(x,max,min,h,&s_); } *************** *** 39,43 **** ! void sliderh_setup(void) { sliderh_class = class_new(gensym("sliderh"), (t_newmethod)sliderh_new, 0, sizeof(t_fatom),0,A_DEFFLOAT,A_DEFFLOAT,A_DEFFLOAT,0); --- 39,43 ---- ! void sliderh_setup() { sliderh_class = class_new(gensym("sliderh"), (t_newmethod)sliderh_new, 0, sizeof(t_fatom),0,A_DEFFLOAT,A_DEFFLOAT,A_DEFFLOAT,0); Index: slider.c =================================================================== RCS file: /cvsroot/pure-data/externals/ggee/gui/slider.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** slider.c 24 Feb 2005 14:55:29 -0000 1.11 --- slider.c 1 Jul 2005 07:51:03 -0000 1.12 *************** *** 10,25 **** t_fatom *x = (t_fatom *)z; ! binbuf_addv(b, "ssiisiiisss", gensym("#X"),gensym("obj"), x->x_obj.te_xpix, x->x_obj.te_ypix , ! gensym("slider"),x->x_max,x->x_min,x->x_width,x->x_send,x->x_color,x->x_bgcolor); binbuf_addv(b, ";"); } ! static void *slider_new(t_symbol* s,t_int argc, t_atom* argv) { t_fatom *x = (t_fatom *)pd_new(slider_class); x->x_type = gensym("vslider"); ! return fatom_new(x,argc,argv); } --- 10,25 ---- t_fatom *x = (t_fatom *)z; ! binbuf_addv(b, "ssiisiii", gensym("#X"),gensym("obj"), x->x_obj.te_xpix, x->x_obj.te_ypix , ! gensym("slider"),x->x_max,x->x_min,x->x_width); binbuf_addv(b, ";"); } ! static void *slider_new(t_floatarg max, t_floatarg min, t_floatarg h) { t_fatom *x = (t_fatom *)pd_new(slider_class); x->x_type = gensym("vslider"); ! return fatom_new(x,max,min,h,&s_); } *************** *** 28,53 **** ! void slider_setup(void) { slider_class = class_new(gensym("slider"), (t_newmethod)slider_new, 0, ! sizeof(t_fatom),0,A_GIMME,0); ! slider_widgetbehavior.w_getrectfn = fatom_getrect; ! slider_widgetbehavior.w_displacefn = fatom_displace; ! slider_widgetbehavior.w_selectfn = fatom_select; ! slider_widgetbehavior.w_activatefn = fatom_activate; ! slider_widgetbehavior.w_deletefn = fatom_delete; ! slider_widgetbehavior.w_visfn= fatom_vis; ! slider_widgetbehavior.w_clickfn = NULL; ! ! fatom_setup_common(slider_class); ! class_setwidget(slider_class,&slider_widgetbehavior); ! #if PD_MINOR_VERSION < 37 ! slider_widgetbehavior.w_savefn = slider_save; ! slider_widgetbehavior.w_propertiesfn = NULL; ! #else class_setsavefn(slider_class,&slider_save); - class_setpropertiesfn(slider_class,&fatom_properties); #endif ! } --- 28,52 ---- ! void slider_setup() { slider_class = class_new(gensym("slider"), (t_newmethod)slider_new, 0, ! sizeof(t_fatom),0,A_DEFFLOAT,A_DEFFLOAT,A_DEFFLOAT,0); ! slider_widgetbehavior.w_getrectfn = fatom_getrect, ! slider_widgetbehavior.w_displacefn = fatom_displace, ! slider_widgetbehavior.w_selectfn = fatom_select, ! slider_widgetbehavior.w_activatefn = fatom_activate, ! slider_widgetbehavior.w_deletefn = fatom_delete, ! slider_widgetbehavior.w_visfn= fatom_vis, #if PD_MINOR_VERSION < 37 ! slider_widgetbehavior.w_savefn = slider_save, ! slider_widgetbehavior.w_propertiesfn = NULL, ! #endif ! slider_widgetbehavior.w_clickfn = NULL, ! ! fatom_setup_common(slider_class); ! class_setwidget(slider_class,&slider_widgetbehavior); ! #if PD_MINOR_VERSION >= 37 class_setsavefn(slider_class,&slider_save); #endif ! class_setpropertiesfn(slider_class,&fatom_properties); } Index: envgen.c =================================================================== RCS file: /cvsroot/pure-data/externals/ggee/gui/envgen.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** envgen.c 8 Feb 2005 09:28:44 -0000 1.9 --- envgen.c 1 Jul 2005 07:51:03 -0000 1.10 *************** *** 8,12 **** #define NONE 0 #define ATTACK 1 ! #define SUSTAIN 3 #define STATES 100 --- 8,12 ---- #define NONE 0 #define ATTACK 1 ! #define SUSTAIN -1 #define STATES 100 *************** *** 188,191 **** --- 188,202 ---- } + void envgen_release(t_envgen* x) { + t_atom a[2]; + float del = x->duration[x->x_state] - x->duration[x->x_state-1]; + if (x->x_state <= x->sustain_state) { + x->x_state = x->sustain_state+1; /* skip sustain state */ + clock_delay(x->x_clock,del); + SETFLOAT(a,x->finalvalues[x->x_state]*(x->max-x->min)); + SETFLOAT(a+1,del); + OUT_LIST(x,2,a); + } + } static void envgen_sustain(t_envgen *x, t_floatarg f) *************** *** 200,204 **** t_atom a[2]; x->x_state++; ! if (x->x_state <= x->last_state) { float del = x->duration[x->x_state] - x->duration[x->x_state-1]; clock_delay(x->x_clock,del); --- 211,215 ---- t_atom a[2]; x->x_state++; ! if (x->x_state <= x->last_state && x->x_state != x->sustain_state) { float del = x->duration[x->x_state] - x->duration[x->x_state-1]; clock_delay(x->x_clock,del); *************** *** 207,212 **** OUT_LIST(x,2,a); } ! else ! clock_unset(x->x_clock); } --- 218,223 ---- OUT_LIST(x,2,a); } ! // else ! // clock_unset(x->x_clock); } *************** *** 322,326 **** class_addmethod(envgen_class,(t_method)envgen_setresize,gensym("resize"),A_FLOAT,A_NULL); ! envgen_widgetbehavior.w_getrectfn = envgen_getrect; envgen_widgetbehavior.w_displacefn = envgen_displace; envgen_widgetbehavior.w_selectfn = envgen_select; --- 333,338 ---- class_addmethod(envgen_class,(t_method)envgen_setresize,gensym("resize"),A_FLOAT,A_NULL); ! class_addmethod(envgen_class,(t_method)envgen_release,gensym("release"),A_NULL); ! envgen_widgetbehavior.w_getrectfn = envgen_getrect; envgen_widgetbehavior.w_displacefn = envgen_displace; envgen_widgetbehavior.w_selectfn = envgen_select;

1 0

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 July 2005