Pd-cvs November 2006

pd-cvs@lists.iem.at

16 participants
561 discussions

pd/src desire.c,1.1.2.197,1.1.2.198
by Mathieu Bouchard 23 Nov '06

23 Nov '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30279 Modified Files: Tag: devel_0_39 desire.c Log Message: . Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.197 retrieving revision 1.1.2.198 diff -C2 -d -r1.1.2.197 -r1.1.2.198 *** desire.c 23 Nov 2006 04:58:19 -0000 1.1.2.197 --- desire.c 23 Nov 2006 05:51:31 -0000 1.1.2.198 *************** *** 65,70 **** #define class_addmethod3(_cl,_ptr,_str,_sig) class_addmethod2(_cl,(t_method)_ptr,gensym(_str),_sig) ! #define canvas_each(CHILD,CANVAS) for(CHILD=(CANVAS)->list; CHILD; CHILD=CHILD->g_next) ! #define canvases_each(CANVAS) for(CANVAS=canvas_list; CANVAS; CANVAS=CANVAS->gl_next) #define canvas_wires_each(WIRE,TRAV,CANVAS) \ for (linetraverser_start(&TRAV,CANVAS); (WIRE=linetraverser_next(&TRAV)); ) --- 65,70 ---- #define class_addmethod3(_cl,_ptr,_str,_sig) class_addmethod2(_cl,(t_method)_ptr,gensym(_str),_sig) ! #define canvas_each(CHILD,CANVAS) for(t_gobj *CHILD=(CANVAS)->list; CHILD; CHILD=CHILD->g_next) [...1275 lines suppressed...] FILE *f = stdout; fprintf(f,"%s",s); ! for (int i=0; i<argc; i++) {atom_string(argv+i,buf,MAXPDSTRING); fprintf(f,"%s ",buf);} fprintf(f,"\n"); } *************** *** 8041,8046 **** /* properly close all open root canvases */ extern "C" void glob_closeall(void *dummy, t_floatarg fforce) { ! t_canvas *x, *y; ! for (x = canvas_list; x; ) { y = x->gl_next; canvas_close(x); /* forced closing of this root canvas */ --- 7988,7993 ---- /* properly close all open root canvases */ extern "C" void glob_closeall(void *dummy, t_floatarg fforce) { ! t_canvas *y; ! for (t_canvas *x = canvas_list; x; ) { y = x->gl_next; canvas_close(x); /* forced closing of this root canvas */

1 0

pd/src makefile.in,1.4.4.2.2.12,1.4.4.2.2.13
by Mathieu Bouchard 23 Nov '06

23 Nov '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15198 Modified Files: Tag: devel_0_39 makefile.in Log Message: typo. Index: makefile.in =================================================================== RCS file: /cvsroot/pure-data/pd/src/makefile.in,v retrieving revision 1.4.4.2.2.12 retrieving revision 1.4.4.2.2.13 diff -C2 -d -r1.4.4.2.2.12 -r1.4.4.2.2.13 *** makefile.in 23 Nov 2006 04:10:44 -0000 1.4.4.2.2.12 --- makefile.in 23 Nov 2006 05:09:17 -0000 1.4.4.2.2.13 *************** *** 13,17 **** LIB = @PDLIB@ OPT_CFLAGS = @OPT_CFLAGS@ ! WARN_CFLAGS = -Wall -W -Wno-unused -Wno-parentheses -Wno-switch ARCH_CFLAGS = -DPD CFLAGS = -DDESIRE -DDONTUSESIMD @CFLAGS@ $(ARCH_CFLAGS) $(WARN_CFLAGS) $(OPT_CFLAGS) $(MORECFLAGS) --- 13,17 ---- LIB = @PDLIB@ OPT_CFLAGS = @OPT_CFLAGS@ ! WARN_CFLAGS = ARCH_CFLAGS = -DPD CFLAGS = -DDESIRE -DDONTUSESIMD @CFLAGS@ $(ARCH_CFLAGS) $(WARN_CFLAGS) $(OPT_CFLAGS) $(MORECFLAGS) *************** *** 48,55 **** $(SRCXX:.c=.o): %.o: %.c config.log ! $(CXX) -xc++ $(CFLAGS) $(GFLAGS) $(INCLUDE) -c -o $*.o $*.c $(SRC:.c=.o): %.o: %.c config.log ! $(CC) -Wstrict-prototypes $(CFLAGS) $(GFLAGS) $(INCLUDE) -c -o $*.o $*.c pd: $(PDEXEC) --- 48,55 ---- $(SRCXX:.c=.o): %.o: %.c config.log ! $(CXX) -Wall -Wno-unused-parameter -xc++ $(CFLAGS) $(GFLAGS) $(INCLUDE) -c -o $*.o $*.c $(SRC:.c=.o): %.o: %.c config.log ! $(CC) -Wall -Wno-parentheses -Wno-switch -Wno-unused -Wstrict-prototypes $(CFLAGS) $(GFLAGS) $(INCLUDE) -c -o $*.o $*.c pd: $(PDEXEC) *************** *** 76,80 **** externs: ! for ext in bonk~ choice expr~ fiddle~ loop~ lrshift~ pique; do (cd ../extra/$$ext; make -q @EXTERNTARGET@ ) done INSTDIR = $(DESTDIR)/$(INSTALL_PREFIX) --- 76,80 ---- externs: ! for ext in bonk~ choice expr~ fiddle~ loop~ lrshift~ pique; do (cd ../extra/$$ext; make @EXTERNTARGET@ ) done INSTDIR = $(DESTDIR)/$(INSTALL_PREFIX)

1 0

pd/src desire.c,1.1.2.196,1.1.2.197
by Mathieu Bouchard 23 Nov '06

23 Nov '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11341 Modified Files: Tag: devel_0_39 desire.c Log Message: . Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.196 retrieving revision 1.1.2.197 diff -C2 -d -r1.1.2.196 -r1.1.2.197 *** desire.c 23 Nov 2006 04:18:06 -0000 1.1.2.196 --- desire.c 23 Nov 2006 04:58:19 -0000 1.1.2.197 *************** *** 873,877 **** static void *subcanvas_new(t_symbol *s) { t_atom a[6]; ! t_canvas *x, *z = canvas_getcurrent(); if (!*s->s_name) s = gensym("/SUBPATCH/"); SETFLOAT(a, 0); --- 873,877 ---- static void *subcanvas_new(t_symbol *s) { t_atom a[6]; ! t_canvas *z = canvas_getcurrent(); if (!*s->s_name) s = gensym("/SUBPATCH/"); SETFLOAT(a, 0); *************** *** 881,885 **** SETSYMBOL(a+4, s); SETFLOAT(a+5, 1); ! x = canvas_new(0, 0, 6, a); x->owner = z; canvas_pop(x, 1); --- 881,885 ---- SETSYMBOL(a+4, s); SETFLOAT(a+5, 1); ! t_canvas *x = canvas_new(0, 0, 6, a); x->owner = z; canvas_pop(x, 1); *************** *** 906,911 **** static void *table_new(t_symbol *s, t_floatarg f) { t_atom a[9]; ! t_canvas *gl; ! t_canvas *x, *z = canvas_getcurrent(); if (s == &s_) { char tabname[255]; --- 906,910 ---- static void *table_new(t_symbol *s, t_floatarg f) { t_atom a[9]; ! t_canvas *z = canvas_getcurrent(); if (s == &s_) { char tabname[255]; *************** *** 921,930 **** SETSYMBOL(a+4, s); SETFLOAT(a+5, 0); ! x = canvas_new(0, 0, 6, a); x->owner = z; /* create a graph for the table */ ! gl = canvas_addcanvas((t_canvas*)x, &s_, 0, -1, (f > 1 ? f-1 : 1), 1, 50, 350, 550, 50); graph_array(gl, s, &s_float, f, 0); ! canvas_pop(x, 0); return x; } --- 920,929 ---- SETSYMBOL(a+4, s); SETFLOAT(a+5, 0); ! t_canvas *x = canvas_new(0, 0, 6, a); x->owner = z; /* create a graph for the table */ ! t_canvas *gl = canvas_addcanvas((t_canvas*)x, &s_, 0, -1, (f > 1 ? f-1 : 1), 1, 50, 350, 550, 50); graph_array(gl, s, &s_float, f, 0); ! canvas_pop(x, 0); return x; } *************** *** 2880,2884 **** int message, nline; t_template *t; - t_symbol *templatesym; t_scalar *sc; int nextmsg = *p_nextmsg; --- 2879,2882 ---- *************** *** 2889,2893 **** return 0; } ! templatesym = canvas_makebindsym(vec[nextmsg].a_w.w_symbol); *p_nextmsg = nextmsg + 1; if (!(t = template_findbyname(templatesym))) { --- 2887,2891 ---- return 0; } ! t_symbol *templatesym = canvas_makebindsym(vec[nextmsg].a_w.w_symbol); *p_nextmsg = nextmsg + 1; if (!(t = template_findbyname(templatesym))) { *************** *** 2926,2932 **** while (1) { t_template *newtemplate, *existtemplate; - t_symbol *templatesym; t_atom *templateargs = (t_atom *)getbytes(0); ! int ntemplateargs = 0, newnargs; nline = canvas_scanbinbuf(natoms, vec, &message, &nextmsg); if (nline < 2) break; --- 2924,2929 ---- while (1) { t_template *newtemplate, *existtemplate; t_atom *templateargs = (t_atom *)getbytes(0); ! int ntemplateargs = 0; nline = canvas_scanbinbuf(natoms, vec, &message, &nextmsg); if (nline < 2) break; *************** *** 2937,2945 **** continue; } ! templatesym = canvas_makebindsym(vec[message + 1].a_w.w_symbol); while (1) { nline = canvas_scanbinbuf(natoms, vec, &message, &nextmsg); if (nline != 2 && nline != 3) break; ! newnargs = ntemplateargs + nline; templateargs = (t_atom *)t_resizebytes(templateargs, sizeof(*templateargs) * ntemplateargs, --- 2934,2942 ---- continue; } ! t_symbol *templatesym = canvas_makebindsym(vec[message + 1].a_w.w_symbol); while (1) { nline = canvas_scanbinbuf(natoms, vec, &message, &nextmsg); if (nline != 2 && nline != 3) break; ! int newnargs = ntemplateargs + nline; templateargs = (t_atom *)t_resizebytes(templateargs, sizeof(*templateargs) * ntemplateargs, *************** *** 3230,3235 **** } ! /* call this recursively to collect all the template names for ! a canvas or for the selection. */ static void canvas_collecttemplatesfor(t_canvas *x, int *ntemplatesp, t_symbol ***templatevecp, int wholething) { --- 3227,3231 ---- } ! /* call this recursively to collect all the template names for a canvas or for the selection. */ static void canvas_collecttemplatesfor(t_canvas *x, int *ntemplatesp, t_symbol ***templatevecp, int wholething) { *************** *** 3857,3864 **** t_scalar *scalar_new(t_canvas *owner, t_symbol *templatesym) { t_scalar *x; - t_template *t; t_gpointer gp; gpointer_init(&gp); ! t = template_findbyname(templatesym); TEMPLATE_CHECK(owner,templatesym,0) x = (t_scalar *)getbytes(sizeof(t_scalar) + (t->n - 1) * sizeof(*x->sc_vec)); --- 3853,3859 ---- t_scalar *scalar_new(t_canvas *owner, t_symbol *templatesym) { t_scalar *x; t_gpointer gp; gpointer_init(&gp); ! t_template *t = template_findbyname(templatesym); TEMPLATE_CHECK(owner,templatesym,0) x = (t_scalar *)getbytes(sizeof(t_scalar) + (t->n - 1) * sizeof(*x->sc_vec)); *************** *** 5544,5552 **** static void ptrobj_bang(t_ptrobj *x) { - t_symbol *templatesym; int n; t_typedout *to; if (!gpointer_check(&x->gp, 1)) {pd_error(x, "bang: empty pointer"); return;} ! templatesym = gpointer_gettemplatesym(&x->gp); for (n = x->ntypedout, to = x->typedout; n--; to++) if (to->type == templatesym) {outlet_pointer(to->outlet, &x->gp); return;} --- 5539,5546 ---- static void ptrobj_bang(t_ptrobj *x) { int n; t_typedout *to; if (!gpointer_check(&x->gp, 1)) {pd_error(x, "bang: empty pointer"); return;} ! t_symbol *templatesym = gpointer_gettemplatesym(&x->gp); for (n = x->ntypedout, to = x->typedout; n--; to++) if (to->type == templatesym) {outlet_pointer(to->outlet, &x->gp); return;}

1 0

pd/src desire.c, 1.1.2.195, 1.1.2.196 m_hash.c, 1.1.2.10, 1.1.2.11
by Mathieu Bouchard 23 Nov '06

23 Nov '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29035 Modified Files: Tag: devel_0_39 desire.c m_hash.c Log Message: DesireData goes C++. In this step, we make structs inherit from each other and remove some casts obsoleted by this. Index: m_hash.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/m_hash.c,v retrieving revision 1.1.2.10 retrieving revision 1.1.2.11 diff -C2 -d -r1.1.2.10 -r1.1.2.11 *** m_hash.c 19 Nov 2006 05:58:24 -0000 1.1.2.10 --- m_hash.c 23 Nov 2006 04:18:08 -0000 1.1.2.11 *************** *** 104,108 **** } ! void hash_setup (void) { hash_class = class_new(gensym("#V"), (t_newmethod)0 /*hash_new*/, (t_method)hash_free, sizeof(t_object), CLASS_PD, A_GIMME, 0); --- 104,108 ---- } ! extern "C" void hash_setup (void) { hash_class = class_new(gensym("#V"), (t_newmethod)0 /*hash_new*/, (t_method)hash_free, sizeof(t_object), CLASS_PD, A_GIMME, 0); Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.195 retrieving revision 1.1.2.196 diff -C2 -d -r1.1.2.195 -r1.1.2.196 *** desire.c 21 Nov 2006 06:47:59 -0000 1.1.2.195 --- desire.c 23 Nov 2006 04:18:06 -0000 1.1.2.196 *************** *** 15,32 **** #include "desire.h" - #ifdef __cplusplus - #define EXTERNC extern "C" - #else - #define EXTERNC extern - #endif - - #ifdef __cplusplus extern "C" { [...1846 lines suppressed...] *************** *** 8083,8087 **** /* properly close all open root canvases */ ! EXTERNC void glob_closeall(void *dummy, t_floatarg fforce) { t_canvas *x, *y; for (x = canvas_list; x; ) { --- 8046,8050 ---- /* properly close all open root canvases */ ! extern "C" void glob_closeall(void *dummy, t_floatarg fforce) { t_canvas *x, *y; for (x = canvas_list; x; ) { *************** *** 8091,8094 **** } } - - --- 8054,8055 ----

1 0

pd/src makefile.in,1.4.4.2.2.11,1.4.4.2.2.12
by Mathieu Bouchard 23 Nov '06

23 Nov '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26613 Modified Files: Tag: devel_0_39 makefile.in Log Message: from now on, desire.c is compiled as C++. Index: makefile.in =================================================================== RCS file: /cvsroot/pure-data/pd/src/makefile.in,v retrieving revision 1.4.4.2.2.11 retrieving revision 1.4.4.2.2.12 diff -C2 -d -r1.4.4.2.2.11 -r1.4.4.2.2.12 *** makefile.in 22 Nov 2006 23:32:48 -0000 1.4.4.2.2.11 --- makefile.in 23 Nov 2006 04:10:44 -0000 1.4.4.2.2.12 *************** *** 13,25 **** LIB = @PDLIB@ OPT_CFLAGS = @OPT_CFLAGS@ ! WARN_CFLAGS = -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch ARCH_CFLAGS = -DPD CFLAGS = -DDESIRE -DDONTUSESIMD @CFLAGS@ $(ARCH_CFLAGS) $(WARN_CFLAGS) $(OPT_CFLAGS) $(MORECFLAGS) # from DesireData (matju & chun) ! SRC = desire.c m_hash.c # from devel_0_39 (thomas & tim) ! SRC += m_fifo.c m_simd.c # from pd miller --- 13,25 ---- LIB = @PDLIB@ OPT_CFLAGS = @OPT_CFLAGS@ ! WARN_CFLAGS = -Wall -W -Wno-unused -Wno-parentheses -Wno-switch ARCH_CFLAGS = -DPD CFLAGS = -DDESIRE -DDONTUSESIMD @CFLAGS@ $(ARCH_CFLAGS) $(WARN_CFLAGS) $(OPT_CFLAGS) $(MORECFLAGS) # from DesireData (matju & chun) ! SRCXX = desire.c m_hash.c # from devel_0_39 (thomas & tim) ! SRC = m_fifo.c m_simd.c # from pd miller *************** *** 37,41 **** SRC += @SYSSRC@ ! OBJ = $(SRC:.c=.o) # ------------------ targets ------------------------------------ --- 37,41 ---- SRC += @SYSSRC@ ! OBJ = $(SRCXX:.c=.o) $(SRC:.c=.o) # ------------------ targets ------------------------------------ *************** *** 47,52 **** bin: $(PDEXEC) $(BIN_DIR)/pd-watchdog $(BIN_DIR)/pdsend $(BIN_DIR)/pdreceive $(BIN_DIR)/pd.tk ! $(OBJ) : %.o : %.c config.log ! $(CC) $(CFLAGS) $(GFLAGS) $(INCLUDE) -c -o $*.o $*.c pd: $(PDEXEC) --- 47,55 ---- bin: $(PDEXEC) $(BIN_DIR)/pd-watchdog $(BIN_DIR)/pdsend $(BIN_DIR)/pdreceive $(BIN_DIR)/pd.tk ! $(SRCXX:.c=.o): %.o: %.c config.log ! $(CXX) -xc++ $(CFLAGS) $(GFLAGS) $(INCLUDE) -c -o $*.o $*.c ! ! $(SRC:.c=.o): %.o: %.c config.log ! $(CC) -Wstrict-prototypes $(CFLAGS) $(GFLAGS) $(INCLUDE) -c -o $*.o $*.c pd: $(PDEXEC) *************** *** 64,68 **** $(PDEXEC): $(OBJ) config.log ! $(CC) $(LDFLAGS) $(DBG_CFLAGS) -o $(PDEXEC) $(OBJ) $(LIB) $(BIN_DIR)/pd.tk: u_main.tk --- 67,71 ---- $(PDEXEC): $(OBJ) config.log ! $(CXX) $(LDFLAGS) $(DBG_CFLAGS) -o $(PDEXEC) $(OBJ) $(LIB) $(BIN_DIR)/pd.tk: u_main.tk *************** *** 73,83 **** externs: ! @@cd ../extra/bonk~ ;make $(FOO) @EXTERNTARGET@ ! @@cd ../extra/choice ;make $(FOO) @EXTERNTARGET@ ! @@cd ../extra/expr~ ;make $(FOO) @EXTERNTARGET@ ! @@cd ../extra/fiddle~ ;make $(FOO) @EXTERNTARGET@ ! @@cd ../extra/loop~ ;make $(FOO) @EXTERNTARGET@ ! @@cd ../extra/lrshift~;make $(FOO) @EXTERNTARGET@ ! @@cd ../extra/pique ;make $(FOO) @EXTERNTARGET@ INSTDIR = $(DESTDIR)/$(INSTALL_PREFIX) --- 76,80 ---- externs: ! for ext in bonk~ choice expr~ fiddle~ loop~ lrshift~ pique; do (cd ../extra/$$ext; make -q @EXTERNTARGET@ ) done INSTDIR = $(DESTDIR)/$(INSTALL_PREFIX)

1 0

pd/src makefile.in,1.4.4.2.2.10,1.4.4.2.2.11
by Mathieu Bouchard 23 Nov '06

23 Nov '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21691 Modified Files: Tag: devel_0_39 makefile.in Log Message: a bit quieter Index: makefile.in =================================================================== RCS file: /cvsroot/pure-data/pd/src/makefile.in,v retrieving revision 1.4.4.2.2.10 retrieving revision 1.4.4.2.2.11 diff -C2 -d -r1.4.4.2.2.10 -r1.4.4.2.2.11 *** makefile.in 22 Nov 2006 22:39:34 -0000 1.4.4.2.2.10 --- makefile.in 22 Nov 2006 23:32:48 -0000 1.4.4.2.2.11 *************** *** 69,80 **** cp u_main.tk $(BIN_DIR)/pd.tk externs: ! cd ../extra/bonk~ ;make @EXTERNTARGET@ ! cd ../extra/choice ;make @EXTERNTARGET@ ! cd ../extra/expr~ ;make @EXTERNTARGET@ ! cd ../extra/fiddle~ ;make @EXTERNTARGET@ ! cd ../extra/loop~ ;make @EXTERNTARGET@ ! cd ../extra/lrshift~;make @EXTERNTARGET@ ! cd ../extra/pique ;make @EXTERNTARGET@ INSTDIR = $(DESTDIR)/$(INSTALL_PREFIX) --- 69,83 ---- cp u_main.tk $(BIN_DIR)/pd.tk + #FOO = -q + FOO = + externs: ! @@cd ../extra/bonk~ ;make $(FOO) @EXTERNTARGET@ ! @@cd ../extra/choice ;make $(FOO) @EXTERNTARGET@ ! @@cd ../extra/expr~ ;make $(FOO) @EXTERNTARGET@ ! @@cd ../extra/fiddle~ ;make $(FOO) @EXTERNTARGET@ ! @@cd ../extra/loop~ ;make $(FOO) @EXTERNTARGET@ ! @@cd ../extra/lrshift~;make $(FOO) @EXTERNTARGET@ ! @@cd ../extra/pique ;make $(FOO) @EXTERNTARGET@ INSTDIR = $(DESTDIR)/$(INSTALL_PREFIX)

1 0

pd/src configure.in, 1.5.4.5.2.12, 1.5.4.5.2.13 configure, 1.6.2.10, 1.6.2.11 makefile.in, 1.4.4.2.2.9, 1.4.4.2.2.10
by Mathieu Bouchard 22 Nov '06

22 Nov '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1426 Modified Files: Tag: devel_0_39 configure.in configure makefile.in Log Message: more cleanup Index: makefile.in =================================================================== RCS file: /cvsroot/pure-data/pd/src/makefile.in,v retrieving revision 1.4.4.2.2.9 retrieving revision 1.4.4.2.2.10 diff -C2 -d -r1.4.4.2.2.9 -r1.4.4.2.2.10 *** makefile.in 22 Nov 2006 21:46:24 -0000 1.4.4.2.2.9 --- makefile.in 22 Nov 2006 22:39:34 -0000 1.4.4.2.2.10 *************** *** 17,30 **** CFLAGS = -DDESIRE -DDONTUSESIMD @CFLAGS@ $(ARCH_CFLAGS) $(WARN_CFLAGS) $(OPT_CFLAGS) $(MORECFLAGS) ! # the sources ! SYSSRC += @SYSSRC@ ! ! # DesireData (matju & chun) SRC = desire.c m_hash.c ! # devel_0_39 (thomas & tim) SRC += m_fifo.c m_simd.c ! # pd miller SRC += m_pd.c m_class.c m_obj.c m_atom.c m_memory.c m_binbuf.c m_conf.c \ m_glob.c m_sched.c s_main.c s_inter.c s_file.c s_loader.c s_path.c \ --- 17,27 ---- CFLAGS = -DDESIRE -DDONTUSESIMD @CFLAGS@ $(ARCH_CFLAGS) $(WARN_CFLAGS) $(OPT_CFLAGS) $(MORECFLAGS) ! # from DesireData (matju & chun) SRC = desire.c m_hash.c ! # from devel_0_39 (thomas & tim) SRC += m_fifo.c m_simd.c ! # from pd miller SRC += m_pd.c m_class.c m_obj.c m_atom.c m_memory.c m_binbuf.c m_conf.c \ m_glob.c m_sched.c s_main.c s_inter.c s_file.c s_loader.c s_path.c \ *************** *** 37,55 **** $(SYSSRC) OBJ = $(SRC:.c=.o) - # # ------------------ targets ------------------------------------ - # ! .PHONY: pd externs all ! all: $(PDEXEC) $(BIN_DIR)/pd-watchdog $(BIN_DIR)/pdsend \ ! $(BIN_DIR)/pdreceive $(BIN_DIR)/pd.tk externs ! bin: $(PDEXEC) $(BIN_DIR)/pd-watchdog $(BIN_DIR)/pdsend \ ! $(BIN_DIR)/pdreceive $(BIN_DIR)/pd.tk ! $(OBJ) : %.o : %.c $(CC) $(CFLAGS) $(GFLAGS) $(INCLUDE) -c -o $*.o $*.c --- 34,51 ---- $(SYSSRC) + # audio drivers and midi drivers + SRC += @SYSSRC@ + OBJ = $(SRC:.c=.o) # ------------------ targets ------------------------------------ ! .PHONY: pd bin externs all ! all: bin externs ! bin: $(PDEXEC) $(BIN_DIR)/pd-watchdog $(BIN_DIR)/pdsend $(BIN_DIR)/pdreceive $(BIN_DIR)/pd.tk ! $(OBJ) : %.o : %.c config.log $(CC) $(CFLAGS) $(GFLAGS) $(INCLUDE) -c -o $*.o $*.c *************** *** 67,71 **** $(CC) $(CFLAGS) $(STRIPFLAG) -o $(BIN_DIR)/pdreceive u_pdreceive.c ! $(PDEXEC): $(OBJ) $(CC) $(LDFLAGS) $(DBG_CFLAGS) -o $(PDEXEC) $(OBJ) $(LIB) --- 63,67 ---- $(CC) $(CFLAGS) $(STRIPFLAG) -o $(BIN_DIR)/pdreceive u_pdreceive.c ! $(PDEXEC): $(OBJ) config.log $(CC) $(LDFLAGS) $(DBG_CFLAGS) -o $(PDEXEC) $(OBJ) $(LIB) *************** *** 84,88 **** INSTDIR = $(DESTDIR)/$(INSTALL_PREFIX) MANINSTDIR = $(DESTDIR)/$(INSTALL_PREFIX)/$(MANDIR) - BINARYMODE=@binarymode@ install: all --- 80,83 ---- Index: configure =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/configure,v retrieving revision 1.6.2.10 retrieving revision 1.6.2.11 diff -C2 -d -r1.6.2.10 -r1.6.2.11 *** configure 22 Nov 2006 21:46:24 -0000 1.6.2.10 --- configure 22 Nov 2006 22:39:34 -0000 1.6.2.11 *************** *** 310,314 **** #endif" ! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS oss alsa jack portaudio portmidi binarymode PDLIB MORECFLAGS EXT OPT_CFLAGS USE_DEBUG_CFLAGS SYSSRC STRIPFLAG EXTERNTARGET CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE CPP EGREP ALLOCA LIBOBJS LTLIBOBJS' ac_subst_files='' --- 310,314 ---- #endif" ! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS oss alsa jack portaudio portmidi PDLIB MORECFLAGS EXT OPT_CFLAGS USE_DEBUG_CFLAGS SYSSRC STRIPFLAG EXTERNTARGET CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE CPP EGREP ALLOCA LIBOBJS LTLIBOBJS' ac_subst_files='' *************** *** 1306,1311 **** portmidi=yes - binarymode=-m755 - --- 1306,1309 ---- *************** *** 4575,4579 **** ! if test x$oss == "xyes"; then if test "${ac_cv_header_linux_soundcard_h+set}" = set; then echo "$as_me:$LINENO: checking for linux/soundcard.h" >&5 --- 4573,4577 ---- ! if test x$oss == xyes; then if test "${ac_cv_header_linux_soundcard_h+set}" = set; then echo "$as_me:$LINENO: checking for linux/soundcard.h" >&5 *************** *** 4925,4929 **** echo "${ECHO_T}$ac_cv_lib_jack_jack_set_xrun_callback" >&6 if test $ac_cv_lib_jack_jack_set_xrun_callback = yes; then ! LIBS="$LIBS -ljack";jack=xrun else jack=no --- 4923,4927 ---- echo "${ECHO_T}$ac_cv_lib_jack_jack_set_xrun_callback" >&6 if test $ac_cv_lib_jack_jack_set_xrun_callback = yes; then ! jack=xrun else jack=no *************** *** 4994,4998 **** echo "${ECHO_T}$ac_cv_lib_jack_jack_set_error_function" >&6 if test $ac_cv_lib_jack_jack_set_error_function = yes; then ! LIBS="$LIBS -ljack";jack=yes else jack=no --- 4992,4996 ---- echo "${ECHO_T}$ac_cv_lib_jack_jack_set_error_function" >&6 if test $ac_cv_lib_jack_jack_set_error_function = yes; then ! jack=yes else jack=no *************** *** 5078,5082 **** SYSSRC="" ! if test x$USE_DEBUG_CFLAGS == "xyes"; then OPT_CFLAGS="-O1 -g" else --- 5076,5080 ---- SYSSRC="" ! if test x$USE_DEBUG_CFLAGS == xyes; then OPT_CFLAGS="-O1 -g" else *************** *** 5086,5093 **** if test `uname -s` = Linux; then LDFLAGS="-Wl,-export-dynamic" ! if test "$static" = "yes"; then LDFLAGS="$LDFLAGS -static"; fi EXT=pd_linux ! MORECFLAGS="-DDL_OPEN -DPA_USE_OSS -DPA_LITTLE_ENDIAN -DUNIX -DUNISTD -DUSEAPI_OSS -fno-strict-aliasing" ! SYSSRC=$SYSSRC" s_midi_oss.c s_audio_oss.c" STRIPFLAG=-s if test x$jack == "xyes"; then LDFLAGS=$LDFLAGS" -lrt -ljack"; fi --- 5084,5090 ---- if test `uname -s` = Linux; then LDFLAGS="-Wl,-export-dynamic" ! if test "$static" = yes; then LDFLAGS="$LDFLAGS -static"; fi EXT=pd_linux ! MORECFLAGS="-DDL_OPEN -DPA_USE_OSS -DUNIX -DUNISTD -fno-strict-aliasing" STRIPFLAG=-s if test x$jack == "xyes"; then LDFLAGS=$LDFLAGS" -lrt -ljack"; fi *************** *** 5096,5107 **** if test `uname -s` = Darwin; then ! LDFLAGS="-Wl -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework Carbon -framework CoreMIDI" EXT=pd_darwin ! MORECFLAGS="-DMACOSX -DUNISTD -I/usr/X11R6/include -Wno-error -DUSEAPI_PORTAUDIO -DPA_BIG_ENDIAN -DPA19 -DPA_USE_COREAUDIO" STRIPFLAG="" EXTERNTARGET=pd_darwin fi ! if test x$alsa == "xyes"; then SYSSRC=$SYSSRC" s_audio_alsa.c s_audio_alsamm.c s_midi_alsa.c" MORECFLAGS=$MORECFLAGS" -DPA_USE_ALSA -DUSEAPI_ALSA" --- 5093,5109 ---- if test `uname -s` = Darwin; then ! LDFLAGS="-Wl" EXT=pd_darwin ! MORECFLAGS="-DMACOSX -DUNISTD -I/usr/X11R6/include -DPA_USE_COREAUDIO" STRIPFLAG="" EXTERNTARGET=pd_darwin fi ! if test x$oss == xyes; then ! SYSSRC=$SYSSRC" s_audio_oss.c s_midi_oss.c" ! MORECFLAGS=$MORECFLAGS" -DUSEAPI_OSS" ! fi ! ! if test x$alsa == xyes; then SYSSRC=$SYSSRC" s_audio_alsa.c s_audio_alsamm.c s_midi_alsa.c" MORECFLAGS=$MORECFLAGS" -DPA_USE_ALSA -DUSEAPI_ALSA" *************** *** 5109,5124 **** fi ! if test `uname -s` = Darwin; then ! if test x$jack == "xyes"; then LDFLAGS=$LDFLAGS" -framework Jack"; fi ! if test x$jack == "xrun"; then LDFLAGS=$LDFLAGS" -framework Jack"; fi fi - if test x$jack == "xyes"; then MORECFLAGS=$MORECFLAGS" -DUSEAPI_JACK"; SYSSRC=$SYSSRC" s_audio_jack.c"; fi - if test x$jack == "xrun"; then MORECFLAGS=$MORECFLAGS" -DUSEAPI_JACK -DJACK_XRUN"; SYSSRC=$SYSSRC" s_audio_jack.c"; fi ! if test x$portaudio == "xyes"; then MORECFLAGS=$MORECFLAGS" -DUSEAPI_PORTAUDIO -DPA19" SYSSRC=$SYSSRC" s_audio_portaudio.c" fi - if test x$portmidi == "xyes"; then SYSSRC=$SYSSRC" s_midi_pm.c"; fi ac_config_files="$ac_config_files makefile" --- 5111,5141 ---- fi ! if test x$jack == xyes; then ! SYSSRC=$SYSSRC" s_audio_jack.c" ! if test x$jack != xno; then ! if test `uname -s` = Darwin; then ! LDFLAGS=$LDFLAGS" -framework Jack" ! else ! LIBS="$LIBS -ljack" ! fi ! MORECFLAGS=$MORECFLAGS" -DUSEAPI_JACK" ! fi ! if test x$jack == "xrun"; then MORECFLAGS=$MORECFLAGS" -DJACK_XRUN"; fi fi ! if test x$portaudio == xyes; then MORECFLAGS=$MORECFLAGS" -DUSEAPI_PORTAUDIO -DPA19" SYSSRC=$SYSSRC" s_audio_portaudio.c" + if test `uname -s` = Darwin; then + LDFLAGS=$LDFLAGS" -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework Carbon" + fi + fi + + if test x$portmidi == xyes; then + SYSSRC=$SYSSRC" s_midi_pm.c" + if test `uname -s` = Darwin; then + LDFLAGS=$LDFLAGS" -framework CoreMIDI" + fi fi ac_config_files="$ac_config_files makefile" *************** *** 5763,5767 **** s,@portaudio@,$portaudio,;t t s,@portmidi@,$portmidi,;t t - s,@binarymode@,$binarymode,;t t s,@PDLIB@,$PDLIB,;t t s,@MORECFLAGS@,$MORECFLAGS,;t t --- 5780,5783 ---- Index: configure.in =================================================================== RCS file: /cvsroot/pure-data/pd/src/configure.in,v retrieving revision 1.5.4.5.2.12 retrieving revision 1.5.4.5.2.13 diff -C2 -d -r1.5.4.5.2.12 -r1.5.4.5.2.13 *** configure.in 22 Nov 2006 21:46:24 -0000 1.5.4.5.2.12 --- configure.in 22 Nov 2006 22:39:34 -0000 1.5.4.5.2.13 *************** *** 14,18 **** AC_SUBST(portaudio, yes) AC_SUBST(portmidi, yes) - AC_SUBST(binarymode, -m755) AC_SUBST(PDLIB) AC_SUBST(MORECFLAGS) --- 14,17 ---- *************** *** 67,71 **** AC_CHECK_LIB(pthread, pthread_create,PDLIB="$PDLIB -lpthread", echo "pthreads required" || exit 1) ! if test x$oss == "xyes"; then AC_CHECK_HEADER(linux/soundcard.h,oss="yes",oss="no") fi --- 66,70 ---- AC_CHECK_LIB(pthread, pthread_create,PDLIB="$PDLIB -lpthread", echo "pthreads required" || exit 1) ! if test x$oss == xyes; then AC_CHECK_HEADER(linux/soundcard.h,oss="yes",oss="no") fi *************** *** 78,83 **** if test x$jack == xyes; then AC_CHECK_LIB(rt,shm_open,LIBS="$LIBS -lrt") ! AC_CHECK_LIB(jack,jack_set_xrun_callback,LIBS="$LIBS -ljack";jack=xrun,jack=no) ! AC_CHECK_LIB(jack,jack_set_error_function,LIBS="$LIBS -ljack";jack=yes,jack=no) fi --- 77,82 ---- if test x$jack == xyes; then AC_CHECK_LIB(rt,shm_open,LIBS="$LIBS -lrt") ! AC_CHECK_LIB(jack,jack_set_xrun_callback,jack=xrun,jack=no) ! AC_CHECK_LIB(jack,jack_set_error_function,jack=yes,jack=no) fi *************** *** 92,96 **** SYSSRC="" ! if test x$USE_DEBUG_CFLAGS == "xyes"; then OPT_CFLAGS="-O1 -g" else --- 91,95 ---- SYSSRC="" ! if test x$USE_DEBUG_CFLAGS == xyes; then OPT_CFLAGS="-O1 -g" else *************** *** 100,107 **** if test `uname -s` = Linux; then LDFLAGS="-Wl,-export-dynamic" ! if test "$static" = "yes"; then LDFLAGS="$LDFLAGS -static"; fi EXT=pd_linux ! MORECFLAGS="-DDL_OPEN -DPA_USE_OSS -DPA_LITTLE_ENDIAN -DUNIX -DUNISTD -DUSEAPI_OSS -fno-strict-aliasing" ! SYSSRC=$SYSSRC" s_midi_oss.c s_audio_oss.c" STRIPFLAG=-s if test x$jack == "xyes"; then LDFLAGS=$LDFLAGS" -lrt -ljack"; fi --- 99,105 ---- if test `uname -s` = Linux; then LDFLAGS="-Wl,-export-dynamic" ! if test "$static" = yes; then LDFLAGS="$LDFLAGS -static"; fi EXT=pd_linux ! MORECFLAGS="-DDL_OPEN -DPA_USE_OSS -DUNIX -DUNISTD -fno-strict-aliasing" STRIPFLAG=-s if test x$jack == "xyes"; then LDFLAGS=$LDFLAGS" -lrt -ljack"; fi *************** *** 110,121 **** if test `uname -s` = Darwin; then ! LDFLAGS="-Wl -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework Carbon -framework CoreMIDI" EXT=pd_darwin ! MORECFLAGS="-DMACOSX -DUNISTD -I/usr/X11R6/include -Wno-error -DUSEAPI_PORTAUDIO -DPA_BIG_ENDIAN -DPA19 -DPA_USE_COREAUDIO" STRIPFLAG="" EXTERNTARGET=pd_darwin fi ! if test x$alsa == "xyes"; then SYSSRC=$SYSSRC" s_audio_alsa.c s_audio_alsamm.c s_midi_alsa.c" MORECFLAGS=$MORECFLAGS" -DPA_USE_ALSA -DUSEAPI_ALSA" --- 108,124 ---- if test `uname -s` = Darwin; then ! LDFLAGS="-Wl" EXT=pd_darwin ! MORECFLAGS="-DMACOSX -DUNISTD -I/usr/X11R6/include -DPA_USE_COREAUDIO" STRIPFLAG="" EXTERNTARGET=pd_darwin fi ! if test x$oss == xyes; then ! SYSSRC=$SYSSRC" s_audio_oss.c s_midi_oss.c" ! MORECFLAGS=$MORECFLAGS" -DUSEAPI_OSS" ! fi ! ! if test x$alsa == xyes; then SYSSRC=$SYSSRC" s_audio_alsa.c s_audio_alsamm.c s_midi_alsa.c" MORECFLAGS=$MORECFLAGS" -DPA_USE_ALSA -DUSEAPI_ALSA" *************** *** 123,138 **** fi ! if test `uname -s` = Darwin; then ! if test x$jack == "xyes"; then LDFLAGS=$LDFLAGS" -framework Jack"; fi ! if test x$jack == "xrun"; then LDFLAGS=$LDFLAGS" -framework Jack"; fi fi - if test x$jack == "xyes"; then MORECFLAGS=$MORECFLAGS" -DUSEAPI_JACK"; SYSSRC=$SYSSRC" s_audio_jack.c"; fi - if test x$jack == "xrun"; then MORECFLAGS=$MORECFLAGS" -DUSEAPI_JACK -DJACK_XRUN"; SYSSRC=$SYSSRC" s_audio_jack.c"; fi ! if test x$portaudio == "xyes"; then MORECFLAGS=$MORECFLAGS" -DUSEAPI_PORTAUDIO -DPA19" SYSSRC=$SYSSRC" s_audio_portaudio.c" fi - if test x$portmidi == "xyes"; then SYSSRC=$SYSSRC" s_midi_pm.c"; fi AC_OUTPUT(makefile) --- 126,156 ---- fi ! if test x$jack == xyes; then ! SYSSRC=$SYSSRC" s_audio_jack.c" ! if test x$jack != xno; then ! if test `uname -s` = Darwin; then ! LDFLAGS=$LDFLAGS" -framework Jack" ! else ! LIBS="$LIBS -ljack" ! fi ! MORECFLAGS=$MORECFLAGS" -DUSEAPI_JACK" ! fi ! if test x$jack == "xrun"; then MORECFLAGS=$MORECFLAGS" -DJACK_XRUN"; fi fi ! if test x$portaudio == xyes; then MORECFLAGS=$MORECFLAGS" -DUSEAPI_PORTAUDIO -DPA19" SYSSRC=$SYSSRC" s_audio_portaudio.c" + if test `uname -s` = Darwin; then + LDFLAGS=$LDFLAGS" -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework Carbon" + fi + fi + + if test x$portmidi == xyes; then + SYSSRC=$SYSSRC" s_midi_pm.c" + if test `uname -s` = Darwin; then + LDFLAGS=$LDFLAGS" -framework CoreMIDI" + fi fi AC_OUTPUT(makefile)

1 0

pd/src configure.in, 1.5.4.5.2.11, 1.5.4.5.2.12 configure, 1.6.2.9, 1.6.2.10 makefile.in, 1.4.4.2.2.8, 1.4.4.2.2.9
by Mathieu Bouchard 22 Nov '06

22 Nov '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13592 Modified Files: Tag: devel_0_39 configure.in configure makefile.in Log Message: finished removing unneeded Tcl detection Index: makefile.in =================================================================== RCS file: /cvsroot/pure-data/pd/src/makefile.in,v retrieving revision 1.4.4.2.2.8 retrieving revision 1.4.4.2.2.9 diff -C2 -d -r1.4.4.2.2.8 -r1.4.4.2.2.9 *** makefile.in 21 Nov 2006 22:36:43 -0000 1.4.4.2.2.8 --- makefile.in 22 Nov 2006 21:46:24 -0000 1.4.4.2.2.9 *************** *** 10,15 **** MORECFLAGS = @MORECFLAGS@ INCLUDE = -I. - GINCLUDE = $(INCLUDE) @GUIFLAGS@ - GLIB = @LIBS@ LDFLAGS = @LDFLAGS@ LIB = @PDLIB@ --- 10,13 ---- *************** *** 56,62 **** $(CC) $(CFLAGS) $(GFLAGS) $(INCLUDE) -c -o $*.o $*.c - $(GOBJ) : %.o : %.c - $(CC) $(CFLAGS) $(GFLAGS) $(GINCLUDE) -c -o $*.o $*.c - pd: $(PDEXEC) --- 54,57 ---- *************** *** 72,76 **** $(CC) $(CFLAGS) $(STRIPFLAG) -o $(BIN_DIR)/pdreceive u_pdreceive.c ! $(PDEXEC): $(OBJ) $(CC) $(LDFLAGS) $(DBG_CFLAGS) -o $(PDEXEC) $(OBJ) $(LIB) --- 67,71 ---- $(CC) $(CFLAGS) $(STRIPFLAG) -o $(BIN_DIR)/pdreceive u_pdreceive.c ! $(PDEXEC): $(OBJ) $(CC) $(LDFLAGS) $(DBG_CFLAGS) -o $(PDEXEC) $(OBJ) $(LIB) *************** *** 78,94 **** cp u_main.tk $(BIN_DIR)/pd.tk - #this is for Mac OSX only... - $(BIN_DIR)/libPdTcl.dylib: $(GOBJ) $(GSRC) - $(CC) -dynamiclib -read_only_relocs warning \ - -o $(BIN_DIR)/libPdTcl.dylib $(GOBJ) \ - -F@TCLTK_FRAMEWORKS_PATH@ \ - -framework Tcl -framework Tk -framework System \ - -Wl,-install_name,@executable_path/../Resources/bin/libPdTcl.dylib - install_name_tool -change @TCLTK_FRAMEWORKS_PATH@/Tcl.framework/Versions/8.4/Tcl\ - @executable_path/../Frameworks/Tcl.framework/Versions/8.4/Tcl \ - -change @TCLTK_FRAMEWORKS_PATH@/Tk.framework/Versions/8.4/Tk \ - @executable_path/../Frameworks/Tk.framework/Versions/8.4/Tk \ - ../bin/libPdTcl.dylib - externs: cd ../extra/bonk~ ;make @EXTERNTARGET@ --- 73,76 ---- Index: configure =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/configure,v retrieving revision 1.6.2.9 retrieving revision 1.6.2.10 diff -C2 -d -r1.6.2.9 -r1.6.2.10 *** configure 22 Nov 2006 03:44:52 -0000 1.6.2.9 --- configure 22 Nov 2006 21:46:24 -0000 1.6.2.10 *************** *** 310,314 **** #endif" ! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS oss alsa jack portaudio portmidi binarymode PDLIB MORECFLAGS EXT OPT_CFLAGS USE_DEBUG_CFLAGS SYSSRC TCLTK_FRAMEWORKS_PATH STRIPFLAG GUIFLAGS OSNUMBER EXTERNTARGET CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE CPP EGREP ALLOCA LIBOBJS LTLIBOBJS' ac_subst_files='' --- 310,314 ---- #endif" ! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS oss alsa jack portaudio portmidi binarymode PDLIB MORECFLAGS EXT OPT_CFLAGS USE_DEBUG_CFLAGS SYSSRC STRIPFLAG EXTERNTARGET CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE CPP EGREP ALLOCA LIBOBJS LTLIBOBJS' ac_subst_files='' *************** *** 1318,1325 **** - - - - # Check whether --enable-alsa or --disable-alsa was given. if test "${enable_alsa+set}" = set; then --- 1318,1321 ---- *************** *** 5095,5099 **** SYSSRC=$SYSSRC" s_midi_oss.c s_audio_oss.c" STRIPFLAG=-s - OSNUMBER=0 if test x$jack == "xyes"; then LDFLAGS=$LDFLAGS" -lrt -ljack"; fi if test x$jack == "xrun"; then LDFLAGS=$LDFLAGS" -lrt -ljack"; fi --- 5091,5094 ---- *************** *** 5105,5125 **** MORECFLAGS="-DMACOSX -DUNISTD -I/usr/X11R6/include -Wno-error -DUSEAPI_PORTAUDIO -DPA_BIG_ENDIAN -DPA19 -DPA_USE_COREAUDIO" STRIPFLAG="" - - # find the Tcl/Tk Frameworks - if test -d "../../Frameworks"; then - # Miller's location - TCLTK_FRAMEWORKS_PATH="../../Frameworks" - elif test -d "/Library/Frameworks"; then - # get it from the default install location - TCLTK_FRAMEWORKS_PATH="/Library/Frameworks" - else - # Panther has Tcl here; Tiger has Tcl and Tk here - TCLTK_FRAMEWORKS_PATH="/System/Library/Frameworks" - fi - GUIFLAGS="-F$TCLTK_FRAMEWORKS_PATH -framework Tcl -framework Tk \ - -I$TCLTK_FRAMEWORKS_PATH/Tk.framework/Versions/Current/Headers \ - -I$TCLTK_FRAMEWORKS_PATH/Tcl.framework/Versions/Current/Headers \ - -I$TCLTK_FRAMEWORKS_PATH/Tcl.framework/Versions/8.4/PrivateHeaders" - OSNUMBER=2 EXTERNTARGET=pd_darwin fi --- 5100,5103 ---- *************** *** 5792,5799 **** s,@USE_DEBUG_CFLAGS@,$USE_DEBUG_CFLAGS,;t t s,@SYSSRC@,$SYSSRC,;t t - s,@TCLTK_FRAMEWORKS_PATH@,$TCLTK_FRAMEWORKS_PATH,;t t s,@STRIPFLAG@,$STRIPFLAG,;t t - s,@GUIFLAGS@,$GUIFLAGS,;t t - s,@OSNUMBER@,$OSNUMBER,;t t s,@EXTERNTARGET@,$EXTERNTARGET,;t t s,@CC@,$CC,;t t --- 5770,5774 ---- Index: configure.in =================================================================== RCS file: /cvsroot/pure-data/pd/src/configure.in,v retrieving revision 1.5.4.5.2.11 retrieving revision 1.5.4.5.2.12 diff -C2 -d -r1.5.4.5.2.11 -r1.5.4.5.2.12 *** configure.in 22 Nov 2006 03:44:52 -0000 1.5.4.5.2.11 --- configure.in 22 Nov 2006 21:46:24 -0000 1.5.4.5.2.12 *************** *** 21,29 **** AC_SUBST(USE_DEBUG_CFLAGS, no) AC_SUBST(SYSSRC) - AC_SUBST(TCLTK_FRAMEWORKS_PATH) - AC_SUBST(TCLTK_FRAMEWORKS_PATH) AC_SUBST(STRIPFLAG) - AC_SUBST(GUIFLAGS) - AC_SUBST(OSNUMBER) AC_SUBST(EXTERNTARGET) --- 21,25 ---- *************** *** 109,113 **** SYSSRC=$SYSSRC" s_midi_oss.c s_audio_oss.c" STRIPFLAG=-s - OSNUMBER=0 if test x$jack == "xyes"; then LDFLAGS=$LDFLAGS" -lrt -ljack"; fi if test x$jack == "xrun"; then LDFLAGS=$LDFLAGS" -lrt -ljack"; fi --- 105,108 ---- *************** *** 119,139 **** MORECFLAGS="-DMACOSX -DUNISTD -I/usr/X11R6/include -Wno-error -DUSEAPI_PORTAUDIO -DPA_BIG_ENDIAN -DPA19 -DPA_USE_COREAUDIO" STRIPFLAG="" - - # find the Tcl/Tk Frameworks - if test -d "../../Frameworks"; then - # Miller's location - TCLTK_FRAMEWORKS_PATH="../../Frameworks" - elif test -d "/Library/Frameworks"; then - # get it from the default install location - TCLTK_FRAMEWORKS_PATH="/Library/Frameworks" - else - # Panther has Tcl here; Tiger has Tcl and Tk here - TCLTK_FRAMEWORKS_PATH="/System/Library/Frameworks" - fi - GUIFLAGS="-F$TCLTK_FRAMEWORKS_PATH -framework Tcl -framework Tk \ - -I$TCLTK_FRAMEWORKS_PATH/Tk.framework/Versions/Current/Headers \ - -I$TCLTK_FRAMEWORKS_PATH/Tcl.framework/Versions/Current/Headers \ - -I$TCLTK_FRAMEWORKS_PATH/Tcl.framework/Versions/8.4/PrivateHeaders" - OSNUMBER=2 EXTERNTARGET=pd_darwin fi --- 114,117 ----

1 0

pd/src desire.tk,1.1.2.583,1.1.2.584
by chunlee 22 Nov '06

22 Nov '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8018 Modified Files: Tag: devel_0_39 desire.tk Log Message: necessary widgets in pdrc editor now updates after sending pd audio-setapi Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.583 retrieving revision 1.1.2.584 diff -C2 -d -r1.1.2.583 -r1.1.2.584 *** desire.tk 22 Nov 2006 02:52:37 -0000 1.1.2.583 --- desire.tk 22 Nov 2006 17:11:13 -0000 1.1.2.584 *************** *** 6070,6077 **** set trim_name [string trimleft $name "-"] if {[lsearch $choices $v] < 0} {set v [lindex $choices 0]} ! label $f.butt -text [say $v] -relief raised -width 20 balloon $f.butt "click to change setting" pack $f.label $f.butt -side left ! bind $f.butt <1> [list $self dropmenu_open $f] } --- 6070,6078 ---- set trim_name [string trimleft $name "-"] if {[lsearch $choices $v] < 0} {set v [lindex $choices 0]} ! #label $f.butt -text [say $v] -relief raised -width 20 ! label $f.butt -textvariable _($self:${name}2) -relief raised -width 20 balloon $f.butt "click to change setting" pack $f.label $f.butt -side left ! bind $f.butt <1> [list $self dropmenu_open $f $name $part] } *************** *** 6205,6212 **** incr i } ! label $f.butt -text [lindex $@$trim_name 0] -relief raised -width 20 balloon $f.butt "click to change setting" pack $f.label $f.butt -side left ! bind $f.butt <1> [list $self dropmenu_open $f] } --- 6206,6214 ---- incr i } ! #label $f.butt -text [lindex $@$trim_name 0] -relief raised -width 20 ! label $f.butt -textvariable _($self:${trim_name}0) -relief raised -width 20 balloon $f.butt "click to change setting" pack $f.label $f.butt -side left ! bind $f.butt <1> [list $self dropmenu_open $f $name $part] } *************** *** 6513,6517 **** def Dialog dropmenu_set {frame var part val say} { if {$say} {set text [say $part]} else {set text $part} ! $frame.butt configure -text $text set @$var $val } --- 6515,6519 ---- def Dialog dropmenu_set {frame var part val say} { if {$say} {set text [say $part]} else {set text $part} ! #$frame.butt configure -text $text set @$var $val } *************** *** 6658,6663 **** --- 6660,6669 ---- def ServerPrefsDialog audio_properties {indevlist indevs inchans outdevlist outdevs outchans sr dspblock advance multi} { + global pd_apilist2 set @audioindev $indevlist set @audiooutdev $outdevlist + # the following @audioindev* is used as -textvariable for devlist + set @audioindev0 [lindex $@audioindev 0] + set @audiooutdev0 [lindex $@audiooutdev 0] set @inchannels $inchans set @outchannels $outchans *************** *** 6670,6673 **** --- 6676,6680 ---- mset [list @inchannels0 @inchannels1 @inchannels2 @inchannels3] $@inchannels mset [list @outchannels0 @outchannels1 @outchannels2 @outchannels3] $@outchannels + set @audio_api_choice2 [say [lindex $pd_apilist2 $@audio_api_choice]] if {![winfo exists .$self.1.main.1]} { $self init_content *************** *** 6678,6687 **** def ServerPrefsDialog read_one {type name contents i} { ! global pdrc_options_h switch -- $type { folders {incr i; lappend @$name [lindex $contents $i]} libraries {incr i; lappend @$name [lindex $contents $i]} files {incr i; lappend @$name [lindex $contents $i]} ! choice { set @$name [lindex $contents $i]} void { set @$name 1} default {incr i; set @$name [lindex $contents $i]} --- 6685,6700 ---- def ServerPrefsDialog read_one {type name contents i} { ! global pdrc_options_h pd_apilist2 switch -- $type { folders {incr i; lappend @$name [lindex $contents $i]} libraries {incr i; lappend @$name [lindex $contents $i]} files {incr i; lappend @$name [lindex $contents $i]} ! choice { ! if {$name == "audio_api_choice"} { ! set @$name [lsearch $pd_apilist2 [lindex $contents $i]] ! } else { ! set @$name [lindex $contents $i] ! } ! } void { set @$name 1} default {incr i; set @$name [lindex $contents $i]} *************** *** 6771,6775 **** def ServerPrefsDialog update_content {} { ! puts " update........." } --- 6784,6805 ---- def ServerPrefsDialog update_content {} { ! $self update_channels ! } ! ! def ServerPrefsDialog update_channels {} { ! set indev_len [llength $@audioindev] ! set outdev_len [llength $@audiooutdev] ! set i 0 ! foreach chan $@inchannels { ! if {$i < $indev_len} {set s "readonly"} else {set s "disabled"} ! .$self.1.main.1.-inchannels.$i configure -state $s ! incr i ! } ! set i 0 ! foreach chan $@outchannels { ! if {$i < $outdev_len} {set s "readonly"} else {set s "disabled"} ! .$self.1.main.1.-outchannels.$i configure -state $s ! incr i ! } } *************** *** 6784,6797 **** def ServerPrefsDialog dropmenu_set {frame var part val say} { ! global pd_apilist pd_apilist2 ! foreach api $pd_apilist { ! if {[lsearch $api [string trimleft $part "-"]] >= 0} { ! pd pd audio-setapi [lindex $api 1] ! after 1 pd pd audio-properties } ! } ! super $frame $var $part $val $say } #################### ClientPrefsDialog --- 6814,6847 ---- def ServerPrefsDialog dropmenu_set {frame var part val say} { ! global pd_apilist pd_apilist2 _ ! set trim_part [string trimleft $part "-"] ! set trim_var [string trimleft $var "-"] ! if {$var == "audio_api_choice"} { ! foreach api $pd_apilist { ! if {$trim_part == [string tolower [lindex $api 0]]} { ! pd pd audio-setapi [lindex $api 1] ! after 1 pd pd audio-properties ! } } ! } else { ! set _($self:${trim_var}0) $part ! } ! super $frame $var $part $val $say } + def ServerPrefsDialog dropmenu_open {f name part} { + global pd_apilist pd_apilist2 _ + set trim_name [string trimleft $name "-"] + if {$trim_name != "audio_api_choice"} { + set i 0 + set m $f.menu + $m delete 0 end + foreach part $@$trim_name { + $m add command -label $part -command [list $self dropmenu_set $f $name $part $i 0] + incr i + } + } + super $f + } #################### ClientPrefsDialog

1 0

externals/iemlib start_pd-0.39-2,1.3,1.4
by musil 22 Nov '06

22 Nov '06

Update of /cvsroot/pure-data/externals/iemlib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18065 Added Files: start_pd-0.39-2 Log Message: linux start script --- NEW FILE: start_pd-0.39-2 --- #!/bin/sh /usr/local/bin/pd -r 44100 -channels 2 -audiobuf 400 -audiodev 1 -nomidi \ -path iemabs:lib \ -lib iemlib1:iemlib2:iem_mp3:iem_t3_lib

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
57
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 2006