Pd-cvs August 2007

pd-cvs@lists.iem.at

18 participants
618 discussions

pd/src desire.tk,1.1.2.600.2.319,1.1.2.600.2.320
by chunlee 08 Aug '07

08 Aug '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4216 Modified Files: Tag: desiredata desire.tk Log Message: accepting and playing back macro sent from [macro] Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.600.2.319 retrieving revision 1.1.2.600.2.320 diff -C2 -d -r1.1.2.600.2.319 -r1.1.2.600.2.320 *** desire.tk 8 Aug 2007 18:40:39 -0000 1.1.2.600.2.319 --- desire.tk 8 Aug 2007 21:12:36 -0000 1.1.2.600.2.320 *************** *** 1356,1359 **** --- 1356,1360 ---- def View draw {} {} + #def View delete {} {if {[[$self class] <= Box]} {$self erase}; super} def View delete {} {$self erase; super} def View erase {} {$self item_delete} *************** *** 1697,1701 **** set @pixsize {0 0} set @margin {0 0} ! #set @grid 1 } --- 1698,1703 ---- set @pixsize {0 0} set @margin {0 0} ! set @macro_q {} ! set @macro_delay 200 } *************** *** 4989,4995 **** def Canvas macro_event_append {e} { ! puts "check if the q is empty" ! puts "event::: $e" } #-----------------------------------------------------------------------------------# class_new Wire {View} --- 4991,5022 ---- def Canvas macro_event_append {e} { ! if {![llength $@macro_q]} {after $@macro_delay [list $self macro_schedule $@macro_delay]} ! lappend @macro_q $e } + + def Canvas macro_schedule {delay} { + if {[llength $@macro_q]} { + set w [focus] + set m [lindex $@macro_q 0] + set fudge_motion 0 + mset {event x y mode k} $m + switch $event { + KeyPress {set name [modekey $k $mode]; set fudge_motion 1} + ButtonPress {set name $event-$k; set fudge_motion 1} + ButtonRelease {set name $event-$k; set fudge_motion 1} + Motion {set name $event} + default {puts "Error: this event should not have been here.."} + } + if {$fudge_motion} {event generate $w <Motion> -x $x -y $y} + event generate $w <$name> -x $x -y $y + if {$event=="KeyPress"} {event generate $w <KeyRelease-$k> -x $x -y $y} + set @macro_q [lreplace $@macro_q 0 0] + after $delay [list $self macro_schedule $@macro_delay] + } + } + + def Canvas foobar {} {$self macro_schedule 1000} + + def Canvas macro_q {} {puts "$@macro_q"} #-----------------------------------------------------------------------------------# class_new Wire {View}

1 0

externals/pidip/modules pdp_theonice~.c, 1.5, 1.6 pdp_imgloader.c, 1.6, 1.7
by Yves Degoyon 08 Aug '07

08 Aug '07

Update of /cvsroot/pure-data/externals/pidip/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22342 Modified Files: pdp_theonice~.c pdp_imgloader.c Log Message: PiDiP 0.12.21 Index: pdp_imgloader.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_imgloader.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** pdp_imgloader.c 10 May 2007 23:01:30 -0000 1.6 --- pdp_imgloader.c 8 Aug 2007 19:03:08 -0000 1.7 *************** *** 84,88 **** Imlib_Load_Error imliberr; ! post( "pdp_imgloader : loading : %s", filename->s_name ); if ( x->x_image != NULL ) --- 84,88 ---- Imlib_Load_Error imliberr; ! // post( "pdp_imgloader : loading : %s", filename->s_name ); if ( x->x_image != NULL ) *************** *** 102,106 **** x->x_iwidth = imlib_image_get_width(); x->x_iheight = imlib_image_get_height(); ! post( "pdp_imgloader : loaded : %s (%dx%d)", filename->s_name, x->x_iwidth, x->x_iheight ); x->x_xoffset = (int) fx; x->x_yoffset = (int) fy; --- 102,106 ---- x->x_iwidth = imlib_image_get_width(); x->x_iheight = imlib_image_get_height(); ! // post( "pdp_imgloader : loaded : %s (%dx%d)", filename->s_name, x->x_iwidth, x->x_iheight ); x->x_xoffset = (int) fx; x->x_yoffset = (int) fy; *************** *** 336,341 **** ( (int)fy3 >= 0 ) && ( (int)fy3 < x->x_vheight ) ) { ! post( "pdp_imgloader : hide : coordinates : %d %d %d %d %d %d", ! (int)fx1, (int)fy1, (int)fx2, (int)fy2, (int)fx3, (int)fy3 ); for ( ti=0; ti<MAX_ZONES; ti++ ) { --- 336,341 ---- ( (int)fy3 >= 0 ) && ( (int)fy3 < x->x_vheight ) ) { ! // post( "pdp_imgloader : hide : coordinates : %d %d %d %d %d %d", ! // (int)fx1, (int)fy1, (int)fx2, (int)fy2, (int)fx3, (int)fy3 ); for ( ti=0; ti<MAX_ZONES; ti++ ) { *************** *** 409,416 **** } } ! post( "pdp_imgloader : hiding : [%d,%d]/[%d,%d]/[%d,%d], ", ! x->x_hiddenzones[ti].x1, x->x_hiddenzones[ti].y1, ! x->x_hiddenzones[ti].x2, x->x_hiddenzones[ti].y2, ! x->x_hiddenzones[ti].x3, x->x_hiddenzones[ti].y3 ); if ( (x->x_hiddenzones[ti].x2-x->x_hiddenzones[ti].x1) != 0 ) { --- 409,416 ---- } } ! // post( "pdp_imgloader : hiding : [%d,%d]/[%d,%d]/[%d,%d], ", ! // x->x_hiddenzones[ti].x1, x->x_hiddenzones[ti].y1, ! // x->x_hiddenzones[ti].x2, x->x_hiddenzones[ti].y2, ! // x->x_hiddenzones[ti].x3, x->x_hiddenzones[ti].y3 ); if ( (x->x_hiddenzones[ti].x2-x->x_hiddenzones[ti].x1) != 0 ) { *************** *** 443,452 **** ( ( (float) x->x_hiddenzones[ti].x3 ) - ( (float) x->x_hiddenzones[ti].x1 ) ); } ! post( "pdp_imgloader : hiding : a1=%f b1=%f", ! x->x_hiddenzones[ti].a1, x->x_hiddenzones[ti].b1 ); ! post( "pdp_imgloader : hiding : a2=%f b2=%f", ! x->x_hiddenzones[ti].a2, x->x_hiddenzones[ti].b2 ); ! post( "pdp_imgloader : hiding : a3=%f b3=%f", ! x->x_hiddenzones[ti].a3, x->x_hiddenzones[ti].b3 ); pdp_imgloader_update_mask( x ); return; --- 443,452 ---- ( ( (float) x->x_hiddenzones[ti].x3 ) - ( (float) x->x_hiddenzones[ti].x1 ) ); } ! // post( "pdp_imgloader : hiding : a1=%f b1=%f", ! // x->x_hiddenzones[ti].a1, x->x_hiddenzones[ti].b1 ); ! // post( "pdp_imgloader : hiding : a2=%f b2=%f", ! // x->x_hiddenzones[ti].a2, x->x_hiddenzones[ti].b2 ); ! // post( "pdp_imgloader : hiding : a3=%f b3=%f", ! // x->x_hiddenzones[ti].a3, x->x_hiddenzones[ti].b3 ); pdp_imgloader_update_mask( x ); return; *************** *** 482,489 **** argv[5].a_w.w_float *= x->x_vheight; ! post( "pdp_imgloader : rawhide : coordinates : %f %f %f %f %f %f (width=%d) (height=%d)", ! argv[0].a_w.w_float, argv[1].a_w.w_float, argv[2].a_w.w_float, ! argv[3].a_w.w_float, argv[4].a_w.w_float, argv[5].a_w.w_float, ! x->x_vwidth, x->x_vheight ); pdp_imgloader_hide( x, s, argc, argv ); --- 482,489 ---- argv[5].a_w.w_float *= x->x_vheight; ! // post( "pdp_imgloader : rawhide : coordinates : %f %f %f %f %f %f (width=%d) (height=%d)", ! // argv[0].a_w.w_float, argv[1].a_w.w_float, argv[2].a_w.w_float, ! // argv[3].a_w.w_float, argv[4].a_w.w_float, argv[5].a_w.w_float, ! // x->x_vwidth, x->x_vheight ); pdp_imgloader_hide( x, s, argc, argv ); *************** *** 782,786 **** class_addmethod(pdp_imgloader_class, (t_method)pdp_imgloader_fit, gensym("fit"), A_DEFFLOAT, A_NULL); - } --- 782,785 ---- Index: pdp_theonice~.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_theonice~.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** pdp_theonice~.c 10 May 2007 23:01:30 -0000 1.5 --- pdp_theonice~.c 8 Aug 2007 19:03:08 -0000 1.6 *************** *** 143,154 **** vorbis_comment x_vorbis_comment; // vorbis comment yuv_buffer x_yuvbuffer; // yuv buffer ! int x_eos; // end of stream ! int x_akbps; // audio bit rate ! int x_vkbps; // video bit rate t_float x_aquality; // audio quality ! int x_vquality; // video quality ! int x_abytesout; // audio bytes written ! int x_vbytesout; // video bytes written double x_audiotime; // audio stream time double x_paudiotime; // previous value --- 143,154 ---- vorbis_comment x_vorbis_comment; // vorbis comment yuv_buffer x_yuvbuffer; // yuv buffer ! int x_eos; // end of stream ! int x_akbps; // audio bit rate ! int x_vkbps; // video bit rate t_float x_aquality; // audio quality ! int x_vquality; // video quality ! int x_abytesout; // audio bytes written ! int x_vbytesout; // video bytes written double x_audiotime; // audio stream time double x_paudiotime; // previous value *************** *** 907,910 **** --- 907,913 ---- } + static void pdp_theonice_send_video(t_pdp_theonice *x); + static void pdp_theonice_send_audio(t_pdp_theonice *x); + /* store audio data in PCM format in a buffer for now */ static t_int *pdp_theonice_perform(t_int *w) *************** *** 933,937 **** if ( x->x_audioin_position >= MAX_AUDIO_PACKET_SIZE-1 ) { ! post( "pdp_theonice~ : reaching end of audio buffer" ); } } --- 936,940 ---- if ( x->x_audioin_position >= MAX_AUDIO_PACKET_SIZE-1 ) { ! post( "pdp_theonice~ : audio x-run" ); } } *************** *** 969,972 **** --- 972,977 ---- } + pdp_theonice_send_audio(x); + return (w+5); } *************** *** 981,1013 **** t_pdp *header = pdp_packet_header(x->x_packet0); unsigned char *data = (unsigned char *)pdp_packet_data(x->x_packet0); ! int i, ret; int px, py; unsigned char *pY, *pU, *pV; - struct timeval tstream; - struct timeval etime; - int nbaudiosamples, nbusecs, nbsamples; t_float fframerate=0.0; - int ttime, atime; ! if ( ( (int)(header->info.image.width) != x->x_vwidth ) || ! ( (int)(header->info.image.height) != x->x_vheight ) ) ! { ! post( "pdp_theonice~: reallocating ressources" ); ! pdp_theonice_free_ressources( x ); ! pdp_theonice_shutdown_encoder( x ); ! x->x_vwidth = header->info.image.width; ! x->x_vheight = header->info.image.height; ! x->x_vsize = x->x_vwidth*x->x_vheight; ! x->x_tvwidth=((x->x_vwidth + 15) >>4)<<4; ! x->x_tvheight=((x->x_vheight + 15) >>4)<<4; ! pdp_theonice_allocate( x ); ! if ( x->x_tzero.tv_sec != 0 ) ! { ! pdp_theonice_init_encoder( x ); ! pdp_theonice_write_headers( x ); ! } ! } ! x->x_frames++; if ( x->x_frameswritten == 0 ) --- 986,1030 ---- t_pdp *header = pdp_packet_header(x->x_packet0); unsigned char *data = (unsigned char *)pdp_packet_data(x->x_packet0); ! int i; int px, py; unsigned char *pY, *pU, *pV; t_float fframerate=0.0; ! if ( ( (int)(header->info.image.width) != x->x_vwidth ) || ! ( (int)(header->info.image.height) != x->x_vheight ) ) ! { ! post( "pdp_theonice~: reallocating ressources" ); ! pdp_theonice_free_ressources( x ); ! pdp_theonice_shutdown_encoder( x ); ! x->x_vwidth = header->info.image.width; ! x->x_vheight = header->info.image.height; ! x->x_vsize = x->x_vwidth*x->x_vheight; ! x->x_tvwidth=((x->x_vwidth + 15) >>4)<<4; ! x->x_tvheight=((x->x_vheight + 15) >>4)<<4; ! pdp_theonice_allocate( x ); ! if ( x->x_tzero.tv_sec != 0 ) ! { ! pdp_theonice_init_encoder( x ); ! pdp_theonice_write_headers( x ); ! } ! } ! pY = x->x_yuvbuffer.y; ! memcpy( (void*)pY, (void*)&data[0], x->x_vsize ); ! pV = x->x_yuvbuffer.v; ! memcpy( (void*)pV, (void*)&data[x->x_vsize], (x->x_vsize>>2) ); ! pU = x->x_yuvbuffer.u; ! memcpy( (void*)pU, (void*)&data[x->x_vsize+(x->x_vsize>>2)], (x->x_vsize>>2) ); ! ! x->x_frames++; ! ! pdp_theonice_send_video(x); ! } ! ! static void pdp_theonice_send_video(t_pdp_theonice *x) ! { ! struct timeval etime; ! int ttime, atime, ret; ! struct timeval tstream; if ( x->x_frameswritten == 0 ) *************** *** 1043,1076 **** } - pY = x->x_yuvbuffer.y; - memcpy( (void*)pY, (void*)&data[0], x->x_vsize ); - pV = x->x_yuvbuffer.v; - memcpy( (void*)pV, (void*)&data[x->x_vsize], (x->x_vsize>>2) ); - pU = x->x_yuvbuffer.u; - memcpy( (void*)pU, (void*)&data[x->x_vsize+(x->x_vsize>>2)], (x->x_vsize>>2) ); - if ( x->x_socketfd > 0 && x->x_streaming ) { - // calculate the number of audio samples to output - if ( gettimeofday(&tstream, NULL) == -1) - { - post("pdp_theonice~ : could set stop time" ); - } - // calculate time diff in micro seconds - nbusecs = ( tstream.tv_usec - x->x_tprevstream.tv_usec ) + - ( tstream.tv_sec - x->x_tprevstream.tv_sec )*1000000; - nbaudiosamples = (sys_getsr()*1000000)/nbusecs; - memcpy( &x->x_tprevstream, &tstream, sizeof( struct timeval) ); - - if ( x->x_audioin_position > nbaudiosamples ) - { - nbsamples = nbaudiosamples; - } - else - { - nbsamples = x->x_audioin_position; - } - // if ( x->x_audiotime > x->x_videotime ) nbsamples = -1; - if ( ( ret = theora_encode_YUVin( &x->x_theora_state, &x->x_yuvbuffer ) ) != 0 ) { --- 1060,1065 ---- *************** *** 1110,1116 **** } ! // audio is ahead, don't send no audio ! if ( nbsamples < 0 ) return; x->x_vbuffer=vorbis_analysis_buffer( &x->x_dsp_state, nbsamples ); if ( !x->x_vbuffer ) return; --- 1099,1134 ---- } ! } ! } ! ! static void pdp_theonice_send_audio(t_pdp_theonice *x) ! { ! int nbaudiosamples, nbusecs, nbsamples, ret; ! struct timeval tstream; + // calculate the number of audio samples to output + if ( gettimeofday(&tstream, NULL) == -1) + { + post("pdp_theonice~ : could set stop time" ); + } + // calculate time diff in micro seconds + nbusecs = ( tstream.tv_usec - x->x_tprevstream.tv_usec ) + + ( tstream.tv_sec - x->x_tprevstream.tv_sec )*1000000; + nbaudiosamples = (sys_getsr()*1000000)/nbusecs; + memcpy( &x->x_tprevstream, &tstream, sizeof( struct timeval) ); + + if ( x->x_audioin_position > nbaudiosamples ) + { + nbsamples = nbaudiosamples; + } + else + { + nbsamples = x->x_audioin_position; + } + // audio is ahead of video, do not send audio + if ( x->x_audiotime > x->x_videotime ) return; + + if ( x->x_socketfd > 0 && x->x_streaming ) + { x->x_vbuffer=vorbis_analysis_buffer( &x->x_dsp_state, nbsamples ); if ( !x->x_vbuffer ) return; *************** *** 1331,1335 **** class_addmethod(pdp_theonice_class, (t_method)pdp_theonice_genre, gensym("genre"), A_GIMME, A_NULL); - } --- 1349,1352 ----

1 0

externals/pidip configure.ac,1.18,1.19
by Yves Degoyon 08 Aug '07

08 Aug '07

Update of /cvsroot/pure-data/externals/pidip In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19794 Modified Files: configure.ac Log Message: handle quicktime \>= 1.0.0 Index: configure.ac =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/configure.ac,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** configure.ac 10 May 2007 05:27:58 -0000 1.18 --- configure.ac 8 Aug 2007 18:56:10 -0000 1.19 *************** *** 135,139 **** qt_minor_version="`lqt-config --version | cut -f3 -d'.'`" ! echo "qt version minor : ${qt_minor_version}" if test ${qt_minor_version} == "8"; then --- 135,140 ---- qt_minor_version="`lqt-config --version | cut -f3 -d'.'`" ! qt_major_version="`lqt-config --version | cut -f1 -d'.'`" ! echo "qt version minor : ${qt_minor_version} major : ${qt_major_version}" if test ${qt_minor_version} == "8"; then *************** *** 156,159 **** --- 157,164 ---- IMLIB_CFLAGS="$CFLAGS -DQUICKTIME_NEWER=1" fi + if test ${qt_major_version} == "1"; + then + IMLIB_CFLAGS="$CFLAGS -DQUICKTIME_NEWER=1" + fi THEORA_LIBS="-ltheora -logg -lvorbis -lvorbisenc"

1 0

pd/src desire.tk, 1.1.2.600.2.318, 1.1.2.600.2.319 builtins.c, 1.1.2.54, 1.1.2.55
by chunlee 08 Aug '07

08 Aug '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14118 Modified Files: Tag: desiredata desire.tk builtins.c Log Message: macro object Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.600.2.318 retrieving revision 1.1.2.600.2.319 diff -C2 -d -r1.1.2.600.2.318 -r1.1.2.600.2.319 *** desire.tk 8 Aug 2007 16:32:00 -0000 1.1.2.600.2.318 --- desire.tk 8 Aug 2007 18:40:39 -0000 1.1.2.600.2.319 *************** *** 2434,2437 **** --- 2434,2440 ---- set ::macro_state 0 + + + def Canvas macro_toggle {} {if {![$::macro state]} {set ::macro_state 1} {$::macro state= 0; $::macro dump}} #def Canvas macro_play {} {puts ">> $@click_at <<"; $::macro idx= 0; $::macro play [$::macro delay]} *************** *** 4985,4988 **** --- 4988,4995 ---- } + def Canvas macro_event_append {e} { + puts "check if the q is empty" + puts "event::: $e" + } #-----------------------------------------------------------------------------------# class_new Wire {View} Index: builtins.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/builtins.c,v retrieving revision 1.1.2.54 retrieving revision 1.1.2.55 diff -C2 -d -r1.1.2.54 -r1.1.2.55 *** builtins.c 4 Aug 2007 04:11:35 -0000 1.1.2.54 --- builtins.c 8 Aug 2007 18:40:43 -0000 1.1.2.55 *************** *** 983,986 **** --- 983,1012 ---- } + /*---- Macro ----*/ + static t_class *macro_class; + struct t_macro : t_object { + t_symbol *sym; + }; + + static void *macro_new(t_symbol *s) { + t_macro *x = (t_macro *)pd_new(macro_class); + if (*s->name) x->sym = s; + else x->sym = gensym("macro"); + return x; + } + + static void macro_send(t_macro *x, t_symbol *s, int argc, t_atom *argv) { + std::ostringstream t; + t << s->name; + for (int i=0; i<argc; i++) {t << " " << &argv[i];} + sys_mgui(x->dix->canvas, "macro_event_append", "S", t.str().data()); + } + static void macro_setup() { + t_class *c = macro_class = class_new2("macro",macro_new,0,sizeof(t_macro),0,"S"); + class_addanything(c, macro_send); + } + + /*-----------------*/ + /* MSW and OSX don't appear to have single-precision ANSI math */ #if defined(MSW) || defined(__APPLE__) *************** *** 2863,2866 **** --- 2889,2893 ---- namecanvas_setup(); print_setup(); + macro_setup(); delay_setup(); metro_setup();

1 0

pd/src desire.tk,1.1.2.600.2.317,1.1.2.600.2.318
by chunlee 08 Aug '07

08 Aug '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32306 Modified Files: Tag: desiredata desire.tk Log Message: more on keyboard macro Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.600.2.317 retrieving revision 1.1.2.600.2.318 diff -C2 -d -r1.1.2.600.2.317 -r1.1.2.600.2.318 *** desire.tk 8 Aug 2007 06:49:52 -0000 1.1.2.600.2.317 --- desire.tk 8 Aug 2007 16:32:00 -0000 1.1.2.600.2.318 *************** *** 379,384 **** set r {} foreach event $@list { ! mset {type W X Y x y mod K k} $event ! lappend r [format "%-13s %9s %4d %4d %4d %4d %4d %4d %s" $type $K $k $X $Y $x $y $mod $W] } return $r --- 379,384 ---- set r {} foreach event $@list { ! mset {type W x y mod K k} $event ! lappend r [format "%-13s %9s %4d %4d %4d %4d %s" $type $K $k $x $y $mod $W] } return $r *************** *** 570,579 **** foreach type {KeyPress KeyRelease} { foreach {subtype mod} $mods { ! bind all <$subtype$type> "$::event_history add \[list $type %W %X %Y %x %y $mod %K %k\]" } } foreach type {ButtonPress ButtonRelease} { foreach {subtype mod} $mods { ! bind all <$subtype$type> "$::event_history add \[list $type %W %X %Y %x %y $mod %b %b\]" } } --- 570,579 ---- foreach type {KeyPress KeyRelease} { foreach {subtype mod} $mods { ! bind all <$subtype$type> "$::event_history add \[list $type %W %x %y $mod %K %k\]" } } foreach type {ButtonPress ButtonRelease} { foreach {subtype mod} $mods { ! bind all <$subtype$type> "$::event_history add \[list $type %W %x %y $mod %b %b\]" } } *************** *** 2321,2325 **** def Macro add {mess} { ! mset {event widget X Y x y mode k kval} $mess if {[regexp {^Control_} $k]} {return} if {[regexp {^Alt_} $k]} {return} --- 2321,2325 ---- def Macro add {mess} { ! mset {event widget x y mode k kval} $mess if {[regexp {^Control_} $k]} {return} if {[regexp {^Alt_} $k]} {return} *************** *** 2348,2352 **** def Macro offset {new_x new_y} { ! mset {event widget X Y x y mode k kval} [lindex $@list 0] set @offset_x [expr $new_x-$x] set @offset_y [expr $new_y-$y] --- 2348,2352 ---- def Macro offset {new_x new_y} { ! mset {event widget x y mode k kval} [lindex $@list 0] set @offset_x [expr $new_x-$x] set @offset_y [expr $new_y-$y] *************** *** 2355,2363 **** def Macro play {delay} { if {$@idx == [llength $@list]} {return} ! $self test_canvas_size set i 0 set focus [string range [focus] 1 [string first . [focus] 2]-1] set step [lindex $@list $@idx] ! mset {event widget X Y x y mode k kval} $step switch $event { #KeyRelease {set name [modekey $k $mode]} --- 2355,2363 ---- def Macro play {delay} { if {$@idx == [llength $@list]} {return} ! #$self test_canvas_size set i 0 set focus [string range [focus] 1 [string first . [focus] 2]-1] set step [lindex $@list $@idx] ! mset {event widget x y mode k kval} $step switch $event { #KeyRelease {set name [modekey $k $mode]} *************** *** 2369,2374 **** } if {$@idx < [llength $@list]} { ! after $delay [list $self run $event $name $k [expr $X+$@offset_x] [expr $Y+$@offset_y] \ ! [expr $x+$@offset_x] [expr $y+$@offset_y]] } } --- 2369,2375 ---- } if {$@idx < [llength $@list]} { ! #after $delay [list $self run $event $name $k [expr $X+$@offset_x] [expr $Y+$@offset_y] \ ! # [expr $x+$@offset_x] [expr $y+$@offset_y]] ! after $delay [list $self run $event $name $k $x $y] } } *************** *** 2379,2383 **** set y1 66666; set y2 0 foreach step $@list { ! mset {event widget X Y x y mode k kval} $step set x1 [min $X $x1]; set x2 [max $x2 $X] set y1 [min $Y $y1]; set y2 [max $y2 $Y] --- 2380,2384 ---- set y1 66666; set y2 0 foreach step $@list { ! mset {event widget x y mode k kval} $step set x1 [min $X $x1]; set x2 [max $x2 $X] set y1 [min $Y $y1]; set y2 [max $y2 $Y] *************** *** 2395,2399 **** } ! def Macro run {event name k X Y x y} { set w [focus] incr @idx --- 2396,2400 ---- } ! def Macro run {event name k x y} { set w [focus] incr @idx *************** *** 2406,2420 **** def Macro copy {} { clipboard clear set i 0 foreach step $@list { if {$i == [expr [llength $@list]-1]} {set comma ""} else {set comma ","} ! mset {event widget X Y x y mode k kval} $step switch $event { ! KeyPress {clipboard append ${step}$comma} ! ButtonPress {clipboard append ${step}$comma} ! ButtonRelease {clipboard append ${step}$comma} } incr i } } --- 2407,2431 ---- def Macro copy {} { clipboard clear + selection clear set i 0 foreach step $@list { if {$i == [expr [llength $@list]-1]} {set comma ""} else {set comma ","} ! mset {event widget x y mode k kval} $step ! set mess [list $event $x $y $mode $k] ! set t ${mess}$comma switch $event { ! KeyPress {clipboard append $t} ! ButtonPress {clipboard append $t} ! ButtonRelease {clipboard append $t} } incr i } + selection handle -selection PRIMARY [focus] "$self getdata" + selection own -command lost -selection PRIMARY + } + + def Macro getdata {offset maxchar} { + puts "clipboard ::: [clipboard get]" + return [string range [format %s [clipboard get]] $offset [expr {$offset+$maxChars}]] } *************** *** 2425,2429 **** def Canvas macro_toggle {} {if {![$::macro state]} {set ::macro_state 1} {$::macro state= 0; $::macro dump}} #def Canvas macro_play {} {puts ">> $@click_at <<"; $::macro idx= 0; $::macro play [$::macro delay]} ! def Canvas macro_play {} {mset {x y} $@click_at; $::macro test_playable $x $y} def Canvas keyevent {} { focus [$self widget] --- 2436,2444 ---- def Canvas macro_toggle {} {if {![$::macro state]} {set ::macro_state 1} {$::macro state= 0; $::macro dump}} #def Canvas macro_play {} {puts ">> $@click_at <<"; $::macro idx= 0; $::macro play [$::macro delay]} ! def Canvas macro_play {} { ! mset {x y} $@click_at ! $::macro play [$::macro delay] ! #$::macro test_playable $x $y ! } def Canvas keyevent {} { focus [$self widget] *************** *** 8340,8344 **** def KeyboardDialog notice {origin add event} { ! mset {type W X Y x y mod K k} $event if {![info exists ::keyboard_row_of($k)]} {puts "unknown key $k"; return} set i $::keyboard_row_of($k) --- 8355,8359 ---- def KeyboardDialog notice {origin add event} { ! mset {type W x y mod K k} $event if {![info exists ::keyboard_row_of($k)]} {puts "unknown key $k"; return} set i $::keyboard_row_of($k)

1 0

autobuild: pd-main macosx104-powerpc 2007-08-08 03.15.03
by pd＠macosx104-powerpc.idmi.poly.edu 08 Aug '07

08 Aug '07

_regcomp referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _regexec referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _regfree referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _shutdown referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _sleep referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _socket referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _strcspn referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _task_get_special_port referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _thread_terminate referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _vsnprintf referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _write referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _AudioConvertNanosToHostTime referenced from Jack expected to be defined in /System/Library/Frameworks/CoreAudio.framework/Versions/A/CoreAudio _pthread_create referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _thread_info referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _thread_policy_set referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib collect2: ld returned 1 exit status lipo: can't open input file: /var/tmp//cceldC8n.out (No such file or directory) make[2]: *** [../bin/pd] Error 1 make[1]: *** [pd_install] Error 2 make: *** [darwin_app_core] Error 2

1 0

externals/moocow/extended Makefile,1.6,1.7
by Bryan Jurish 08 Aug '07

08 Aug '07

Update of /cvsroot/pure-data/externals/moocow/extended In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9588 Modified Files: Makefile Log Message: + argh: makefile syntax fix Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/moocow/extended/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile 8 Aug 2007 07:57:35 -0000 1.6 --- Makefile 8 Aug 2007 08:00:19 -0000 1.7 *************** *** 9,12 **** --- 9,16 ---- ## Variables + SUBDIRS_DONT = \ + ../flite \ + ../gfsm + SUBDIRS = \ ../deque \ *************** *** 16,23 **** ../../sprinkler - SUBDIRS_DONT = \ - ../flite \ - ../gfsm - ##-- 'pdstring' and 'sprinkler' are already in 'flatspace' ... should they be moved here? --- 20,23 ---- *************** *** 98,108 **** ##-- flite, gfsm: build 'em if you got 'em ! #$(eval $(call subdir_template,../flite)) ! #$(eval $(call subdir_template,../gfsm)) ##-- the usual suspects ! $(eval $(call subdir_template,../deque,) $(eval $(call subdir_template,../pdstring,--enable-object-externals)) ! $(eval $(call subdir_template,../readdir, ! $(eval $(call subdir_template,../../sprinkler,) ! $(eval $(call subdir_template,../weightmap,) --- 98,108 ---- ##-- flite, gfsm: build 'em if you got 'em ! $(eval $(call subdir_template,../flite,)) ! $(eval $(call subdir_template,../gfsm,)) ##-- the usual suspects ! $(eval $(call subdir_template,../deque,)) $(eval $(call subdir_template,../pdstring,--enable-object-externals)) ! $(eval $(call subdir_template,../readdir,)) ! $(eval $(call subdir_template,../../sprinkler,)) ! $(eval $(call subdir_template,../weightmap,))

1 0

externals/moocow/extended Makefile,1.5,1.6
by Bryan Jurish 08 Aug '07

08 Aug '07

Update of /cvsroot/pure-data/externals/moocow/extended In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8467 Modified Files: Makefile Log Message: + removed flite and gfsm from build: pd-extended build ailing on mingw32_nt-5.1_windowsxp-i386 with 'no rule for ../flite/build.stamp' Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/moocow/extended/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile 5 Aug 2007 23:11:12 -0000 1.5 --- Makefile 8 Aug 2007 07:57:35 -0000 1.6 *************** *** 10,15 **** SUBDIRS = \ - ../flite \ - ../gfsm \ ../deque \ ../readdir \ --- 10,13 ---- *************** *** 18,21 **** --- 16,23 ---- ../../sprinkler + SUBDIRS_DONT = \ + ../flite \ + ../gfsm + ##-- 'pdstring' and 'sprinkler' are already in 'flatspace' ... should they be moved here? *************** *** 96,106 **** ##-- flite, gfsm: build 'em if you got 'em ! $(eval $(call subdir_template,../flite)) ! $(eval $(call subdir_template,../gfsm)) ##-- the usual suspects ! $(eval $(call subdir_template,../deque)) $(eval $(call subdir_template,../pdstring,--enable-object-externals)) ! $(eval $(call subdir_template,../readdir)) ! $(eval $(call subdir_template,../../sprinkler)) ! $(eval $(call subdir_template,../weightmap)) --- 98,108 ---- ##-- flite, gfsm: build 'em if you got 'em ! #$(eval $(call subdir_template,../flite)) ! #$(eval $(call subdir_template,../gfsm)) ##-- the usual suspects ! $(eval $(call subdir_template,../deque,) $(eval $(call subdir_template,../pdstring,--enable-object-externals)) ! $(eval $(call subdir_template,../readdir, ! $(eval $(call subdir_template,../../sprinkler,) ! $(eval $(call subdir_template,../weightmap,)

1 0

autobuild: pd-main macosx104-i386 2007-08-08 03.15.03
by pd＠macosx104-i386.idmi.poly.edu 08 Aug '07

08 Aug '07

/usr/bin/libtool: internal link edit command failed lipo: can't figure out the architecture type of: /var/tmp//ccAsawwK.out make[2]: *** [../bin/libPdTcl.dylib] Error 1 make[1]: [pd] Error 2 (ignored) make -C /Users/pd/auto-build/pd-main/pd/src BUILDLAYOUT_DIR=/Users/pd/auto-build/pd-main/packages cvs_root_dir=/Users/pd/auto-build/pd-main DESTDIR=/Users/pd/auto-build/pd-main/packages/darwin_app/build/Pd-0.41.0-test05.app/Contents/Resources prefix= libpddir=/Users/pd/auto-build/pd-main/packages/darwin_app/build/Pd-0.41.0-test05.app/Contents/Resources OPT_CFLAGS="-march=pentium4 -msse2 -mfpmath=sse -ftree-vectorize -ftree-vectorizer-verbose=2" UNAME=Darwin install cd ../obj && cc -g -O2 -DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch -DDL_OPEN -DMACOSX -DUNISTD -I/usr/X11R6/include -I../portaudio/pa_common -I../portaudio/pablio -I../portmidi/pm_common -I../portmidi/pm_mac -I../portmidi/porttime -DUSEAPI_PORTAUDIO -DPA19 -DPA_USE_COREAUDIO -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc -Wno-error -O2 -DUSEAPI_JACK -dynamiclib -read_only_relocs warning \ -o ../bin/libPdTcl.dylib t_main.o t_tkcmd.o \ -F/Library/Frameworks \ -framework Tcl -framework Tk -framework System \ -Wl,-install_name,@executable_path/../Resources/bin/libPdTcl.dylib ld: Undefined symbols: _Tcl_CreateCommand _Tcl_CreateFileHandler _Tcl_Eval _Tcl_GetVar /usr/bin/libtool: internal link edit command failed lipo: can't figure out the architecture type of: /var/tmp//ccjQlpZh.out make[2]: *** [../bin/libPdTcl.dylib] Error 1 make[1]: *** [pd_install] Error 2 make: *** [darwin_app_core] Error 2

1 0

pd/src desire.tk,1.1.2.600.2.316,1.1.2.600.2.317
by chunlee 08 Aug '07

08 Aug '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16065 Modified Files: Tag: desiredata desire.tk Log Message: copy macro to clipboard Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.600.2.316 retrieving revision 1.1.2.600.2.317 diff -C2 -d -r1.1.2.600.2.316 -r1.1.2.600.2.317 *** desire.tk 8 Aug 2007 05:03:20 -0000 1.1.2.600.2.316 --- desire.tk 8 Aug 2007 06:49:52 -0000 1.1.2.600.2.317 *************** *** 2404,2407 **** --- 2404,2422 ---- } + def Macro copy {} { + clipboard clear + set i 0 + foreach step $@list { + if {$i == [expr [llength $@list]-1]} {set comma ""} else {set comma ","} + mset {event widget X Y x y mode k kval} $step + switch $event { + KeyPress {clipboard append ${step}$comma} + ButtonPress {clipboard append ${step}$comma} + ButtonRelease {clipboard append ${step}$comma} + } + incr i + } + } + set ::macro [Macro new] *************** *** 2416,2419 **** --- 2431,2437 ---- } + def Canvas macro_copy {} {$::macro copy} + + #-----------------------------------------------------------------------------------# class_new TextBox {Box}

1 0

← Newer
1
...
37
38
39
40
41
42
43
...
62
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 August 2007