Pd-cvs November 2007

pd-cvs@lists.iem.at

14 participants
212 discussions

externals/iem/iem_ambi/src makefile_darwin, NONE, 1.1 makefile_d_ppc, NONE, 1.1 makefile_d_fat, NONE, 1.1
by musil 08 Nov '07

08 Nov '07

Update of /cvsroot/pure-data/externals/iem/iem_ambi/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15512 Added Files: makefile_darwin makefile_d_ppc makefile_d_fat Log Message: mac makes --- NEW FILE: makefile_d_fat --- current: all .SUFFIXES: .d_fat PD_INSTALL_PATH = "/Applications/Pd.app/Contents/Resources" INCLUDE = -I. -I$(PD_INSTALL_PATH)/src CFLAGS =-DPD -O2 -Wall -W -Wshadow -Wstrict-prototypes \ -Wno-unused -Wno-parentheses -Wno-switch LFLAGS = -bundle -undefined suppress -flat_namespace # the sources SRC = ambi_decode.c \ ambi_decode2.c \ ambi_decode3.c \ ambi_decode_cube.c \ ambi_encode.c \ ambi_rot.c \ iem_ambi.c TARGET = iem_ambi.d_fat OBJ = $(SRC:.c=.o) # # ------------------ targets ------------------------------------ # clean: rm ../$(TARGET) rm *.o all: $(OBJ) @echo :: $(OBJ) $(CC) -arch i386 -arch ppc $(LFLAGS) -o $(TARGET) *.o strip -S -x $(TARGET) mv $(TARGET) .. $(OBJ) : %.o : %.c touch $*.c $(CC) -arch i386 -arch ppc $(CFLAGS) $(INCLUDE) -c -o $*.o $*.c --- NEW FILE: makefile_d_ppc --- current: all .SUFFIXES: .d_ppc PD_INSTALL_PATH = "/Applications/Pd.app/Contents/Resources" INCLUDE = -I. -I$(PD_INSTALL_PATH)/src CFLAGS =-DPD -O2 -Wall -W -Wshadow -Wstrict-prototypes \ -Wno-unused -Wno-parentheses -Wno-switch LFLAGS = -bundle -undefined suppress -flat_namespace # the sources SRC = ambi_decode.c \ ambi_decode2.c \ ambi_decode3.c \ ambi_decode_cube.c \ ambi_encode.c \ ambi_rot.c \ iem_ambi.c TARGET = iem_ambi.d_ppc OBJ = $(SRC:.c=.o) # # ------------------ targets ------------------------------------ # clean: rm ../$(TARGET) rm *.o all: $(OBJ) @echo :: $(OBJ) $(CC) $(LFLAGS) -o $(TARGET) *.o strip -S -x $(TARGET) mv $(TARGET) .. $(OBJ) : %.o : %.c touch $*.c $(CC) $(CFLAGS) $(INCLUDE) -c -o $*.o $*.c --- NEW FILE: makefile_darwin --- current: all .SUFFIXES: .pd_darwin PD_INSTALL_PATH = "/Applications/Pd.app/Contents/Resources" INCLUDE = -I. -I$(PD_INSTALL_PATH)/src LIB = -ldl -lm -lpthread CFLAGS = -DPD -DUNIX -g -Wall -W -Werror -Wno-unused \ -Wno-parentheses -Wno-switch -O2 -fno-strict-aliasing \ $(INCLUDE) $(UCFLAGS) $(AFLAGS) \ MACOSXLINKFLAGS = -bundle -bundle_loader $(PD_INSTALL_PATH)/bin/pd SYSTEM = $(shell uname -m) # the sources SRC = ambi_decode.c \ ambi_decode2.c \ ambi_decode3.c \ ambi_decode_cube.c \ ambi_encode.c \ ambi_rot.c \ iem_ambi.c TARGET = iem_ambi.pd_darwin OBJ = $(SRC:.c=.o) # # ------------------ targets ------------------------------------ # clean: rm ../$(TARGET) rm *.o all: $(OBJ) @echo :: $(OBJ) $(CC) $(MACOSXLINKFLAGS) -o $(TARGET) *.o $(LIB) strip -S -x $(TARGET) mv $(TARGET) .. $(OBJ) : %.o : %.c touch $*.c $(CC) $(CFLAGS) -DPD $(INCLUDE) -c -o $*.o $*.c

1 0

externals/iem/iem_adaptfilt/src NLMSCC~.c, 1.1, 1.2 NLMS~.c, 1.1, 1.2 iemlib.h, 1.2, 1.3 n_CLNLMS~.c, 1.1, 1.2 n_CNLMS~.c, 1.1, 1.2
by musil 08 Nov '07

08 Nov '07

Update of /cvsroot/pure-data/externals/iem/iem_adaptfilt/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14783 Modified Files: NLMSCC~.c NLMS~.c iemlib.h n_CLNLMS~.c n_CNLMS~.c Log Message: some t_int to int Index: NLMS~.c =================================================================== RCS file: /cvsroot/pure-data/externals/iem/iem_adaptfilt/src/NLMS~.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** NLMS~.c 11 Jan 2007 17:40:10 -0000 1.1 --- NLMS~.c 8 Nov 2007 13:56:44 -0000 1.2 *************** *** 50,54 **** static t_float *NLMS_tilde_check_array(t_symbol *array_sym_name, t_int length) { ! t_int n_points; t_garray *a; t_float *vec; --- 50,54 ---- static t_float *NLMS_tilde_check_array(t_symbol *array_sym_name, t_int length) { ! int n_points; t_garray *a; t_float *vec; Index: n_CNLMS~.c =================================================================== RCS file: /cvsroot/pure-data/externals/iem/iem_adaptfilt/src/n_CNLMS~.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** n_CNLMS~.c 11 Jan 2007 17:40:10 -0000 1.1 --- n_CNLMS~.c 8 Nov 2007 13:56:44 -0000 1.2 *************** *** 68,72 **** static t_float *n_CNLMS_tilde_check_array(t_symbol *array_sym_name, t_int length) { ! t_int n_points; t_garray *a; t_float *vec; --- 68,72 ---- static t_float *n_CNLMS_tilde_check_array(t_symbol *array_sym_name, t_int length) { ! int n_points; t_garray *a; t_float *vec; *************** *** 389,393 **** t_n_CNLMS_tilde *x = (t_n_CNLMS_tilde *)pd_new(n_CNLMS_tilde_class); char buffer[400]; ! t_int i, n_order=39, n_io=1; t_symbol *w_name; t_float beta=0.1f; --- 389,394 ---- t_n_CNLMS_tilde *x = (t_n_CNLMS_tilde *)pd_new(n_CNLMS_tilde_class); char buffer[400]; ! int i; ! t_int n_order=39, n_io=1; t_symbol *w_name; t_float beta=0.1f; Index: iemlib.h =================================================================== RCS file: /cvsroot/pure-data/externals/iem/iem_adaptfilt/src/iemlib.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** iemlib.h 17 Jan 2007 18:28:56 -0000 1.2 --- iemlib.h 8 Nov 2007 13:56:44 -0000 1.3 *************** *** 2,6 **** * WARRANTIES, see the file, "LICENSE.txt," in this distribution. ! iemlib written by Thomas Musil, Copyright (c) IEM KUG Graz Austria 2000 - 2006 */ #ifndef __IEMLIB_H__ --- 2,6 ---- * WARRANTIES, see the file, "LICENSE.txt," in this distribution. ! iemlib written by Thomas Musil, Copyright (c) IEM KUG Graz Austria 2000 - 2007 */ #ifndef __IEMLIB_H__ *************** *** 16,21 **** #define IS_A_COMMA(atom,index) ((atom+index)->a_type == A_COMMA) ! #ifdef NT int sys_noloadbang; //t_symbol *iemgui_key_sym=0; --- 16,26 ---- #define IS_A_COMMA(atom,index) ((atom+index)->a_type == A_COMMA) + /* now miller's code starts : + for 4 point interpolation + for lookup tables + for denormal floats + */ ! #ifdef MSW int sys_noloadbang; //t_symbol *iemgui_key_sym=0; *************** *** 31,72 **** #define SAMPBLK 4 - #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 MSW ! /* 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 --- 36,71 ---- #define SAMPBLK 4 #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 */ ! #endif /* IRIX */ ! #ifdef MSW ! /* little-endian; most significant byte is at highest address */ #define HIOFFSET 1 #define LOWOFFSET 0 #define int32 long ! #endif /* MSW */ ! ! #if defined(__FreeBSD__) || defined(__APPLE__) #include <machine/endian.h> #endif + #ifdef __linux__ #include <endian.h> + #endif ! #if defined(__unix__) || defined(__APPLE__) ! #if !defined(BYTE_ORDER) || !defined(LITTLE_ENDIAN) #error No byte order defined #endif ! #if BYTE_ORDER == LITTLE_ENDIAN #define HIOFFSET 1 #define LOWOFFSET 0 *************** *** 75,99 **** #define LOWOFFSET 1 /* word offset to find LSB */ #endif /* __BYTE_ORDER */ - #include <sys/types.h> #define int32 int32_t ! #else ! #ifdef __APPLE__ ! #ifdef __BIG_ENDIAN__ ! #define HIOFFSET 0 /* word offset to find MSB */ ! #define LOWOFFSET 1 /* word offset to find LSB */ ! #else ! #define HIOFFSET 1 /* word offset to find MSB */ ! #define LOWOFFSET 0 /* word offset to find LSB */ ! #endif ! #define int32 int /* a data type that has 32 bits */ ! ! #endif /* __APPLE__ */ ! #endif /* __linux__ */ ! #endif /* MSW */ ! #endif /* SGI */ ! ! union tabfudge { double tf_d; --- 74,82 ---- #define LOWOFFSET 1 /* word offset to find LSB */ #endif /* __BYTE_ORDER */ #include <sys/types.h> #define int32 int32_t + #endif /* __unix__ or __APPLE__*/ ! union tabfudge_d { double tf_d; *************** *** 101,104 **** --- 84,93 ---- }; + union tabfudge_f + { + float tf_f; + long tf_l; + }; + #if defined __i386__ || defined __x86_64__ #define IEM_DENORMAL(f) ((((*(unsigned int*)&(f))&0x60000000)==0) || \ Index: n_CLNLMS~.c =================================================================== RCS file: /cvsroot/pure-data/externals/iem/iem_adaptfilt/src/n_CLNLMS~.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** n_CLNLMS~.c 11 Jan 2007 17:40:10 -0000 1.1 --- n_CLNLMS~.c 8 Nov 2007 13:56:44 -0000 1.2 *************** *** 69,73 **** static t_float *n_CLNLMS_tilde_check_array(t_symbol *array_sym_name, t_int length) { ! t_int n_points; t_garray *a; t_float *vec; --- 69,73 ---- static t_float *n_CLNLMS_tilde_check_array(t_symbol *array_sym_name, t_int length) { ! int n_points; t_garray *a; t_float *vec; *************** *** 400,404 **** t_n_CLNLMS_tilde *x = (t_n_CLNLMS_tilde *)pd_new(n_CLNLMS_tilde_class); char buffer[400]; ! t_int i, n_order=39, n_io=1; t_symbol *w_name; t_float beta=0.1f; --- 400,405 ---- t_n_CLNLMS_tilde *x = (t_n_CLNLMS_tilde *)pd_new(n_CLNLMS_tilde_class); char buffer[400]; ! int i; ! t_int n_order=39, n_io=1; t_symbol *w_name; t_float beta=0.1f; Index: NLMSCC~.c =================================================================== RCS file: /cvsroot/pure-data/externals/iem/iem_adaptfilt/src/NLMSCC~.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** NLMSCC~.c 11 Jan 2007 17:40:10 -0000 1.1 --- NLMSCC~.c 8 Nov 2007 13:56:44 -0000 1.2 *************** *** 22,26 **** /* ----------------------- NLMSCC~ ------------------------------ */ /* -- Normalized Least Mean Square (linear adaptive FIR-filter) -- */ ! /* -- with Coefficient Constraint /* -- first input: reference signal -- */ /* -- second input: desired signal -- */ --- 22,26 ---- /* ----------------------- NLMSCC~ ------------------------------ */ /* -- Normalized Least Mean Square (linear adaptive FIR-filter) -- */ ! /* -- with Coefficient Constraint -- */ /* -- first input: reference signal -- */ /* -- second input: desired signal -- */ *************** *** 62,66 **** static t_float *NLMSCC_tilde_check_array(t_symbol *array_sym_name, t_int length) { ! t_int n_points; t_garray *a; t_float *vec; --- 62,66 ---- static t_float *NLMSCC_tilde_check_array(t_symbol *array_sym_name, t_int length) { ! int n_points; t_garray *a; t_float *vec;

1 0

externals/iem/iem_adaptfilt/src makefile_darwin, NONE, 1.1 makefile_d_ppc, NONE, 1.1 makefile_d_fat, NONE, 1.1
by musil 08 Nov '07

08 Nov '07

Update of /cvsroot/pure-data/externals/iem/iem_adaptfilt/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14413 Added Files: makefile_darwin makefile_d_ppc makefile_d_fat Log Message: mac makes --- NEW FILE: makefile_d_fat --- current: all .SUFFIXES: .d_fat PD_INSTALL_PATH = "/Applications/Pd.app/Contents/Resources" INCLUDE = -I. -I$(PD_INSTALL_PATH)/src CFLAGS =-DPD -O2 -Wall -W -Wshadow -Wstrict-prototypes \ -Wno-unused -Wno-parentheses -Wno-switch LFLAGS = -bundle -undefined suppress -flat_namespace # the sources SRC = NLMS~.c \ NLMSCC~.c \ n_CNLMS~.c \ n_CLNLMS~.c \ iem_adaptfilt.c TARGET = iem_adaptfilt.d_fat OBJ = $(SRC:.c=.o) # # ------------------ targets ------------------------------------ # clean: rm ../$(TARGET) rm *.o all: $(OBJ) @echo :: $(OBJ) $(CC) -arch i386 -arch ppc $(LFLAGS) -o $(TARGET) *.o strip -S -x $(TARGET) mv $(TARGET) .. $(OBJ) : %.o : %.c touch $*.c $(CC) -arch i386 -arch ppc $(CFLAGS) $(INCLUDE) -c -o $*.o $*.c --- NEW FILE: makefile_d_ppc --- current: all .SUFFIXES: .d_ppc PD_INSTALL_PATH = "/Applications/Pd.app/Contents/Resources" INCLUDE = -I. -I$(PD_INSTALL_PATH)/src CFLAGS =-DPD -O2 -Wall -W -Wshadow -Wstrict-prototypes \ -Wno-unused -Wno-parentheses -Wno-switch LFLAGS = -bundle -undefined suppress -flat_namespace # the sources SRC = NLMS~.c \ NLMSCC~.c \ n_CNLMS~.c \ n_CLNLMS~.c \ iem_adaptfilt.c TARGET = iem_adaptfilt.d_ppc OBJ = $(SRC:.c=.o) # # ------------------ targets ------------------------------------ # clean: rm ../$(TARGET) rm *.o all: $(OBJ) @echo :: $(OBJ) $(CC) $(LFLAGS) -o $(TARGET) *.o strip -S -x $(TARGET) mv $(TARGET) .. $(OBJ) : %.o : %.c touch $*.c $(CC) $(CFLAGS) $(INCLUDE) -c -o $*.o $*.c --- NEW FILE: makefile_darwin --- current: all .SUFFIXES: .pd_darwin PD_INSTALL_PATH = "/Applications/Pd.app/Contents/Resources" INCLUDE = -I. -I$(PD_INSTALL_PATH)/src LIB = -ldl -lm -lpthread CFLAGS = -DPD -DUNIX -g -Wall -W -Werror -Wno-unused \ -Wno-parentheses -Wno-switch -O2 -fno-strict-aliasing \ $(INCLUDE) $(UCFLAGS) $(AFLAGS) \ MACOSXLINKFLAGS = -bundle -bundle_loader $(PD_INSTALL_PATH)/bin/pd SYSTEM = $(shell uname -m) # the sources SRC = NLMS~.c \ NLMSCC~.c \ n_CNLMS~.c \ n_CLNLMS~.c \ iem_adaptfilt.c TARGET = iem_adaptfilt.pd_darwin OBJ = $(SRC:.c=.o) # # ------------------ targets ------------------------------------ # clean: rm ../$(TARGET) rm *.o all: $(OBJ) @echo :: $(OBJ) $(CC) $(MACOSXLINKFLAGS) -o $(TARGET) *.o $(LIB) strip -S -x $(TARGET) mv $(TARGET) .. $(OBJ) : %.o : %.c touch $*.c $(CC) $(CFLAGS) -DPD $(INCLUDE) -c -o $*.o $*.c

1 0

externals/hcs colorpanel.c,1.2,1.3
by Hans-Christoph Steiner 08 Nov '07

08 Nov '07

Update of /cvsroot/pure-data/externals/hcs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17590 Modified Files: colorpanel.c Log Message: striped out unneeded debug code Index: colorpanel.c =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/colorpanel.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** colorpanel.c 5 Nov 2007 06:53:13 -0000 1.2 --- colorpanel.c 8 Nov 2007 03:34:08 -0000 1.3 *************** *** 17,22 **** static void colorpanel_bang(t_colorpanel *x) { - DEBUG(post("pd [concat %s callback [tk_chooseColor -initialcolor %s] \\;]\n", - x->x_s->s_name, x->current_color);); sys_vgui("pd [concat %s callback [tk_chooseColor -initialcolor %s] \\;]\n", x->x_s->s_name, x->current_color); --- 17,20 ----

1 0

externals/hcs sys_gui-help.pd,1.4,1.5
by Hans-Christoph Steiner 08 Nov '07

08 Nov '07

Update of /cvsroot/pure-data/externals/hcs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14356 Modified Files: sys_gui-help.pd Log Message: added highlight border example Index: sys_gui-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/sys_gui-help.pd,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** sys_gui-help.pd 6 Nov 2007 02:23:19 -0000 1.4 --- sys_gui-help.pd 8 Nov 2007 03:25:16 -0000 1.5 *************** *** 1,16 **** ! #N canvas 857 104 568 446 10; ! #X obj 69 304 sys_gui; ! #X msg 69 72 menu_doc_browser; ! #X text 178 70 open the help browser; ! #X msg 93 114 set text_color #f0f; ! #X text 222 114 set variables; ! #X msg 123 161 bang; ! #X obj 246 186 colorpanel; ! #X obj 245 161 bng 17 250 50 0 empty empty empty 17 7 0 10 -262144 ! -1 -1; ! #X text 275 160 choose a color; ! #X text 143 304 DANGER! You can mess up Pd big time with this!! :D ; ! #X text 18 28 This objects give you the ability to send raw Tcl directly to the Pd GUI process just like C objects do.; #N canvas 0 22 454 304 generate 0; --- 1,16 ---- ! #N canvas 449 123 590 584 10; ! #X obj 78 223 sys_gui; ! #X msg 27 61 menu_doc_browser; ! #X text 136 59 open the help browser; ! #X msg 51 93 set text_color #f0f; ! #X text 180 93 set variables; ! #X msg 81 120 bang; ! #X obj 304 115 colorpanel; ! #X obj 303 90 bng 17 250 50 0 empty empty empty 17 7 0 10 -262144 -1 ! -1; ! #X text 333 89 choose a color; ! #X text 135 225 DANGER! You can mess up Pd big time with this!! :D ; ! #X text -24 17 This objects give you the ability to send raw Tcl directly to the Pd GUI process just like C objects do.; #N canvas 0 22 454 304 generate 0; *************** *** 49,59 **** #X connect 15 0 1 0; #X connect 15 1 1 0; ! #X restore 246 212 pd generate web color; ! #X msg 245 236 set obj_box_fill #a3cfb5; ! #X obj 77 395 pddp/pddplink http://pure-data.cvs.sourceforge.net/pure-data/pd/src ; ! #X text 63 350 You can find things to mess with by looking thru the Pd code \, look for things that have "sys_gui" and "sys_vgui". These are Tcl/Tk commands from the pd to the Pg GUI process.; #X connect 1 0 0 0; #X connect 3 0 0 0; --- 49,120 ---- #X connect 15 0 1 0; #X connect 15 1 1 0; ! #X restore 304 141 pd generate web color; ! #X msg 303 165 set obj_box_fill #a3cfb5; ! #X obj 38 302 pddp/pddplink http://pure-data.cvs.sourceforge.net/pure-data/pd/src ; ! #X text 24 257 You can find things to mess with by looking thru the Pd code \, look for things that have "sys_gui" and "sys_vgui". These are Tcl/Tk commands from the pd to the Pg GUI process.; + #X obj 170 528 sys_gui; + #X obj 317 425 loadbang; + #X obj 317 447 canvas_name; + #X msg 179 433 black; + #X msg 136 433 green; + #X obj 33 392 colorpanel; + #N canvas 685 90 416 325 generate 0; + #X obj 81 23 inlet; + #X obj 82 262 outlet; + #X obj 83 66 unpack float float float; + #X obj 83 90 * 255; + #X obj 83 113 int; + #X obj 83 136 makefilename %x; + #X obj 183 90 * 255; + #X obj 183 113 int; + #X obj 183 136 makefilename %x; + #X obj 283 90 * 255; + #X obj 283 113 int; + #X obj 283 136 makefilename %x; + #X obj 83 171 pack symbol symbol symbol; + #X obj 83 195 zexy/makesymbol #%s%s%s; + #X connect 0 0 2 0; + #X connect 2 0 3 0; + #X connect 2 1 6 0; + #X connect 2 2 9 0; + #X connect 3 0 4 0; + #X connect 4 0 5 0; + #X connect 5 0 12 0; + #X connect 6 0 7 0; + #X connect 7 0 8 0; + #X connect 8 0 12 1; + #X connect 9 0 10 0; + #X connect 10 0 11 0; + #X connect 11 0 12 2; + #X connect 12 0 13 0; + #X connect 13 0 1 0; + #X restore 33 413 pd generate web color; + #X obj 33 348 bng 35 250 50 0 empty empty empty 17 7 0 10 -204786 -1 + -1; + #X text -29 325 change the highlight color:; + #X msg 170 498 \$3 configure -highlightcolor \$1 -highlightthickness + \$2; + #X obj 253 370 hsl 128 15 0 127 0 1 empty empty empty -2 -8 0 10 -262144 + -1 -1 500 1; + #X obj 250 398 int; + #X floatatom 282 398 5 0 0 0 - - -; + #N canvas 1009 401 454 304 pak 0; + #X obj 25 16 inlet; + #X obj 167 15 inlet; + #X obj 305 16 inlet; + #X obj 122 241 outlet; + #X obj 83 150 pack symbol 0 symbol; + #X obj 78 69 trigger bang float; + #X connect 0 0 4 0; + #X connect 1 0 5 0; + #X connect 2 0 4 2; + #X connect 4 0 3 0; + #X connect 5 0 4 0; + #X connect 5 1 4 1; + #X restore 170 469 pd pak ------------------; + #X obj 179 410 loadbang; #X connect 1 0 0 0; #X connect 3 0 0 0; *************** *** 63,64 **** --- 124,138 ---- #X connect 11 0 12 0; #X connect 12 0 0 0; + #X connect 16 0 17 0; + #X connect 17 0 28 2; + #X connect 18 0 28 0; + #X connect 19 0 28 0; + #X connect 20 0 21 0; + #X connect 21 0 28 0; + #X connect 22 0 20 0; + #X connect 24 0 15 0; + #X connect 25 0 26 0; + #X connect 25 0 27 0; + #X connect 26 0 28 1; + #X connect 28 0 24 0; + #X connect 29 0 18 0;

1 0

externals/hcs window_name.c, NONE, 1.1 window_name-help.pd, NONE, 1.1
by Hans-Christoph Steiner 08 Nov '07

08 Nov '07

Update of /cvsroot/pure-data/externals/hcs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13978 Added Files: window_name.c window_name-help.pd Log Message: created object to get current window name so you can change it's tk options --- NEW FILE: window_name.c --- #include <stdio.h> #include <string.h> #include <m_pd.h> #include <g_canvas.h> #define DEBUG(x) static t_class *window_name_class; typedef struct _window_name { t_object x_obj; t_symbol *windowname; } t_window_name; static void window_name_bang(t_window_name *x) { outlet_symbol(x->x_obj.ob_outlet,x->windowname); } static void *window_name_new(void) { t_window_name *x = (t_window_name *)pd_new(window_name_class); char buf[MAXPDSTRING]; snprintf(buf, MAXPDSTRING, ".x%lx", (long unsigned int)canvas_getcurrent()); x->windowname = gensym(buf); outlet_new(&x->x_obj, &s_symbol); return(x); } void window_name_setup(void) { window_name_class = class_new(gensym("window_name"), (t_newmethod)window_name_new, NULL, sizeof(t_window_name), 0, 0); class_addbang(window_name_class, (t_method)window_name_bang); } --- NEW FILE: window_name-help.pd --- #N canvas 431 431 476 365 10; #X obj 175 202 sys_gui; #X symbolatom 290 96 0 0 0 0 - - -; #X obj 274 27 loadbang; #X obj 175 143 pack float symbol; #X obj 110 83 hsl 128 15 0.1 1 1 1 empty empty window_alpha -2 -8 0 10 -204800 -1 -1 12700 1; #X floatatom 107 118 5 0 0 0 - - -; #X msg 175 172 wm attributes \$2 -alpha \$1; #X text 43 256 for more options:; #X obj 62 279 pddp/pddplink http://tcl.tk/man/tcl8.4/TkCmd/wm.htm; #X text 164 229 alpha does not work with X11 :(; #X obj 274 64 window_name; #X connect 2 0 10 0; #X connect 3 0 6 0; #X connect 4 0 3 0; #X connect 4 0 5 0; #X connect 6 0 0 0; #X connect 10 0 3 1; #X connect 10 0 1 0;

1 0

pd/src u_main.tk,1.25.6.5,1.25.6.6
by Hans-Christoph Steiner 08 Nov '07

08 Nov '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32442 Modified Files: Tag: branch-v0-40-extended u_main.tk Log Message: - added pdtk_canvas_rightclick method so that right-clicks don't explicitly give focus. There still seems like something else is giving focus. - made minimum canvas size 50x20 instead of 1x1 (!) - forced -highlightthickness to 0 to eliminate the black highlight around the active window - fixed find panel size and turned of resizable - made the message inlets a lighter grey Index: u_main.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v retrieving revision 1.25.6.5 retrieving revision 1.25.6.6 diff -C2 -d -r1.25.6.5 -r1.25.6.6 *** u_main.tk 6 Nov 2007 03:32:36 -0000 1.25.6.5 --- u_main.tk 8 Nov 2007 02:49:55 -0000 1.25.6.6 *************** *** 92,96 **** set signal_nlet $signal_cord set msg_cord_highlight "#474" ! set msg_cord "#121" set msg_nlet "#fff" set mixed_nlet "#88aaff" --- 92,96 ---- set signal_nlet $signal_cord set msg_cord_highlight "#474" ! set msg_cord "#565" set msg_nlet "#fff" set mixed_nlet "#88aaff" *************** *** 1007,1010 **** --- 1007,1012 ---- toplevel $name + wm geometry $name =250x100+250+100 + wm resizable $name 0 0 #bind $name <FocusIn> "puts stderr \"bind focus $name.entry\"" *************** *** 1059,1062 **** --- 1061,1065 ---- wm geometry $name $geometry canvas $name.c -width $width -height $height -background white \ + -highlightthickness 0 \ -yscrollcommand "$name.scrollvert set" \ -xscrollcommand "$name.scrollhort set" \ *************** *** 1070,1077 **** pack $name.scrollvert -side right -fill y pack $name.c -side left -expand 1 -fill both ! wm minsize $name 1 1 wm geometry $name $geometry # the file menu ! # The menus are instantiated here for the patch windows. # For the main window, they are created on load, at the --- 1073,1080 ---- pack $name.scrollvert -side right -fill y pack $name.c -side left -expand 1 -fill both ! wm minsize $name 50 20 wm geometry $name $geometry # the file menu ! # The menus are instantiated here for the patch windows. # For the main window, they are created on load, at the *************** *** 1374,1382 **** # button 2 is the right button on Mac; on other platforms it's button 3. if {$pd_nt == 2} { ! bind $name.c <Button-2> {pdtk_canvas_click %W %x %y %b 8} ! bind $name.c <Control-Button> {pdtk_canvas_click %W %x %y %b 8} } else { ! bind $name.c <Button-3> {pdtk_canvas_click %W %x %y %b 8} ! bind $name.c <Control-Button> {pdtk_canvas_click %W %x %y %b 2} } #on linux, button 2 "pastes" from the X windows clipboard --- 1377,1385 ---- # button 2 is the right button on Mac; on other platforms it's button 3. if {$pd_nt == 2} { ! bind $name.c <Button-2> {pdtk_canvas_rightclick %W %x %y %b} ! bind $name.c <Control-Button> {pdtk_canvas_rightclick %W %x %y %b} } else { ! bind $name.c <Button-3> {pdtk_canvas_rightclick %W %x %y %b} ! bind $name.c <Control-Button> {pdtk_canvas_rightclick %W %x %y %b} } #on linux, button 2 "pastes" from the X windows clipboard *************** *** 1682,1704 **** } proc pdtk_canvas_click {name x y b f} { focus $name ! pd [canvastosym $name] mouse [$name canvasx $x] [$name canvasy $y] $b $f \; } proc pdtk_canvas_shiftclick {name x y b} { ! pd [canvastosym $name] mouse [$name canvasx $x] [$name canvasy $y] $b 1 \; } proc pdtk_canvas_ctrlclick {name x y b} { ! pd [canvastosym $name] mouse [$name canvasx $x] [$name canvasy $y] $b 2 \; } proc pdtk_canvas_altclick {name x y b} { ! pd [canvastosym $name] mouse [$name canvasx $x] [$name canvasy $y] $b 3 \; } proc pdtk_canvas_dblclick {name x y b} { ! pd [canvastosym $name] mouse [$name canvasx $x] [$name canvasy $y] $b 4 \; } --- 1685,1715 ---- } + proc pdtk_canvas_sendclick {name x y b f} { + pd [canvastosym $name] mouse [$name canvasx $x] [$name canvasy $y] $b $f \; + } + proc pdtk_canvas_click {name x y b f} { focus $name ! pdtk_canvas_sendclick $name $x $y $b $f ! } ! ! proc pdtk_canvas_rightclick {name x y b} { ! pdtk_canvas_sendclick $name $x $y $b 8 } proc pdtk_canvas_shiftclick {name x y b} { ! pdtk_canvas_sendclick $name $x $y $b 1 } proc pdtk_canvas_ctrlclick {name x y b} { ! pdtk_canvas_sendclick $name $x $y $b 2 } proc pdtk_canvas_altclick {name x y b} { ! pdtk_canvas_sendclick $name $x $y $b 3 } proc pdtk_canvas_dblclick {name x y b} { ! pdtk_canvas_sendclick $name $x $y $b 4 }

1 0

externals/hcs canvas_name-help.pd,NONE,1.1
by Hans-Christoph Steiner 08 Nov '07

08 Nov '07

Update of /cvsroot/pure-data/externals/hcs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10245 Added Files: canvas_name-help.pd Log Message: got web color conversion working --- NEW FILE: canvas_name-help.pd --- #N canvas 276 245 480 392 10; #X obj 156 276 sys_gui; #X symbolatom 274 192 0 0 0 0 - - -; #X obj 261 131 loadbang; #X msg 156 246 \$2 configure -background \$1; #X obj 156 217 pack symbol symbol; #X obj 106 50 colorpanel; #X obj 87 342 pddp/pddplink http://tcl.tk/man/tcl8.4/TkCmd/canvas.htm ; #X text 54 316 for more options:; #N canvas 685 90 416 325 generate 0; #X obj 81 23 inlet; #X obj 82 262 outlet; #X obj 83 66 unpack float float float; #X obj 83 90 * 255; #X obj 83 113 int; #X obj 83 136 makefilename %x; #X obj 183 90 * 255; #X obj 183 113 int; #X obj 183 136 makefilename %x; #X obj 283 90 * 255; #X obj 283 113 int; #X obj 283 136 makefilename %x; #X obj 83 171 pack symbol symbol symbol; #X obj 83 195 zexy/makesymbol #%s%s%s; #X connect 0 0 2 0; #X connect 2 0 3 0; #X connect 2 1 6 0; #X connect 2 2 9 0; #X connect 3 0 4 0; #X connect 4 0 5 0; #X connect 5 0 12 0; #X connect 6 0 7 0; #X connect 7 0 8 0; #X connect 8 0 12 1; #X connect 9 0 10 0; #X connect 10 0 11 0; #X connect 11 0 12 2; #X connect 12 0 13 0; #X connect 13 0 1 0; #X restore 106 71 pd generate web color; #X obj 106 6 bng 35 250 50 0 empty empty empty 17 7 0 10 -204786 -1 -1; #X symbolatom 126 99 10 0 0 0 - - -; #X obj 218 279 print; #X obj 261 168 canvas_name; #X msg 158 129 grey; #X msg 168 148 white; #X msg 178 169 pink; #X msg 182 191 black; #X connect 2 0 12 0; #X connect 3 0 0 0; #X connect 3 0 11 0; #X connect 4 0 3 0; #X connect 5 0 8 0; #X connect 8 0 10 0; #X connect 8 0 4 0; #X connect 9 0 5 0; #X connect 12 0 1 0; #X connect 12 0 4 1; #X connect 13 0 4 0; #X connect 14 0 4 0; #X connect 15 0 4 0; #X connect 16 0 4 0;

1 0

externals/hcs cursor.c,1.5,1.6 cursor-help.pd,1.4,1.5
by Hans-Christoph Steiner 08 Nov '07

08 Nov '07

Update of /cvsroot/pure-data/externals/hcs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7322 Modified Files: cursor.c cursor-help.pd Log Message: bind to . instead of all to get absolute cursor position rather than canvas cursor position Index: cursor-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/cursor-help.pd,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** cursor-help.pd 6 Nov 2007 02:30:53 -0000 1.4 --- cursor-help.pd 8 Nov 2007 01:36:03 -0000 1.5 *************** *** 1,3 **** ! #N canvas 309 199 638 505 10; #X obj 136 401 pddp/print; #X obj 95 342 tgl 15 0 empty empty empty 0 -6 0 10 -262144 -1 -1 0 --- 1,3 ---- ! #N canvas 121 272 642 509 10; #X obj 136 401 pddp/print; #X obj 95 342 tgl 15 0 empty empty empty 0 -6 0 10 -262144 -1 -1 0 *************** *** 7,14 **** #X text 111 339 poll the mouse pointer position; #X text 101 318 get the current mouse position; ! #X obj 163 26 pddp/pddplink http://tcl.tk/man/tcl8.4/TkCmd/cursors.htm ; ! #X text 48 9 Here's a complete list of the available cursors:; ! #X msg 169 229 runmode_clickme dot; #X msg 322 151 boat; #X msg 282 151 clock; --- 7,14 ---- #X text 111 339 poll the mouse pointer position; #X text 101 318 get the current mouse position; ! #X obj 346 278 pddp/pddplink http://tcl.tk/man/tcl8.4/TkCmd/cursors.htm ; ! #X text 231 261 Here's a complete list of the available cursors:; ! #X msg 169 229 runmode_disconnect gumby; #X msg 322 151 boat; #X msg 282 151 clock; *************** *** 19,23 **** #X msg 458 151 pirate; #X msg 42 44 runmode_nothing; ! #N canvas 0 22 454 304 make 0; #X obj 95 9 inlet; #X obj 114 258 outlet; --- 19,23 ---- #X msg 458 151 pirate; #X msg 42 44 runmode_nothing; ! #N canvas 0 22 462 312 make 0; #X obj 95 9 inlet; #X obj 114 258 outlet; *************** *** 47,59 **** #X msg 126 139 runmode_connect; #X msg 143 158 runmode_disconnect; - #X text 201 81 <-- choose your cursor mode; #X text 312 128 now pick a cursor:; #X obj 169 266 cursor; #X text 295 229 <-- this is the actual message to send; #X connect 1 0 2 0; #X connect 2 0 21 0; #X connect 2 1 0 0; #X connect 3 0 2 0; ! #X connect 8 0 27 0; #X connect 9 0 17 1; #X connect 10 0 17 1; --- 47,63 ---- #X msg 126 139 runmode_connect; #X msg 143 158 runmode_disconnect; #X text 312 128 now pick a cursor:; #X obj 169 266 cursor; #X text 295 229 <-- this is the actual message to send; + #X obj 25 244 metro 100; + #X obj 25 218 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0 + 1; + #X text 15 18 set your mouse cursors for this patch:; + #X text 201 81 <-- choose your cursor mode; #X connect 1 0 2 0; #X connect 2 0 21 0; #X connect 2 1 0 0; #X connect 3 0 2 0; ! #X connect 8 0 26 0; #X connect 9 0 17 1; #X connect 10 0 17 1; *************** *** 71,72 **** --- 75,78 ---- #X connect 23 0 17 0; #X connect 24 0 17 0; + #X connect 28 0 2 0; + #X connect 29 0 28 0; Index: cursor.c =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/cursor.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** cursor.c 6 Nov 2007 02:30:53 -0000 1.5 --- cursor.c 8 Nov 2007 01:36:03 -0000 1.6 *************** *** 80,84 **** } ! static void *cursor_new(t_symbol *s) { char buf[MAXPDSTRING]; --- 80,84 ---- } ! static void *cursor_new(void) { char buf[MAXPDSTRING]; *************** *** 93,101 **** x->status_outlet = outlet_new(&x->x_obj, 0); ! sys_vgui("bind all <ButtonPress> {+pd [concat %s button %%b 1 \\;]}\n", x->receive_symbol->s_name); ! sys_vgui("bind all <ButtonRelease> {+pd [concat %s button %%b 0 \\;]}\n", x->receive_symbol->s_name); ! sys_vgui("bind all <MouseWheel> {+pd [concat %s wheel %%D \\;]}\n", x->receive_symbol->s_name); --- 93,101 ---- x->status_outlet = outlet_new(&x->x_obj, 0); ! sys_vgui("bind . <ButtonPress> {+pd [concat %s button %%b 1 \\;]}\n", x->receive_symbol->s_name); ! sys_vgui("bind . <ButtonRelease> {+pd [concat %s button %%b 0 \\;]}\n", x->receive_symbol->s_name); ! sys_vgui("bind . <MouseWheel> {+pd [concat %s wheel %%D \\;]}\n", x->receive_symbol->s_name);

1 0

externals/mrpeach/str str.c,1.2,1.3
by Martin Peach 07 Nov '07

07 Nov '07

Update of /cvsroot/pure-data/externals/mrpeach/str In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25016 Modified Files: str.c Log Message: Now uses blobs instead of strings. Index: str.c =================================================================== RCS file: /cvsroot/pure-data/externals/mrpeach/str/str.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** str.c 11 Feb 2007 17:01:45 -0000 1.2 --- str.c 7 Nov 2007 20:26:11 -0000 1.3 *************** *** 7,11 **** #include "m_pd.h" ! #ifndef PD_STRINGS /* PD_STRINGS is not defined in m_pd.h: No PD string support: Make a dummy str object */ typedef struct _str { --- 7,11 ---- #include "m_pd.h" ! #ifndef PD_BLOBS /* PD_BLOBS is not defined in m_pd.h: No PD blob support: Make a dummy str object */ typedef struct _str { *************** *** 31,35 **** str_class = class_new(gensym("str"), (t_newmethod)str_new, 0, sizeof(t_str), 0, 0); } ! #else //ifndef PD_STRINGS /* Make a _real_ str object: */ --- 31,35 ---- str_class = class_new(gensym("str"), (t_newmethod)str_new, 0, sizeof(t_str), 0, 0); } ! #else //ifndef PD_BLOBS /* Make a _real_ str object: */ *************** *** 57,65 **** t_float x_nsplit; str_function x_function; ! t_string x_buf; ! t_string x_string_in1; ! t_string x_string_in2; ! t_string x_string_out1; ! t_string x_string_out2; t_atom *x_atom_list; size_t x_atom_list_end; --- 57,65 ---- t_float x_nsplit; str_function x_function; ! t_blob x_buf; ! t_blob x_string_in1; ! t_blob x_string_in2; ! t_blob x_string_out1; ! t_blob x_string_out2; t_atom *x_atom_list; size_t x_atom_list_end; *************** *** 75,83 **** } t_str; ! //typedef struct _string /* pointer to a string */ //{ ! // unsigned long s_length; /* length of string in bytes */ ! // unsigned char *s_data; /* pointer to 1st byte of string */ ! //} t_string; static t_class *str_class; --- 75,83 ---- } t_str; ! //typedef struct _blob /* pointer to a blob */ //{ ! // unsigned long s_length; /* length of blob in bytes */ ! // unsigned char *s_data; /* pointer to 1st byte of blob */ ! //} t_blob; static t_class *str_class; *************** *** 95,101 **** static void str_list(t_str *x, t_symbol *s, int argc, t_atom *argv); static void str_anything(t_str *x, t_symbol *s, int argc, t_atom *argv); ! static void str_string(t_str *x, t_string *st); ! static void str_set_string(t_string *dest, t_string *src, size_t *len); ! static void str_buf_to_string(t_str *x, t_string *dest); static void str_float_to_buf(t_str *x, t_float f); static void str_str_to_buf (t_str *x, t_atom *a); --- 95,101 ---- static void str_list(t_str *x, t_symbol *s, int argc, t_atom *argv); static void str_anything(t_str *x, t_symbol *s, int argc, t_atom *argv); ! static void str_string(t_str *x, t_blob *st); ! static void str_set_string(t_blob *dest, t_blob *src, size_t *len); ! static void str_buf_to_string(t_str *x, t_blob *dest); static void str_float_to_buf(t_str *x, t_float f); static void str_str_to_buf (t_str *x, t_atom *a); *************** *** 105,109 **** static void str_fread(t_str *x, t_symbol *s, int argc, t_atom *argv); static void str_fwrite(t_str *x, t_symbol *s, int argc, t_atom *argv); ! static void str_set_second(t_str *x, t_string *st); static int str_equal(t_str *x); static void str_join(t_str *x); --- 105,109 ---- static void str_fread(t_str *x, t_symbol *s, int argc, t_atom *argv); static void str_fwrite(t_str *x, t_symbol *s, int argc, t_atom *argv); ! static void str_set_second(t_str *x, t_blob *st); static int str_equal(t_str *x); static void str_join(t_str *x); *************** *** 272,276 **** for (j = 0; j < n; ++j) { /* concatenate all arguments into a single string */ ! if (a[j].a_type == A_STRING) { /* already a string */ str_str_to_buf(x, &a[j]); --- 272,276 ---- for (j = 0; j < n; ++j) { /* concatenate all arguments into a single string */ ! if (a[j].a_type == A_BLOB) { /* already a string */ str_str_to_buf(x, &a[j]); *************** *** 293,300 **** size_t len, limit, i, j; char *cP = (char *)x->x_buf.s_data + x->x_buf_end; ! t_string *str = atom_getstring(a); if (str == NULL) { ! post ("str_str_to_buf: null string. Need a string to point to...."); return; } --- 293,300 ---- size_t len, limit, i, j; char *cP = (char *)x->x_buf.s_data + x->x_buf_end; ! t_blob *str = atom_getblob(a); if (str == NULL) { ! post ("str_str_to_buf: null blob. Need a blob to point to...."); return; } *************** *** 310,314 **** * increment x->x_buf_end by the number of chars added to x->x_buf.s_data*/ { char *cP = (char *)x->x_buf.s_data + x->x_buf_end; ! atom_string(a, cP, x->x_buf.s_length-x->x_buf_end); x->x_buf_end += strlen(cP); } --- 310,314 ---- * increment x->x_buf_end by the number of chars added to x->x_buf.s_data*/ { char *cP = (char *)x->x_buf.s_data + x->x_buf_end; ! atom_blob(a, cP, x->x_buf.s_length-x->x_buf_end); x->x_buf_end += strlen(cP); } *************** *** 335,339 **** } ! static void str_buf_to_string(t_str *x, t_string *dest) /* copy x->x_buf_end bytes of x->x_buf.s_data into dest */ { --- 335,339 ---- } ! static void str_buf_to_string(t_str *x, t_blob *dest) /* copy x->x_buf_end bytes of x->x_buf.s_data into dest */ { *************** *** 351,355 **** } ! static void str_set_string(t_string *dest, t_string *src, size_t *len) /* Copy src into dest up to the shorter of dest->s_length and src->s_length * and set len to number of bytes copied */ --- 351,355 ---- } ! static void str_set_string(t_blob *dest, t_blob *src, size_t *len) /* Copy src into dest up to the shorter of dest->s_length and src->s_length * and set len to number of bytes copied */ *************** *** 458,463 **** } ! static void str_set_second(t_str *x, t_string *st) ! { /* Inlet 2 accepts strings only: Set string_in2 */ /*post("x=%p str_set_second(%p): %s %p %lu", x, &str_set_second, str_function_names[x->x_function], st, st->s_length);*/ --- 458,463 ---- } ! static void str_set_second(t_str *x, t_blob *st) ! { /* Inlet 2 accepts blobs only: Set string_in2 */ /*post("x=%p str_set_second(%p): %s %p %lu", x, &str_set_second, str_function_names[x->x_function], st, st->s_length);*/ *************** *** 466,472 **** } ! static void str_string(t_str *x, t_string *st) { ! /*post("x=%p str_string (%p) string %p %lu", x, &str_string, st, st->s_length);*/ str_set_string(&x->x_string_in1, st, &x->x_string_in1_end); if (x->x_function == drip) x->x_nsplit = 0L; --- 466,472 ---- } ! static void str_string(t_str *x, t_blob *st) { ! /*post("x=%p str_string (%p) blob %p %lu", x, &str_string, st, st->s_length);*/ str_set_string(&x->x_string_in1, st, &x->x_string_in1_end); if (x->x_function == drip) x->x_nsplit = 0L; *************** *** 533,537 **** x->x_string_in1.s_length = x->x_string_in1_end; // post("str_do_out0: x->x_string_in1.s_data[0] = %d", x->x_string_in1.s_data[0]); ! outlet_string(x->x_outlet_1, &x->x_string_in1); x->x_string_in1.s_length = true_length; } --- 533,537 ---- x->x_string_in1.s_length = x->x_string_in1_end; // post("str_do_out0: x->x_string_in1.s_data[0] = %d", x->x_string_in1.s_data[0]); ! outlet_blob(x->x_outlet_1, &x->x_string_in1); x->x_string_in1.s_length = true_length; } *************** *** 543,547 **** x->x_string_out1.s_length = x->x_string_out1_end; // post("str_do_out1: x->x_string_out1.s_data[0] = %d", x->x_string_out1.s_data[0]); ! outlet_string(x->x_outlet_1, &x->x_string_out1); x->x_string_out1.s_length = true_length; } --- 543,547 ---- x->x_string_out1.s_length = x->x_string_out1_end; // post("str_do_out1: x->x_string_out1.s_data[0] = %d", x->x_string_out1.s_data[0]); ! outlet_blob(x->x_outlet_1, &x->x_string_out1); x->x_string_out1.s_length = true_length; } *************** *** 553,557 **** x->x_string_out2.s_length = x->x_string_out2_end; // post("str_do_out2: x->x_string_out2.s_data[0] = %d", x->x_string_out2.s_data[0]); ! outlet_string(x->x_outlet_2, &x->x_string_out2); x->x_string_out2.s_length = true_length; } --- 553,557 ---- x->x_string_out2.s_length = x->x_string_out2_end; // post("str_do_out2: x->x_string_out2.s_data[0] = %d", x->x_string_out2.s_data[0]); ! outlet_blob(x->x_outlet_2, &x->x_string_out2); x->x_string_out2.s_length = true_length; } *************** *** 564,568 **** size_t true_length = x->x_string_in2.s_length; x->x_string_in2.s_length = x->x_string_in2_end; ! outlet_string(x->x_outlet_1, &x->x_string_in2); x->x_string_in2.s_length = true_length; } --- 564,568 ---- size_t true_length = x->x_string_in2.s_length; x->x_string_in2.s_length = x->x_string_in2_end; ! outlet_blob(x->x_outlet_1, &x->x_string_in2); x->x_string_in2.s_length = true_length; } *************** *** 683,687 **** if (argv[0].a_type == A_SYMBOL) { /* the first argument may be a selector */ ! atom_string(&argv[0], (char *)x->x_buf.s_data, MAXPDSTRING); for (i = 0; i < n_functions; ++i) { --- 683,687 ---- if (argv[0].a_type == A_SYMBOL) { /* the first argument may be a selector */ ! atom_blob(&argv[0], (char *)x->x_buf.s_data, MAXPDSTRING); for (i = 0; i < n_functions; ++i) { *************** *** 713,717 **** else if ((x->x_function == join)||(x->x_function == compare)||(x->x_function == add)) { /* argument goes to string_in2, add a string inlet */ ! x->x_inlet_2 = inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_string, gensym("")); /* gensym("string") */ str_list_to_buf(x, &argv[next], argc-next); x->x_string_in2_end = x->x_buf_end; --- 713,717 ---- else if ((x->x_function == join)||(x->x_function == compare)||(x->x_function == add)) { /* argument goes to string_in2, add a string inlet */ ! x->x_inlet_2 = inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_blob, gensym("")); /* gensym("blob") */ str_list_to_buf(x, &argv[next], argc-next); x->x_string_in2_end = x->x_buf_end; *************** *** 738,748 **** class_addlist(str_class, str_list); class_addanything(str_class, str_anything); ! class_addstring(str_class, str_string); class_addmethod(str_class, (t_method)str_set, gensym("set"), A_GIMME, 0); class_addmethod(str_class, (t_method)str_fread, gensym("file_read"), A_GIMME, 0); class_addmethod(str_class, (t_method)str_fwrite, gensym("file_write"), A_GIMME, 0); ! class_addmethod(str_class, (t_method)str_set_second, gensym(""), A_STRING, 0); } ! #endif // ifndef PD_STRINGS /* end str.c */ --- 738,748 ---- class_addlist(str_class, str_list); class_addanything(str_class, str_anything); ! class_addblob(str_class, str_string); class_addmethod(str_class, (t_method)str_set, gensym("set"), A_GIMME, 0); class_addmethod(str_class, (t_method)str_fread, gensym("file_read"), A_GIMME, 0); class_addmethod(str_class, (t_method)str_fwrite, gensym("file_write"), A_GIMME, 0); ! class_addmethod(str_class, (t_method)str_set_second, gensym(""), A_BLOB, 0); } ! #endif // ifndef PD_BLOBS /* end str.c */

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
22
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 November 2007