Pd-cvs December 2006

pd-cvs@lists.iem.at

19 participants
825 discussions

externals/io/hidio hidio.c, 1.11, 1.12 hidio.h, 1.9, 1.10 hidio_darwin.c, 1.3, 1.4 hidio_types.c, 1.1, 1.2
by Olaf Matthes 08 Dec '06

08 Dec '06

Update of /cvsroot/pure-data/externals/io/hidio In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26094 Modified Files: hidio.c hidio.h hidio_darwin.c hidio_types.c Log Message: some changes to compile for Max again on OS X, still crashes when starting to poll Index: hidio_types.c =================================================================== RCS file: /cvsroot/pure-data/externals/io/hidio/hidio_types.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** hidio_types.c 8 Dec 2006 06:33:26 -0000 1.1 --- hidio_types.c 8 Dec 2006 11:28:25 -0000 1.2 *************** *** 1,4 **** ! #include "m_pd.h" #include "hidio.h" --- 1,7 ---- ! #ifdef PD #include "m_pd.h" + #else + #include "ext.h" + #endif #include "hidio.h" Index: hidio.h =================================================================== RCS file: /cvsroot/pure-data/externals/io/hidio/hidio.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** hidio.h 8 Dec 2006 06:33:26 -0000 1.9 --- hidio.h 8 Dec 2006 11:28:25 -0000 1.10 *************** *** 77,83 **** #define REQUEST_READ 2 #define REQUEST_SEND 3 ! #define REQUEST_INFO 4 ! #define REQUEST_CLOSE 5 ! #define REQUEST_QUIT 6 --- 77,84 ---- #define REQUEST_READ 2 #define REQUEST_SEND 3 ! #define REQUEST_PRINT 4 ! #define REQUEST_INFO 5 ! #define REQUEST_CLOSE 6 ! #define REQUEST_QUIT 7 *************** *** 184,188 **** void hidio_build_device_list(void); void hidio_get_events(t_hidio *x); ! void hidio_print(t_hidio* x); /* print info to the console */ void hidio_platform_specific_info(t_hidio* x); /* device info on the status outlet */ void hidio_platform_specific_free(t_hidio *x); --- 185,189 ---- void hidio_build_device_list(void); void hidio_get_events(t_hidio *x); ! void hidio_doprint(t_hidio* x); /* print info to the console */ void hidio_platform_specific_info(t_hidio* x); /* device info on the status outlet */ void hidio_platform_specific_free(t_hidio *x); *************** *** 193,197 **** unsigned short usage); - /* cross-platform force feedback functions */ t_int hidio_ff_autocenter(t_hidio *x, t_float value); --- 194,197 ---- Index: hidio_darwin.c =================================================================== RCS file: /cvsroot/pure-data/externals/io/hidio/hidio_darwin.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** hidio_darwin.c 8 Dec 2006 06:33:26 -0000 1.3 --- hidio_darwin.c 8 Dec 2006 11:28:25 -0000 1.4 *************** *** 739,743 **** /* TODO: this should be dumped for [devices( and [elements( messages */ ! void hidio_print(t_hidio *x) { if( !HIDHaveDeviceList() ) hidio_build_device_list(); --- 739,743 ---- /* TODO: this should be dumped for [devices( and [elements( messages */ ! void hidio_doprint(t_hidio *x) { if( !HIDHaveDeviceList() ) hidio_build_device_list(); Index: hidio.c =================================================================== RCS file: /cvsroot/pure-data/externals/io/hidio/hidio.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** hidio.c 8 Dec 2006 06:33:26 -0000 1.11 --- hidio.c 8 Dec 2006 11:28:25 -0000 1.12 *************** *** 132,136 **** SETFLOAT(output_atom, output_value); #else ! atom_setlong(output_atom, output_value); #endif /* PD */ outlet_anything( x->x_status_outlet, selector, 1, output_atom); --- 132,136 ---- SETFLOAT(output_atom, output_value); #else ! atom_setlong(output_atom, (long)output_value); #endif /* PD */ outlet_anything( x->x_status_outlet, selector, 1, output_atom); *************** *** 167,176 **** for(i=0;i<element_count[x->x_device_number];++i) { SETSYMBOL(output_data, element[x->x_device_number][i]->type); SETSYMBOL(output_data + 1, element[x->x_device_number][i]->name); - #ifdef PD SETFLOAT(output_data + 2, element[x->x_device_number][i]->min); SETFLOAT(output_data + 3, element[x->x_device_number][i]->max); #else atom_setlong(output_data + 2, element[x->x_device_number][i]->min); atom_setlong(output_data + 3, element[x->x_device_number][i]->max); --- 167,178 ---- for(i=0;i<element_count[x->x_device_number];++i) { + #ifdef PD SETSYMBOL(output_data, element[x->x_device_number][i]->type); SETSYMBOL(output_data + 1, element[x->x_device_number][i]->name); SETFLOAT(output_data + 2, element[x->x_device_number][i]->min); SETFLOAT(output_data + 3, element[x->x_device_number][i]->max); #else + atom_setsym(output_data, element[x->x_device_number][i]->type); + atom_setsym(output_data + 1, element[x->x_device_number][i]->name); atom_setlong(output_data + 2, element[x->x_device_number][i]->min); atom_setlong(output_data + 3, element[x->x_device_number][i]->max); *************** *** 292,299 **** { t_atom event_data[3]; SETSYMBOL(event_data, output_data->name); SETFLOAT(event_data + 1, output_data->instance); SETFLOAT(event_data + 2, output_data->value); ! outlet_anything(x->x_data_outlet,output_data->type,3,event_data); } } --- 294,308 ---- { t_atom event_data[3]; + #ifdef PD SETSYMBOL(event_data, output_data->name); SETFLOAT(event_data + 1, output_data->instance); SETFLOAT(event_data + 2, output_data->value); ! #else ! atom_setsym(event_data, output_data->name); ! atom_setsym(event_data, output_data->name); ! atom_setlong(event_data + 1, (long)output_data->instance); ! atom_setlong(event_data + 2, (long)output_data->value); ! #endif ! outlet_anything(x->x_data_outlet, output_data->type, 3, event_data); } } *************** *** 425,432 **** double right_now = clock_getlogicaltime(); #else ! /* TODO: this should use gettime() not systime_ms(). This needs to be logical ! * time, not system time because the idea is that only one instance should get ! * events from the OS in each slice of logical time <hans(a)at.or.at> */ ! double right_now = (double)systime_ms(); #endif /* PD */ t_hid_element *current_element; --- 434,439 ---- double right_now = clock_getlogicaltime(); #else ! double right_now; ! clock_getftime(&right_now); #endif /* PD */ t_hid_element *current_element; *************** *** 470,473 **** --- 477,488 ---- } + static void hidio_print(t_hidio *x) + { + pthread_mutex_lock(&x->x_mutex); + x->x_requestcode = REQUEST_PRINT; + pthread_cond_signal(&x->x_requestcondition); + pthread_mutex_unlock(&x->x_mutex); + } + static void hidio_info(t_hidio *x) { *************** *** 580,583 **** --- 595,607 ---- pthread_cond_signal(&x->x_answercondition); } + else if (x->x_requestcode == REQUEST_PRINT) + { + pthread_mutex_unlock(&x->x_mutex); + hidio_doprint(x); + pthread_mutex_lock(&x->x_mutex); + if (x->x_requestcode == REQUEST_PRINT) + x->x_requestcode = REQUEST_NOTHING; + pthread_cond_signal(&x->x_answercondition); + } else if (x->x_requestcode == REQUEST_INFO) {

1 0

pd/src desire.c,1.1.2.217.2.47,1.1.2.217.2.48
by Mathieu Bouchard 08 Dec '06

08 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28722 Modified Files: Tag: desiredata desire.c Log Message: 0.40: voutlet_dspprolog and such Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.47 retrieving revision 1.1.2.217.2.48 diff -C2 -d -r1.1.2.217.2.47 -r1.1.2.217.2.48 *** desire.c 8 Dec 2006 10:03:32 -0000 1.1.2.217.2.47 --- desire.c 8 Dec 2006 10:06:04 -0000 1.1.2.217.2.48 *************** *** 3328,3333 **** /* set up prolog DSP code */ extern "C" ! void vinlet_dspprolog(t_vinlet *x, t_signal **parentsigs, int myvecsize, int phase, int period, ! int frequency, int downsample, int upsample/* IOhannes */, int reblock, int switched) { t_signal *insig; x->updown.downsample = downsample; --- 3328,3333 ---- /* set up prolog DSP code */ extern "C" ! void vinlet_dspprolog(t_vinlet *x, t_signal **parentsigs, int myvecsize, int calcsize, int phase, int period, ! int frequency, int downsample, int upsample, int reblock, int switched) { t_signal *insig; x->updown.downsample = downsample; *************** *** 3532,3537 **** called later. */ extern "C" ! void voutlet_dspprolog(t_voutlet *x, t_signal **parentsigs, int myvecsize, int phase, int period, ! int frequency, int downsample, int upsample /* IOhannes */, int reblock, int switched) { x->updown.downsample=downsample; x->updown.upsample=upsample; /* IOhannes */ x->justcopyout = (switched && !reblock); --- 3532,3537 ---- called later. */ extern "C" ! void voutlet_dspprolog(t_voutlet *x, t_signal **parentsigs, int myvecsize, int calcsize, int phase, int period, ! int frequency, int downsample, int upsample, int reblock, int switched) { x->updown.downsample=downsample; x->updown.upsample=upsample; /* IOhannes */ x->justcopyout = (switched && !reblock); *************** *** 3561,3566 **** If we aren't reblocking, there's nothing to do here. */ extern "C" void voutlet_dspepilog(t_voutlet *x, t_signal **parentsigs, ! int myvecsize, int phase, int period, int frequency, int downsample, ! int upsample /* IOhannes */, int reblock, int switched) { if (!x->buf) return; /* this shouldn't be necesssary... */ x->updown.downsample=downsample; --- 3561,3566 ---- If we aren't reblocking, there's nothing to do here. */ extern "C" void voutlet_dspepilog(t_voutlet *x, t_signal **parentsigs, ! int myvecsize, int calcsize, int phase, int period, int frequency, int downsample, ! int upsample, int reblock, int switched) { if (!x->buf) return; /* this shouldn't be necesssary... */ x->updown.downsample=downsample;

1 0

pd/src desire.c,1.1.2.217.2.46,1.1.2.217.2.47
by Mathieu Bouchard 08 Dec '06

08 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27975 Modified Files: Tag: desiredata desire.c Log Message: 0.40: drawnumber_key Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.46 retrieving revision 1.1.2.217.2.47 diff -C2 -d -r1.1.2.217.2.46 -r1.1.2.217.2.47 *** desire.c 8 Dec 2006 09:46:39 -0000 1.1.2.217.2.46 --- desire.c 8 Dec 2006 10:03:32 -0000 1.1.2.217.2.47 *************** *** 4192,4196 **** } - #if 0 /* bash the first of (argv) with a pointer to a scalar, and send on to template as a notification message */ --- 4192,4195 ---- *************** *** 4199,4208 **** t_gpointer gp; gpointer_init(&gp); ! gpointer_setcanvas(&gp, owner, x); SETPOINTER(argv, &gp); template_notify(t, s, argc, argv); gpointer_unset(&gp); } - #endif /* call this when reading a patch from a file to declare what templates --- 4198,4206 ---- t_gpointer gp; gpointer_init(&gp); ! gpointer_setcanvas(&gp, owner, sc); SETPOINTER(argv, &gp); template_notify(t, s, argc, argv); gpointer_unset(&gp); } /* call this when reading a patch from a file to declare what templates *************** *** 4561,4567 **** } ! /* this seems dumb */ ! //static int rangecolor(int n) {return min((n/2)<<6,255);} ! static int rangecolor(int n) {return n*9/255;} static void numbertocolor(int n, char *s) { --- 4559,4563 ---- } ! static int rangecolor(int n) {return n*9/255;} static void numbertocolor(int n, char *s) { *************** *** 5147,5151 **** --- 5143,5153 ---- t_word *wp; t_template *t; + t_gpointer gpointer; + int symbol; + int firstkey; } dn; + + /* LATER protect against the template changing or the scalar disappearing + probably by attaching a gpointer here ... */ /* LATER protect against the template changing or the scalar disappearing *************** *** 5163,5166 **** --- 5165,5211 ---- #endif + static void drawnumber_key(void *z, t_floatarg fkey) { + t_drawnumber *x = (t_drawnumber *)z; + t_slot *f = &x->value; + int key = (int)fkey; + char sbuf[MAXPDSTRING]; + t_atom at; + if (!gpointer_check(&dn.gpointer, 0)) { + post("drawnumber_motion: scalar disappeared"); + return; + } + if (key == 0) return; + if (dn.symbol) { + /* key entry for a symbol field */ + if (dn.firstkey) sbuf[0] = 0; + else strncpy(sbuf, template_getsymbol(dn.t, + f->u.varsym, dn.wp, 1)->s_name, MAXPDSTRING); + sbuf[MAXPDSTRING-1] = 0; + if (key == '\b') { + if (*sbuf) sbuf[strlen(sbuf)-1] = 0; + } else { + sbuf[strlen(sbuf)+1] = 0; + sbuf[strlen(sbuf)] = key; + } + } else { + /* key entry for a numeric field. This is just a stopgap. */ + float newf; + if (dn.firstkey) sbuf[0] = 0; + else sprintf(sbuf, "%g", template_getfloat(dn.t, f->u.varsym, dn.wp, 1)); + dn.firstkey = (key == '\n'); + if (key == '\b') { + if (*sbuf) sbuf[strlen(sbuf)-1] = 0; + } else { + sbuf[strlen(sbuf)+1] = 0; + sbuf[strlen(sbuf)] = key; + } + if (sscanf(sbuf, "%g", &newf) < 1) newf = 0; + template_setfloat(dn.t, f->u.varsym, dn.wp, newf, 1); + if (dn.scalar) template_notifyforscalar(dn.t, dn.canvas, dn.scalar, gensym("change"), 1, &at); + if (dn.scalar) scalar_redraw(dn.scalar, dn.canvas); + if (dn.array) array_redraw(dn.array, dn.canvas); + } + } + static int drawnumber_click(t_gobj *z, t_canvas *canvas, t_word *data, t_template *t, t_scalar *sc, t_array *ap, float basex, float basey, int xpix, int ypix, int shift, int alt, int dbl, int doit) { t_drawnumber *x = (t_drawnumber *)z;

1 0

pd/src desire.c,1.1.2.217.2.45,1.1.2.217.2.46
by Mathieu Bouchard 08 Dec '06

08 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21938 Modified Files: Tag: desiredata desire.c Log Message: 0.40: message_adddollsym Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.45 retrieving revision 1.1.2.217.2.46 diff -C2 -d -r1.1.2.217.2.45 -r1.1.2.217.2.46 *** desire.c 8 Dec 2006 09:43:05 -0000 1.1.2.217.2.45 --- desire.c 8 Dec 2006 09:46:39 -0000 1.1.2.217.2.46 *************** *** 6096,6101 **** static void message_adddollar(t_message *x, t_floatarg f) {t_atom a; SETDOLLAR(&a, f<0?0:(int)f); binbuf_add(x->binbuf, 1, &a); gobj_changed(x,"binbuf");} ! static void message_adddollsym(t_message *x, t_symbol *s) ! {t_atom a; SETDOLLSYM(&a, s); binbuf_add(x->binbuf, 1, &a); gobj_changed(x,"binbuf");} static void message_addsemi(t_message *x) {message_add(x,0,0,0);} --- 6096,6112 ---- static void message_adddollar(t_message *x, t_floatarg f) {t_atom a; SETDOLLAR(&a, f<0?0:(int)f); binbuf_add(x->binbuf, 1, &a); gobj_changed(x,"binbuf");} ! //static void message_adddollsym(t_message *x, t_symbol *s) ! //{t_atom a; SETDOLLSYM(&a, s); binbuf_add(x->binbuf, 1, &a); gobj_changed(x,"binbuf");} ! ! static void message_adddollsym(t_message *x, t_symbol *s) { ! t_atom a; ! char buf[MAXPDSTRING]; ! buf[0] = '$'; ! strncpy(buf+1, s->s_name, MAXPDSTRING-2); ! buf[MAXPDSTRING-1] = 0; ! SETDOLLSYM(&a, gensym(buf)); ! binbuf_add(x->binbuf, 1, &a); ! gobj_changed(x,"binbuf"); ! } static void message_addsemi(t_message *x) {message_add(x,0,0,0);}

1 0

pd/src desire.c,1.1.2.217.2.44,1.1.2.217.2.45
by Mathieu Bouchard 08 Dec '06

08 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20512 Modified Files: Tag: desiredata desire.c Log Message: 0.40: gatom_list Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.44 retrieving revision 1.1.2.217.2.45 diff -C2 -d -r1.1.2.217.2.44 -r1.1.2.217.2.45 *** desire.c 8 Dec 2006 09:17:53 -0000 1.1.2.217.2.44 --- desire.c 8 Dec 2006 09:43:05 -0000 1.1.2.217.2.45 *************** *** 6206,6209 **** --- 6206,6218 ---- } + /* We need a list method because, since there's both an "inlet" and a + "nofirstin" flag, the standard list behavior gets confused. */ + static void gatom_list(t_gatom *x, t_symbol *s, int argc, t_atom *argv) { + if (!argc) gatom_bang(x); + else if (argv->a_type == A_FLOAT) gatom_float(x, argv->a_w.w_float); + else if (argv->a_type == A_SYMBOL) gatom_symbol(x, argv->a_w.w_symbol); + else pd_error(x, "gatom_list: need float or symbol"); + } + void canvas_atom(t_canvas *gl, t_atomtype type, t_symbol *s, int argc, t_atom *argv) { t_gatom *x = (t_gatom *)pd_new(gatom_class); *************** *** 6393,6396 **** --- 6402,6406 ---- class_addfloat(c, gatom_float); class_addsymbol(c, gatom_symbol); + class_addlist(c, gatom_list); class_addmethod3(c, gatom_set, "set","*"); class_addmethod3(c, gatom_reload, "reload","*");

1 0

autobuild: pd-extended macosx104-powerpc 2006-12-08 03.15.05
by pd＠macosx104-powerpc.idmi.poly.edu 08 Dec '06

08 Dec '06

setenv ENABLE_APPLE_JAM_EXTENSIONS YES setenv ENABLE_APPLE_JAM_OUTPUT_ANNOTATION YES setenv GROUP pd setenv MACOSX_DEPLOYMENT_TARGET 10.3 setenv NATIVE_ARCH ppc setenv USER pd /Developer/Private/jam -d2 -j1 JAMBASE=/Developer/Makefiles/pbx_jamfiles/ProjectBuilderJambase JAMFILE=/Users/pd/auto-build/pd-extended/externals/io/hidio/HID\ Utilities\ Source/build/HID\ Utilities\ Slib.build/Default/libHIDUtilities.a.build/libHIDUtilities.a.jam build ACTION=build _DEFAULT_GCC_VERSION=4.0 GCC_VERSION_IDENTIFIER=4_0 CONFIGURATION=Default BUILD_STYLE=Default CPP_HEADERMAP_FILE=/Users/pd/auto-build/pd-extended/externals/io/hidio/HID\ Utilities\ Source/build/HID\ Utilities\ Slib.build/Default/libHIDUtilities.a.build/libHIDUtilities.a.hmap SRCROOT=/Users/pd/auto-build/pd-extended/externals/io/hidio/HID\ Utilities\ Source OBJROOT=/Users/pd/auto-build/pd-extended/externals/io/hidio/HID\ Utilities\ Source/build SYMROOT=/Users/pd/auto-build/pd-extended/externals/io/hidio/HID\ Utilities\ Source/build DSTROOT=/tmp/HID\ Utilities\ Slib.dst ** BUILD SUCCEEDED ** cc -bundle -bundle_loader /Users/pd/auto-build/pd-extended/pd/bin/pd -L/sw/lib -o /Users/pd/auto-build/pd-extended/externals/io/hidio/hidio.pd_darwin \ /Users/pd/auto-build/pd-extended/externals/io/hidio/input_arrays.o /Users/pd/auto-build/pd-extended/externals/io/hidio/hidio_darwin.o /Users/pd/auto-build/pd-extended/externals/io/hidio/hidio.o -lm -lc -L/Users/pd/auto-build/pd-extended/externals/io/hidio/HID\ Utilities\ Source/build -L/Users/pd/auto-build/pd-extended/externals/io/hidio/HID\ Utilities\ Source/build/Default -lHIDUtilities -weak_framework Carbon -weak_framework IOKit -weak_framework ForceFeedback /usr/bin/ld: Undefined symbols: _generate_event_symbols _generate_type_symbols collect2: ld returned 1 exit status make[2]: *** [/Users/pd/auto-build/pd-extended/externals/io/hidio/hidio.pd_darwin] Error 1 make[1]: *** [externals_install] Error 2 make: *** [extended_install] Error 2 upload specs darwin_app . dmg Uploading /home/pd/auto-build/pd-extended/packages/darwin_app/./Pd*.dmg ls: /home/pd/auto-build/pd-extended/packages/darwin_app/./Pd*.dmg: No such file or directory

1 0

pd/src x_gui.c, 1.3.4.1.2.5, 1.3.4.1.2.5.2.1 desire.tk, 1.1.2.600.2.42, 1.1.2.600.2.43
by Mathieu Bouchard 08 Dec '06

08 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17930 Modified Files: Tag: desiredata x_gui.c desire.tk Log Message: 0.40: openpanel, savepanel Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.600.2.42 retrieving revision 1.1.2.600.2.43 diff -C2 -d -r1.1.2.600.2.42 -r1.1.2.600.2.43 *** desire.tk 8 Dec 2006 02:41:36 -0000 1.1.2.600.2.42 --- desire.tk 8 Dec 2006 09:35:30 -0000 1.1.2.600.2.43 *************** *** 7425,7428 **** --- 7425,7452 ---- #---------------------------------------------------------------- + # openpanel & savepanel + + proc pdtk_openpanel {target localdir} { + if {$localdir == ""} {set localdir $::pd_opendir} + set filename [tk_getOpenFile -initialdir $localdir] + if {$filename != ""} { + set directory [string range $filename 0 [expr [string last / $filename]-1]] + set pd_opendir $directory + netsend [list $target callback [pdtk_enquote $filename]] + } + } + + proc pdtk_savepanel {target localdir} { + if {$localdir == ""} { + set filename [tk_getSaveFile] + } else { + set filename [tk_getSaveFile -initialdir $localdir] + } + if {$filename != ""} { + netsend [list $target callback [pdtk_enquote $filename]] + } + } + + #---------------------------------------------------------------- # To err is human. Index: x_gui.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/x_gui.c,v retrieving revision 1.3.4.1.2.5 retrieving revision 1.3.4.1.2.5.2.1 diff -C2 -d -r1.3.4.1.2.5 -r1.3.4.1.2.5.2.1 *** x_gui.c 30 Nov 2005 13:36:58 -0000 1.3.4.1.2.5 --- x_gui.c 8 Dec 2006 09:35:30 -0000 1.3.4.1.2.5.2.1 *************** *** 212,215 **** --- 212,221 ---- static void openpanel_symbol(t_openpanel *x, t_symbol *s) { + char *path = (s && s->s_name) ? s->s_name : "\"\""; + sys_vgui("pdtk_openpanel {%s} {%s}\n", x->x_s->s_name, path); + } + + static void openpanel_callback(t_openpanel *x, t_symbol *s) + { outlet_symbol(x->x_obj.ob_outlet, s); } *************** *** 231,234 **** --- 237,241 ---- class_addbang(openpanel_class, openpanel_bang); class_addmethod(openpanel_class, (t_method)openpanel_path, gensym("path"), A_SYMBOL, 0); + class_addmethod(openpanel_class, (t_method)openpanel_callback, gensym("callback"), A_SYMBOL, 0); class_addsymbol(openpanel_class, openpanel_symbol); } *************** *** 259,268 **** static void savepanel_bang(t_savepanel *x) { ! const char*path=(x->x_path&&x->x_path->s_name)?x->x_path->s_name:"\"\""; ! sys_vgui("pdtk_savepanel {%s} {%s}\n", x->x_s->s_name, path); } static void savepanel_symbol(t_savepanel *x, t_symbol *s) { outlet_symbol(x->x_obj.ob_outlet, s); } --- 266,283 ---- static void savepanel_bang(t_savepanel *x) { ! const char*path=(x->x_path&&x->x_path->s_name)?x->x_path->s_name:"\"\""; ! sys_vgui("pdtk_savepanel {%s} {%s}\n", x->x_s->s_name, path); } static void savepanel_symbol(t_savepanel *x, t_symbol *s) { + // x->x_path = s; + // savepanel_bang(x); + char *path = (s && s->s_name) ? s->s_name : "\"\""; + sys_vgui("pdtk_savepanel {%s} {%s}\n", x->x_s->s_name, path); + } + + static void savepanel_callback(t_savepanel *x, t_symbol *s) + { outlet_symbol(x->x_obj.ob_outlet, s); } *************** *** 280,283 **** --- 295,299 ---- class_addbang(savepanel_class, savepanel_bang); class_addmethod(savepanel_class, (t_method)openpanel_path, gensym("path"), A_SYMBOL, 0); + class_addmethod(savepanel_class, (t_method)savepanel_callback, gensym("callback"), A_SYMBOL, 0); class_addsymbol(savepanel_class, savepanel_symbol); }

1 0

pd/src desire.c, 1.1.2.217.2.43, 1.1.2.217.2.44 desire.h, 1.1.2.49.2.5, 1.1.2.49.2.6
by Mathieu Bouchard 08 Dec '06

08 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11561 Modified Files: Tag: desiredata desire.c desire.h Log Message: 0.40: part of the hidename code Index: desire.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.h,v retrieving revision 1.1.2.49.2.5 retrieving revision 1.1.2.49.2.6 diff -C2 -d -r1.1.2.49.2.5 -r1.1.2.49.2.6 *** desire.h 8 Dec 2006 04:19:52 -0000 1.1.2.49.2.5 --- desire.h 8 Dec 2006 09:17:55 -0000 1.1.2.49.2.6 *************** *** 229,233 **** #endif t_scalar *scalar; /* scalar "containing" the array */ ! t_canvas *canvas; /* containing canvas */ t_symbol *name; /* unexpanded name (possibly with leading '$') */ t_symbol *realname; /* expanded name (symbol we're bound to) */ --- 229,233 ---- #endif t_scalar *scalar; /* scalar "containing" the array */ ! t_canvas *canvas; /* containing canvas */ t_symbol *name; /* unexpanded name (possibly with leading '$') */ t_symbol *realname; /* expanded name (symbol we're bound to) */ *************** *** 235,238 **** --- 235,239 ---- char saveit; /* true if we should save this with parent */ char listviewing; /* true if list view window is open */ + char hidename; /* don't print name above graph */ }; Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.43 retrieving revision 1.1.2.217.2.44 diff -C2 -d -r1.1.2.217.2.43 -r1.1.2.217.2.44 *** desire.c 8 Dec 2006 08:04:22 -0000 1.1.2.217.2.43 --- desire.c 8 Dec 2006 09:17:53 -0000 1.1.2.217.2.44 *************** *** 1598,1602 **** } ! t_symbol *garray_getname(t_garray *x) {return x->realname;} /* if there is one garray in a graph, reset the graph's coordinates --- 1598,1608 ---- } ! /* get the array's name. Return nonzero if it should be hidden */ ! int garray_getname(t_garray *x, t_symbol **namep) { ! // *namep = x->name; ! *namep = x->realname; ! return x->hidename; ! } ! /* if there is one garray in a graph, reset the graph's coordinates *************** *** 1738,1743 **** } ! void garray_arrayviewlist_fillpage(t_garray *x, t_float page) { ! int yonset=0, elemsize=0; float yval; t_array *a = garray_getarray_floatonly(x, &yonset, &elemsize); --- 1744,1749 ---- } ! void garray_arrayviewlist_fillpage(t_garray *x, t_float page, t_float fTopItem) { ! int yonset=0, elemsize=0, topItem=(int)fTopItem; float yval; t_array *a = garray_getarray_floatonly(x, &yonset, &elemsize); *************** *** 1755,1758 **** --- 1761,1765 ---- sys_vgui(".%sArrayWindow.lb insert %d {%d) %g}\n", x->realname->s_name, i%ARRAYPAGESIZE, i, yval); } + sys_vgui(".%sArrayWindow.lb yview %d\n", x->realname->s_name, topItem); } *************** *** 2258,2262 **** class_addmethod3(c, garray_arraydialog, "arraydialog", "sfff"); class_addmethod3(c, garray_arrayviewlist_new, "arrayviewlistnew", ""); ! class_addmethod3(c, garray_arrayviewlist_fillpage, "arrayviewlistfillpage", "f"); class_addmethod3(c, garray_arrayviewlist_close, "arrayviewclose", ""); class_setsavefn(garray_class, garray_save); --- 2265,2269 ---- class_addmethod3(c, garray_arraydialog, "arraydialog", "sfff"); class_addmethod3(c, garray_arrayviewlist_new, "arrayviewlistnew", ""); ! class_addmethod3(c, garray_arrayviewlist_fillpage, "arrayviewlistfillpage", "fF"); class_addmethod3(c, garray_arrayviewlist_close, "arrayviewclose", ""); class_setsavefn(garray_class, garray_save); *************** *** 2572,2577 **** /* --------------------------- widget behavior ------------------- */ - t_symbol *garray_getname(t_garray *x); - #define FONT "-*-courier-bold--normal--%d-*" --- 2579,2582 ---- *************** *** 2593,2597 **** return; } - int i; float f; /* draw a rectangle around the graph */ --- 2598,2601 ---- *************** *** 2599,2609 **** (long)c, x1, y1, x1, y2, x2, y2, x2, y1, x1, y1, tag); /* if there's just one "garray" in the graph, write its name along the top */ ! t_gobj *g = x->list; ! if (g && !g->g_next && g->_class == garray_class) { ! int ymin = y1<y2 ? y1 : y2; ! t_symbol *s = garray_getname((t_garray *)g); ! sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor sw -font "FONT" -tags %s\n", ! (long)c, x1, ymin, s->s_name, 42 /*sys_hostfontsize(canvas_getfont(x))*/, tag); } /* draw ticks on horizontal borders. If lperb field is zero, this is disabled. */ #define DRAWTICK(x1,y1,x2,y2) sys_vgui(".x%lx.c create line %d %d %d %d -tags %s\n", \ --- 2603,2616 ---- (long)c, x1, y1, x1, y2, x2, y2, x2, y1, x1, y1, tag); /* if there's just one "garray" in the graph, write its name along the top */ ! int i = min(y1,y2)-1; ! t_symbol *arrayname; ! canvas_each(g,x) if (g->g_pd == garray_class && !garray_getname((t_garray *)g, &arrayname)) { ! // i -= sys_fontheight(glist_getfont(x)); ! sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor nw\ ! -font -*-courier-bold--normal--%d-* -tags %s\n", ! (long)canvas_getcanvas(x), x1, i, arrayname->s_name, ! 42/*sys_hostfontsize(canvas_getfont(x))*/, tag); } + /* draw ticks on horizontal borders. If lperb field is zero, this is disabled. */ #define DRAWTICK(x1,y1,x2,y2) sys_vgui(".x%lx.c create line %d %d %d %d -tags %s\n", \

1 0

pd/src makefile.mingw,1.3.2.1.2.1,NONE
by Mathieu Bouchard 08 Dec '06

08 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30750 Removed Files: Tag: desiredata makefile.mingw Log Message: this one should be remade as ifdefs in the new makefile. --- makefile.mingw DELETED ---

1 0

pd/src s_main.c,1.7.4.17.2.22.2.14,1.7.4.17.2.22.2.15
by Mathieu Bouchard 08 Dec '06

08 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29276 Modified Files: Tag: desiredata s_main.c Log Message: 0.40 Index: s_main.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_main.c,v retrieving revision 1.7.4.17.2.22.2.14 retrieving revision 1.7.4.17.2.22.2.15 diff -C2 -d -r1.7.4.17.2.22.2.14 -r1.7.4.17.2.22.2.15 *** s_main.c 8 Dec 2006 08:28:18 -0000 1.7.4.17.2.22.2.14 --- s_main.c 8 Dec 2006 08:36:39 -0000 1.7.4.17.2.22.2.15 *************** *** 756,761 **** if (sys_main_dacblocksize) dacblksize = sys_main_dacblocksize; ! sys_open_audio(naudioindev, audioindev, naudioindev, chindev, ! naudiooutdev, audiooutdev, naudiooutdev, choutdev, rate, dacblksize, advance, scheduler, 0); sys_open_midi(nmidiindev, midiindev, nmidioutdev, midioutdev, 0); } --- 756,763 ---- if (sys_main_dacblocksize) dacblksize = sys_main_dacblocksize; ! sys_open_audio(naudioindev, audioindev, nchindev, chindev, ! naudiooutdev, audiooutdev, nchoutdev, choutdev, rate, dacblksize, advance, scheduler, 0); ! ! sys_open_midi(nmidiindev, midiindev, nmidioutdev, midioutdev, 0); }

1 0

← Newer
1
...
60
61
62
63
64
65
66
...
83
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 December 2006