Pd-cvs January 2009

pd-cvs@lists.iem.at

23 participants
357 discussions

SF.net SVN: pure-data:[10477] trunk/pd
by millerpuckette＠users.sourceforge.net 06 Jan '09

06 Jan '09

Revision: 10477 http://pure-data.svn.sourceforge.net/pure-data/?rev=10477&view=rev Author: millerpuckette Date: 2009-01-06 19:36:42 +0000 (Tue, 06 Jan 2009) Log Message: ----------- 0.42-2 (bug fixes) Modified Paths: -------------- trunk/pd/doc/1.manual/x5.htm trunk/pd/src/g_editor.c trunk/pd/src/g_text.c trunk/pd/src/m_pd.h trunk/pd/src/t_tkcmd.c trunk/pd/src/u_main.tk Modified: trunk/pd/doc/1.manual/x5.htm =================================================================== --- trunk/pd/doc/1.manual/x5.htm 2009-01-06 18:08:40 UTC (rev 10476) +++ trunk/pd/doc/1.manual/x5.htm 2009-01-06 19:36:42 UTC (rev 10477) @@ -20,6 +20,14 @@ <H3> <A name="s2"> 5.1. release notes </A> </H3> + ------------------ 0.42.1 --------------------------- + + Bug fix on Windows(cancelling window close deactivated window). + + Bug fix running Pd from command line in MacOS. + + "Select all" fixed to select none if everything already slected. + ------------------ 0.42 --------------------------- The 'struct' object can now be used to catch a small but growing variety of Modified: trunk/pd/src/g_editor.c =================================================================== --- trunk/pd/src/g_editor.c 2009-01-06 18:08:40 UTC (rev 10476) +++ trunk/pd/src/g_editor.c 2009-01-06 19:36:42 UTC (rev 10477) @@ -1864,8 +1864,7 @@ return; } if (f == 0 && sys_perf) - sys_vgui("pdtk_check .x%lx {really quit?} {pd quit;\n} yes\n", - canvas_getrootfor(g2)); + sys_vgui("pdtk_check . {really quit?} {pd quit;\n} yes\n"); else glob_quit(0); } @@ -2363,7 +2362,10 @@ t_gobj *y; if (!x->gl_edit) canvas_editmode(x, 1); - for (y = x->gl_list; y; y = y->g_next) + /* if everyone is already selected deselect everyone */ + if (!glist_selectionindex(x, 0, 0)) + glist_noselect(x); + else for (y = x->gl_list; y; y = y->g_next) { if (!glist_isselected(x, y)) glist_select(x, y); Modified: trunk/pd/src/g_text.c =================================================================== --- trunk/pd/src/g_text.c 2009-01-06 18:08:40 UTC (rev 10476) +++ trunk/pd/src/g_text.c 2009-01-06 19:36:42 UTC (rev 10477) @@ -136,23 +136,39 @@ static void canvas_howputnew(t_canvas *x, int *connectp, int *xpixp, int *ypixp, int *indexp, int *totalp) { - int xpix, ypix, indx = 0, nobj = 0, x1, x2, y1, y2; + int xpix, ypix, indx = 0, nobj = 0, n2, x1, x2, y1, y2; int connectme = (x->gl_editor->e_selection && !x->gl_editor->e_selection->sel_next); if (connectme) { - t_gobj *g; + t_gobj *g, *selected = x->gl_editor->e_selection->sel_what; for (g = x->gl_list, nobj = 0; g; g = g->g_next, nobj++) - if (g == x->gl_editor->e_selection->sel_what) + if (g == selected) { gobj_getrect(g, x, &x1, &y1, &x2, &y2); indx = nobj; *xpixp = x1; *ypixp = y2 + 5; } + glist_noselect(x); + /* search back for 'selected' and if it isn't on the list, + plan just to connect from the last item on the list. */ + for (g = x->gl_list, n2 = 0; g; g = g->g_next, n2++) + { + if (g == selected) + { + indx = n2; + break; + } + else if (!g->g_next) + indx = nobj-1; + } } - else glist_getnextxy(x, xpixp, ypixp); - glist_noselect(x); + else + { + glist_getnextxy(x, xpixp, ypixp); + glist_noselect(x); + } *connectp = connectme; *indexp = indx; *totalp = nobj; Modified: trunk/pd/src/m_pd.h =================================================================== --- trunk/pd/src/m_pd.h 2009-01-06 18:08:40 UTC (rev 10476) +++ trunk/pd/src/m_pd.h 2009-01-06 19:36:42 UTC (rev 10477) @@ -10,7 +10,7 @@ #define PD_MAJOR_VERSION 0 #define PD_MINOR_VERSION 42 -#define PD_BUGFIX_VERSION 1 +#define PD_BUGFIX_VERSION 2 #define PD_TEST_VERSION "" /* old name for "MSW" flag -- we have to take it for the sake of many old Modified: trunk/pd/src/t_tkcmd.c =================================================================== --- trunk/pd/src/t_tkcmd.c 2009-01-06 18:08:40 UTC (rev 10476) +++ trunk/pd/src/t_tkcmd.c 2009-01-06 19:36:42 UTC (rev 10477) @@ -333,7 +333,7 @@ #ifdef STARTGUI -#define DEBUGCONNECT +/* #define DEBUGCONNECT */ #ifdef DEBUGCONNECT static FILE *debugfd; @@ -621,12 +621,26 @@ int portno = 0, i; if (argv) { + /* search for arg of form "-guiport %d"; if so we're the + child. For some reason, the second version is too stringent + a test on MSW so the first, incorrect one, is conditionally + used. */ +#ifdef MSW for (i = 0; i < (int)strlen(argv) - 1; i++) if (argv[i] >= '0' && argv[i] <= '9') { portno = atoi(argv+i); break; } +#else + for (i = 0; i < (int)strlen(argv) - 3; i++) + if (argv[i] == ' ' && + argv[i+1] >= '0' && argv[i+1] <= '9') + { + portno = atoi(argv+i+1); + break; + } +#endif } if (portno) pdgui_setsock(portno); Modified: trunk/pd/src/u_main.tk =================================================================== --- trunk/pd/src/u_main.tk 2009-01-06 18:08:40 UTC (rev 10476) +++ trunk/pd/src/u_main.tk 2009-01-06 19:36:42 UTC (rev 10477) @@ -283,8 +283,14 @@ ##### routine to ask user if OK and, if so, send a message on to Pd ###### proc pdtk_check {canvas x message default} { - set answer [tk_messageBox -message $x -type yesno -default $default \ - -parent $canvas -icon question] + global pd_nt + if {$pd_nt == 1} { + set answer [tk_messageBox -message $x -type yesno -default $default \ + -icon question] + } else { + set answer [tk_messageBox -message $x -type yesno -default $default \ + -parent $canvas -icon question] + } if {! [string compare $answer yes]} {pd $message} } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data:[10476] branches/pd-devel/0.41.4/src
by eighthave＠users.sourceforge.net 06 Jan '09

06 Jan '09

Revision: 10476 http://pure-data.svn.sourceforge.net/pure-data/?rev=10476&view=rev Author: eighthave Date: 2009-01-06 18:08:40 +0000 (Tue, 06 Jan 2009) Log Message: ----------- now 'pd-gui' can handle commands from 'pd' that have \n in them. this technique has promise for handling other errors as well, since the Tcl catch is already there Modified Paths: -------------- branches/pd-devel/0.41.4/src/pd.tk branches/pd-devel/0.41.4/src/pd_connect.tcl Modified: branches/pd-devel/0.41.4/src/pd.tk =================================================================== --- branches/pd-devel/0.41.4/src/pd.tk 2009-01-06 05:05:36 UTC (rev 10475) +++ branches/pd-devel/0.41.4/src/pd.tk 2009-01-06 18:08:40 UTC (rev 10476) @@ -17,6 +17,7 @@ package require pd_menus package require pd_bindings +# import 'pd' into the global namespace for backwards compatibility namespace import ::pd_connect::pd # ------------------------------------------------------------------------------ Modified: branches/pd-devel/0.41.4/src/pd_connect.tcl =================================================================== --- branches/pd-devel/0.41.4/src/pd_connect.tcl 2009-01-06 05:05:36 UTC (rev 10475) +++ branches/pd-devel/0.41.4/src/pd_connect.tcl 2009-01-06 18:08:40 UTC (rev 10476) @@ -10,15 +10,15 @@ proc ::pd_connect::connect_to_pd {portnumber} { variable pd_socket - puts stderr "Connecting to 127.0.0.1 $portnumber ..." - if {[catch {set pd_socket [socket 127.0.0.1 $portnumber]}]} { + puts stderr "Connecting to localhost $portnumber ..." + if {[catch {set pd_socket [socket localhost $portnumber]}]} { puts stderr "WARNING: connect to pd failed, retrying port $portnumber." after 1000 ::pd_connect::connect_to_pd $portnumber return } puts stderr "Connected to pd on port $portnumber" fconfigure $pd_socket -blocking 1 -buffering line - fileevent $pd_socket readable [list pd_readsocket $::pd_connect::pd_socket] + fileevent $pd_socket readable [list ::pd_connect::pd_readsocket ""] } # send a message from Tcl to Pd @@ -30,9 +30,21 @@ # figure out which namespace the eval is using... this probably needs to be # global so that eval runs in the global namespace -proc pd_readsocket {pd_socket} { - set cmd_from_pd [gets $pd_socket] - puts stderr "cmd_from_pd $cmd_from_pd" - eval $cmd_from_pd -# eval [gets $pd_socket] +proc ::pd_connect::pd_readsocket {cmd_from_pd} { + variable pd_socket + if {$cmd_from_pd == ""} {puts stderr "called with blank args aka READABLE"} + append cmd_from_pd [gets $pd_socket] + puts stderr "cmd_from_pd: $cmd_from_pd" + if {[catch {uplevel #0 $cmd_from_pd}]} { + global errorInfo + puts stderr "errorInfo <<$errorInfo>>" + if {[regexp -line -- "^missing close-brace.*" $errorInfo]} { + # TODO consider using [info complete $cmd_from_pd] in a loop + puts stderr "appending another line" + pd_readsocket $cmd_from_pd + } else { + #puts stderr "DIFFERENT ERROR on eval: $errorInfo" + puts stderr "DIFFERENT ERROR on eval" + } + } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data:[10475] trunk/pd/src
by millerpuckette＠users.sourceforge.net 06 Jan '09

06 Jan '09

Revision: 10475 http://pure-data.svn.sourceforge.net/pure-data/?rev=10475&view=rev Author: millerpuckette Date: 2009-01-06 05:05:36 +0000 (Tue, 06 Jan 2009) Log Message: ----------- 0.42-1 - bug fixes Modified Paths: -------------- trunk/pd/src/g_editor.c trunk/pd/src/m_pd.h trunk/pd/src/notes.txt Modified: trunk/pd/src/g_editor.c =================================================================== --- trunk/pd/src/g_editor.c 2009-01-06 02:22:03 UTC (rev 10474) +++ trunk/pd/src/g_editor.c 2009-01-06 05:05:36 UTC (rev 10475) @@ -1599,7 +1599,7 @@ vmess(&gl2->gl_pd, gensym("menu-open"), ""); x->gl_editor->e_onmotion = MA_NONE; sys_vgui( -"pdtk_check .x%lx.c {Discard changes to '%s'?} {.x%lx dirty 0;\n} no\n", +"pdtk_check .x%lx {Discard changes to '%s'?} {.x%lx dirty 0;\n} no\n", canvas_getrootfor(gl2), canvas_getrootfor(gl2)->gl_name->s_name, gl2); return; @@ -1859,12 +1859,12 @@ { canvas_vis(g2, 1); sys_vgui( -"pdtk_check .x%lx.c {Discard changes to '%s'?} {.x%lx menuclose 3;\n} no\n", +"pdtk_check .x%lx {Discard changes to '%s'?} {.x%lx menuclose 3;\n} no\n", canvas_getrootfor(g2), canvas_getrootfor(g2)->gl_name->s_name, g2); return; } if (f == 0 && sys_perf) - sys_vgui("pdtk_check .x%lx.c {really quit?} {pd quit;\n} yes\n", + sys_vgui("pdtk_check .x%lx {really quit?} {pd quit;\n} yes\n", canvas_getrootfor(g2)); else glob_quit(0); } @@ -1889,14 +1889,14 @@ { vmess(&g->gl_pd, gensym("menu-open"), ""); sys_vgui( -"pdtk_check .x%lx.c {Discard changes to '%s'?} {.x%lx menuclose 2;\n} no\n", +"pdtk_check .x%lx {Discard changes to '%s'?} {.x%lx menuclose 2;\n} no\n", canvas_getrootfor(g), canvas_getrootfor(g)->gl_name->s_name, g); return; } else if (sys_perf) { sys_vgui( -"pdtk_check .x%lx.c {Close '%s'?} {.x%lx menuclose 1;\n} yes\n", +"pdtk_check .x%lx {Close '%s'?} {.x%lx menuclose 1;\n} yes\n", canvas_getrootfor(x), canvas_getrootfor(x)->gl_name->s_name, x); } else pd_free(&x->gl_pd); @@ -1913,7 +1913,7 @@ { vmess(&g->gl_pd, gensym("menu-open"), ""); sys_vgui( -"pdtk_check .x%lx.c {Discard changes to '%s'?} {.x%lx menuclose 2;\n} no\n", +"pdtk_check .x%lx {Discard changes to '%s'?} {.x%lx menuclose 2;\n} no\n", canvas_getrootfor(x), canvas_getrootfor(x)->gl_name->s_name, g); return; } Modified: trunk/pd/src/m_pd.h =================================================================== --- trunk/pd/src/m_pd.h 2009-01-06 02:22:03 UTC (rev 10474) +++ trunk/pd/src/m_pd.h 2009-01-06 05:05:36 UTC (rev 10475) @@ -10,7 +10,7 @@ #define PD_MAJOR_VERSION 0 #define PD_MINOR_VERSION 42 -#define PD_BUGFIX_VERSION 0 +#define PD_BUGFIX_VERSION 1 #define PD_TEST_VERSION "" /* old name for "MSW" flag -- we have to take it for the sake of many old Modified: trunk/pd/src/notes.txt =================================================================== --- trunk/pd/src/notes.txt 2009-01-06 02:22:03 UTC (rev 10474) +++ trunk/pd/src/notes.txt 2009-01-06 05:05:36 UTC (rev 10475) @@ -31,7 +31,6 @@ floor, ciel functions in expr misdeclared graph names don't appear until graph moved? (invis/vis on new array/rename) don't filter locked click() through getrect -when retyping abstractions, offer to save dirty one should linux stop grabbing focus on vis? Is there a way to detect whether the mouse is in a window when it opens? arrays that don't fit in bounds don't update (same as red rectangle problem?) @@ -53,6 +52,7 @@ document ||, |, etc, better features: +'route' object to sprout inlet if no args (like sel) optionally suppress leading "." directories and files on "open" change config.h to #ifdef _MSC_VER (include MSW fake) else include a real one stick snprintf alias in the MSW fake. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data:[10474] branches/pd-devel/0.41.4/src
by eighthave＠users.sourceforge.net 06 Jan '09

06 Jan '09

Revision: 10474 http://pure-data.svn.sourceforge.net/pure-data/?rev=10474&view=rev Author: eighthave Date: 2009-01-06 02:22:03 +0000 (Tue, 06 Jan 2009) Log Message: ----------- - pd now launches the new pd.tk and there is successful communication between pdand pd-gui. Next, I need to make pd_readsocket support inline carriage returns, since currently the eval is called line-by-line. Modified Paths: -------------- branches/pd-devel/0.41.4/src/makefile.in branches/pd-devel/0.41.4/src/pd.tk branches/pd-devel/0.41.4/src/pd_menucommands.tcl branches/pd-devel/0.41.4/src/pd_menus.tcl branches/pd-devel/0.41.4/src/pkgIndex.tcl Added Paths: ----------- branches/pd-devel/0.41.4/src/pd_connect.tcl Modified: branches/pd-devel/0.41.4/src/makefile.in =================================================================== --- branches/pd-devel/0.41.4/src/makefile.in 2009-01-03 09:15:08 UTC (rev 10473) +++ branches/pd-devel/0.41.4/src/makefile.in 2009-01-06 02:22:03 UTC (rev 10474) @@ -84,7 +84,7 @@ .PHONY: pd gui externs all all: pd $(BIN_DIR)/pd-watchdog gui $(BIN_DIR)/pdsend \ - $(BIN_DIR)/pdreceive $(BIN_DIR)/pd.tk externs + $(BIN_DIR)/pdreceive $(BIN_DIR)/pd.tk bin: pd $(BIN_DIR)/pd-watchdog gui $(BIN_DIR)/pdsend \ $(BIN_DIR)/pdreceive $(BIN_DIR)/pd.tk @@ -126,8 +126,11 @@ $(BIN_DIR)/pd-gui: $(GOBJ) $(GSRC) cd ../obj; $(CC) $(INCLUDE) -o $(BIN_DIR)/$(GUINAME) $(GOBJ) $(GLIB) -$(BIN_DIR)/pd.tk: u_main.tk $(BIN_DIR) - cp u_main.tk $(BIN_DIR)/pd.tk +$(BIN_DIR)/pd.tk: $(wildcard *.tcl) $(wildcard locale/*.tcl) $(BIN_DIR) + install pd.tk $(BIN_DIR)/pd.tk + install *.tcl $(BIN_DIR)/ + install -d $(BIN_DIR)/locale + install locale/*.tcl $(BIN_DIR)/locale touch -r makefile.dependencies $(BIN_DIR) #this is for Max OSX only... @@ -239,9 +242,25 @@ include makefile.dependencies +TAGS: etags +etags: + etags *.[ch] + find /usr/include -type f -name \*.h -exec etags -a '{}' \; + make etags_`uname -s` +etags_Darwin: + find /System/Library/Frameworks -type f -name \*.h -exec etags -a '{}' \; + find /Library/Frameworks -type f -name \*.h -exec etags -a '{}' \; + find /sw/include -type f -name \*.h -exec etags -a '{}' \; +etags_Linux: +etags_MINGW: + find /usr/local/include/ -type f -name \*.h -exec etags -a '{}' \; + + + + Modified: branches/pd-devel/0.41.4/src/pd.tk =================================================================== --- branches/pd-devel/0.41.4/src/pd.tk 2009-01-03 09:15:08 UTC (rev 10473) +++ branches/pd-devel/0.41.4/src/pd.tk 2009-01-06 02:22:03 UTC (rev 10474) @@ -4,33 +4,56 @@ # Copyright (c) 1997-2009 Miller Puckette. package require Tk + +## replace Tk widgets with Ttk widgets #package require tile - -## replace Tk widgets with Ttk widgets on 8.5 #namespace import -force ttk::* # set . as first dir in auto_path -set auto_path [linsert $auto_path 0 "/Users/hans/code/pure-data/branches/pd-devel/0.41.4/src"] +#set auto_path [linsert $auto_path 0 "/Users/hans/code/pure-data/branches/pd-devel/0.41.4/src"] set auto_path [linsert $auto_path 0 "."] +package require pd_connect package require pd_menus package require pd_bindings +namespace import ::pd_connect::pd + # ------------------------------------------------------------------------------ # global variables # command line options -array set cmd_ops {} -for {set i 0} {$i < $argc} {incr i} { - global cmd_ops files_to_open - set o [lindex $argv $i] - switch -regexp -- $o { - ^-lang\$ {incr i; set cmd_ops(lang) [lindex $argv $i]} - default {lappend files_to_open [lindex $argv $i]} - } + +# for the sake of clarity, I think there should not be any inline code, +# everything should be in a procedure that is ultimately triggered from main() +# -hans(a)eds.org + +#array set cmd_ops {} + +# the only arg for pd.tk is the port number to connect to 'pd' on, but this +# code would be useful for opening files via drag-n-drop, the open panel, etc. +#for {set i 0} {$i < $argc} {incr i} { +# global cmd_ops files_to_open +# set o [lindex $argv $i] +# switch -regexp -- $o { +# ^-lang\$ {incr i; set cmd_ops(lang) [lindex $argv $i]} +# default {lappend files_to_open [lindex $argv $i]} +# } +#} + +# no english support yet, so I am commenting this out +#if {![info exists cmd_ops(lang)]} {set cmd_ops(lang) "en"} +#init_locale + +# ------------------------------------------------------------------------------ +# quoting functions + +# enquote a string to send it to a tcl function +proc pdtk_enquote {x} { + set foo [string map {"," "" ";" "" \" ""} $x] + set foo2 [string map {" " "\\ "} $foo] + concat $foo2 } -if {![info exists cmd_ops(lang)]} {set cmd_ops(lang) "en"} -init_locale # ------------------------------------------------------------------------------ # init functions @@ -54,6 +77,20 @@ } } + +proc pdtk_pd_startup {version {args ""}} { + pdtk_post "version: $version" + pdtk_post "args: $args" + set oldtclversion 0 + set fontlist "8 5 8 9 6 10 10 7 11 12 7 12 14 8 14 16 10 16 18 11 18 24 14 24 30 18 30 36 22 36" + pd [concat pd init [pdtk_enquote [pwd]] $oldtclversion $fontlist \;]; +} + + +proc pdtk_post {s} { + puts stderr $s +} + # ------------------------------------------------------------------------------ # canvas support functions proc pdtk_canvas_new {canvas_name width height} { @@ -67,7 +104,8 @@ # ------------------------------------------------------------------------------ # main -proc main {} { +proc main {argc argv} { + pdtk_post "Starting pd.tk with main($argc $argv)" init wm title . "Pd-devel" @@ -76,9 +114,11 @@ . configure -menu .menubar -width 400 -height 250 ::pd_menus::configure_pdwindow .menubar ::pd_bindings::window_bindings . + + ::pd_connect::connect_to_pd [lindex $argv 0] } -main +main $argc $argv Added: branches/pd-devel/0.41.4/src/pd_connect.tcl =================================================================== --- branches/pd-devel/0.41.4/src/pd_connect.tcl (rev 0) +++ branches/pd-devel/0.41.4/src/pd_connect.tcl 2009-01-06 02:22:03 UTC (rev 10474) @@ -0,0 +1,38 @@ + +package provide pd_connect 0.1 + +namespace eval ::pd_connect:: { + variable pd_socket + + namespace export connect_to_pd + namespace export pd +} + +proc ::pd_connect::connect_to_pd {portnumber} { + variable pd_socket + puts stderr "Connecting to 127.0.0.1 $portnumber ..." + if {[catch {set pd_socket [socket 127.0.0.1 $portnumber]}]} { + puts stderr "WARNING: connect to pd failed, retrying port $portnumber." + after 1000 ::pd_connect::connect_to_pd $portnumber + return + } + puts stderr "Connected to pd on port $portnumber" + fconfigure $pd_socket -blocking 1 -buffering line + fileevent $pd_socket readable [list pd_readsocket $::pd_connect::pd_socket] +} + +# send a message from Tcl to Pd +proc ::pd_connect::pd {message} { + variable pd_socket + if {$pd_socket == ""} {error "Not connected to 'pd' process"} + puts $pd_socket $message +} + +# figure out which namespace the eval is using... this probably needs to be +# global so that eval runs in the global namespace +proc pd_readsocket {pd_socket} { + set cmd_from_pd [gets $pd_socket] + puts stderr "cmd_from_pd $cmd_from_pd" + eval $cmd_from_pd +# eval [gets $pd_socket] +} Modified: branches/pd-devel/0.41.4/src/pd_menucommands.tcl =================================================================== --- branches/pd-devel/0.41.4/src/pd_menucommands.tcl 2009-01-03 09:15:08 UTC (rev 10473) +++ branches/pd-devel/0.41.4/src/pd_menucommands.tcl 2009-01-06 02:22:03 UTC (rev 10474) @@ -5,13 +5,9 @@ # PLACEHOLDERS namespace eval ::pd_menucommands:: { - namespace export pd namespace export menu_* } -proc ::pd_menucommands::pd {} { -} - proc ::pd_menucommands::menu_doc_open {docdir doc} { # PLACEHOLDER } Modified: branches/pd-devel/0.41.4/src/pd_menus.tcl =================================================================== --- branches/pd-devel/0.41.4/src/pd_menus.tcl 2009-01-03 09:15:08 UTC (rev 10473) +++ branches/pd-devel/0.41.4/src/pd_menus.tcl 2009-01-06 02:22:03 UTC (rev 10474) @@ -21,6 +21,7 @@ # for displaying on menus namespace eval ::pd_menus:: { + # TODO this should be only a variable declaration with the if in some kind of init() if {[tk windowingsystem] eq "aqua"} { variable accelerator "Meta" } else { Modified: branches/pd-devel/0.41.4/src/pkgIndex.tcl =================================================================== --- branches/pd-devel/0.41.4/src/pkgIndex.tcl 2009-01-03 09:15:08 UTC (rev 10473) +++ branches/pd-devel/0.41.4/src/pkgIndex.tcl 2009-01-06 02:22:03 UTC (rev 10474) @@ -13,3 +13,4 @@ package ifneeded pd_menucommands 0.1 [list source [file join $dir pd_menucommands.tcl]] package ifneeded pd_menus 0.1 [list source [file join $dir pd_menus.tcl]] package ifneeded pd_say 0.1 [list source [file join $dir pd_say.tcl]] +package ifneeded pd_connect 0.1 [list source [file join $dir pd_connect.tcl]] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data:[10473] trunk/abstractions/sfruit/sfruit
by lukeiannini＠users.sourceforge.net 03 Jan '09

03 Jan '09

Revision: 10473 http://pure-data.svn.sourceforge.net/pure-data/?rev=10473&view=rev Author: lukeiannini Date: 2009-01-03 09:15:08 +0000 (Sat, 03 Jan 2009) Log Message: ----------- some new objects to support structhausen and mmmap Modified Paths: -------------- trunk/abstractions/sfruit/sfruit/color.rgbset.pd trunk/abstractions/sfruit/sfruit/countseq.pd trunk/abstractions/sfruit/sfruit/learnOSC.pd trunk/abstractions/sfruit/sfruit/list-union-merge.pd trunk/abstractions/sfruit/sfruit/setabng.pd Added Paths: ----------- trunk/abstractions/sfruit/sfruit/OSCout.pd trunk/abstractions/sfruit/sfruit/beat2fracx.pd trunk/abstractions/sfruit/sfruit/castsymbol.pd trunk/abstractions/sfruit/sfruit/changeargs.pd trunk/abstractions/sfruit/sfruit/list-mapx.pd trunk/abstractions/sfruit/sfruit/list-union-merge-help.pd trunk/abstractions/sfruit/sfruit/midi.random-smooth.pd trunk/abstractions/sfruit/sfruit/quantize-help.pd trunk/abstractions/sfruit/sfruit/quantize.pd trunk/abstractions/sfruit/sfruit/receivemany.pd trunk/abstractions/sfruit/sfruit/templater-help.pd trunk/abstractions/sfruit/sfruit/templater.pd Added: trunk/abstractions/sfruit/sfruit/OSCout.pd =================================================================== --- trunk/abstractions/sfruit/sfruit/OSCout.pd (rev 0) +++ trunk/abstractions/sfruit/sfruit/OSCout.pd 2009-01-03 09:15:08 UTC (rev 10473) @@ -0,0 +1,14 @@ +#N canvas 0 22 367 215 10; +#X obj 52 133 udpsend; +#X obj 52 103 packOSC; +#X obj 124 75 loadbang; +#X obj 124 96 list append connect \$1 \$2; +#X obj 52 61 r OSCOUT; +#X obj 78 175 print; +#X obj 124 116 list trim; +#X connect 0 0 5 0; +#X connect 1 0 0 0; +#X connect 2 0 3 0; +#X connect 3 0 6 0; +#X connect 4 0 1 0; +#X connect 6 0 0 0; Added: trunk/abstractions/sfruit/sfruit/beat2fracx.pd =================================================================== --- trunk/abstractions/sfruit/sfruit/beat2fracx.pd (rev 0) +++ trunk/abstractions/sfruit/sfruit/beat2fracx.pd 2009-01-03 09:15:08 UTC (rev 10473) @@ -0,0 +1,15 @@ +#N canvas 0 22 226 251 10; +#X obj 43 46 list; +#X obj 43 79 symbol2list x; +#X obj 43 104 list split 1; +#X obj 77 129 beat2frac; +#X obj 43 167 *; +#X obj 43 21 inlet; +#X obj 43 194 outlet; +#X connect 0 0 1 0; +#X connect 1 0 2 0; +#X connect 2 0 4 0; +#X connect 2 1 3 0; +#X connect 3 0 4 1; +#X connect 4 0 6 0; +#X connect 5 0 0 0; Added: trunk/abstractions/sfruit/sfruit/castsymbol.pd =================================================================== --- trunk/abstractions/sfruit/sfruit/castsymbol.pd (rev 0) +++ trunk/abstractions/sfruit/sfruit/castsymbol.pd 2009-01-03 09:15:08 UTC (rev 10473) @@ -0,0 +1,11 @@ +#N canvas 660 453 201 199 10; +#X obj 36 29 inlet; +#X obj 66 80 list prepend set; +#X obj 36 56 t b a; +#X msg 36 108; +#X obj 36 138 outlet; +#X connect 0 0 2 0; +#X connect 1 0 3 0; +#X connect 2 0 3 0; +#X connect 2 1 1 0; +#X connect 3 0 4 0; Added: trunk/abstractions/sfruit/sfruit/changeargs.pd =================================================================== --- trunk/abstractions/sfruit/sfruit/changeargs.pd (rev 0) +++ trunk/abstractions/sfruit/sfruit/changeargs.pd 2009-01-03 09:15:08 UTC (rev 10473) @@ -0,0 +1,14 @@ +#N canvas 438 397 450 300 10; +#X obj 122 126 dollarg; +#X msg 122 202; +#X obj 139 176 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 +-1 -1; +#X obj 122 103 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 +-1 -1; +#X obj 122 227 saveargs; +#X obj 122 149 prepent set; +#X connect 0 0 5 0; +#X connect 1 0 4 0; +#X connect 2 0 1 0; +#X connect 3 0 0 0; +#X connect 5 0 1 0; Modified: trunk/abstractions/sfruit/sfruit/color.rgbset.pd =================================================================== --- trunk/abstractions/sfruit/sfruit/color.rgbset.pd 2009-01-03 09:13:36 UTC (rev 10472) +++ trunk/abstractions/sfruit/sfruit/color.rgbset.pd 2009-01-03 09:15:08 UTC (rev 10473) @@ -1,4 +1,4 @@ -#N canvas 185 89 559 602 10; +#N canvas 226 22 559 602 10; #X obj 30 173 cnv 15 18 15 empty \$0dispcol1 empty 20 12 0 14 -128992 -262144 0; #X obj 218 73 * -65536; @@ -27,8 +27,8 @@ #X obj 70 106 vsl 15 60 0 255 0 0 \$0blue \$0blueR empty 0 -8 0 8 -64 -1 -1 2938 1; #X obj 279 526 list trim; -#X obj 52 90 hradio 10 1 0 3 \$0layer \$0layerr back 0 -4 0 8 -1 -262144 --1 0; +#X obj 52 90 hradio 10 1 0 3 \$0layer \$0layerr label 0 -4 0 8 -1 -262144 +-1 2; #X obj 361 224 r \$0layer; #X obj 218 47 int; #X obj 281 47 int; @@ -36,7 +36,7 @@ #X obj 218 21 r \$0red; #X obj 281 21 r \$0green; #X obj 351 21 r \$0blue; -#X obj 30 85 bng 15 250 50 0 \$0nullS \$0nullR empty 0 -6 0 8 -260033 +#X obj 41 96 bng 8 250 50 0 \$0nullS \$0nullR empty 0 -6 0 8 -260033 -1 -1; #X obj 35 288 r \$0layer; #X obj 35 313 sel 0 1 2; @@ -91,6 +91,12 @@ #X restore 81 536 pd init; #X obj 30 26 inlet; #X obj 30 51 unpack f f f; +#X obj 133 150 colorpanel; +#X obj 133 171 list-map; +#X obj 187 171 * 255; +#X obj 32 82 bng 12 250 50 0 \$0.colorpanel.s \$0.colorpanel.r C 3 +7 0 8 -212800 -1 -1; +#X obj 133 126 r \$0.colorpanel.s; #X connect 1 0 7 0; #X connect 2 0 5 0; #X connect 3 0 4 0; @@ -153,4 +159,9 @@ #X connect 55 0 20 0; #X connect 55 1 21 0; #X connect 55 2 22 0; +#X connect 56 0 57 0; +#X connect 57 0 55 0; +#X connect 57 1 58 0; +#X connect 58 0 57 1; +#X connect 60 0 56 0; #X coords 0 -1 1 1 56 109 2 30 80; Modified: trunk/abstractions/sfruit/sfruit/countseq.pd =================================================================== --- trunk/abstractions/sfruit/sfruit/countseq.pd 2009-01-03 09:13:36 UTC (rev 10472) +++ trunk/abstractions/sfruit/sfruit/countseq.pd 2009-01-03 09:15:08 UTC (rev 10473) @@ -1,5 +1,4 @@ #N canvas 974 303 373 390 10; - #X obj 26 159 f; #X obj 81 83 sel restart; #X msg 81 108 0; Modified: trunk/abstractions/sfruit/sfruit/learnOSC.pd =================================================================== --- trunk/abstractions/sfruit/sfruit/learnOSC.pd 2009-01-03 09:13:36 UTC (rev 10472) +++ trunk/abstractions/sfruit/sfruit/learnOSC.pd 2009-01-03 09:15:08 UTC (rev 10473) @@ -1,20 +1,22 @@ -#N canvas 145 92 239 311 10; +#N canvas 42 170 239 311 10; #X obj 72 131 list split 1; #X obj 72 181 t b a; #X msg 129 155 0; -#X obj 25 218 sdeeprouteOSC; #X obj 25 247 outlet; #X obj 105 87 inlet learn?; #X obj 144 249 outlet; #X obj 72 155 spigot; #X obj 25 58 r OSCIN; -#X connect 0 0 7 0; +#X obj 144 183 inlet; +#X obj 25 218 sdeeprouteOSC \$1; +#X connect 0 0 6 0; #X connect 1 0 2 0; -#X connect 1 1 3 1; -#X connect 1 1 6 0; -#X connect 2 0 7 1; -#X connect 3 0 4 0; -#X connect 5 0 7 1; -#X connect 7 0 1 0; -#X connect 8 0 0 0; -#X connect 8 0 3 0; +#X connect 1 1 5 0; +#X connect 1 1 9 1; +#X connect 2 0 6 1; +#X connect 4 0 6 1; +#X connect 6 0 1 0; +#X connect 7 0 0 0; +#X connect 7 0 9 0; +#X connect 8 0 9 1; +#X connect 9 0 3 0; Added: trunk/abstractions/sfruit/sfruit/list-mapx.pd =================================================================== --- trunk/abstractions/sfruit/sfruit/list-mapx.pd (rev 0) +++ trunk/abstractions/sfruit/sfruit/list-mapx.pd 2009-01-03 09:15:08 UTC (rev 10473) @@ -0,0 +1,31 @@ +#N canvas 470 232 489 423 10; +#X obj 86 33 inlet; +#X obj 275 52 inlet; +#X obj 151 352 outlet; +#X obj 170 248 outlet; +#X obj 151 317 list; +#X obj 275 215 list prepend; +#X obj 354 185 t a; +#X obj 151 155 t b a a b; +#X obj 86 58 route bang; +#X obj 86 83 b; +#X obj 151 84 t b a; +#X obj 151 124 list; +#X obj 170 215 list-dripx \$1; +#X connect 0 0 8 0; +#X connect 1 0 5 0; +#X connect 4 0 2 0; +#X connect 5 0 6 0; +#X connect 5 0 4 1; +#X connect 6 0 5 1; +#X connect 7 0 4 0; +#X connect 7 1 12 0; +#X connect 7 2 4 1; +#X connect 7 3 5 1; +#X connect 8 0 9 0; +#X connect 8 1 10 0; +#X connect 9 0 11 0; +#X connect 10 0 11 0; +#X connect 10 1 11 1; +#X connect 11 0 7 0; +#X connect 12 0 3 0; Added: trunk/abstractions/sfruit/sfruit/list-union-merge-help.pd =================================================================== --- trunk/abstractions/sfruit/sfruit/list-union-merge-help.pd (rev 0) +++ trunk/abstractions/sfruit/sfruit/list-union-merge-help.pd 2009-01-03 09:15:08 UTC (rev 10473) @@ -0,0 +1,15 @@ +#N canvas 734 402 450 300 10; +#X obj 104 120 list-union-merge; +#X msg 197 95 /a /b /c; +#X msg 104 94 /1 /2 /3; +#X obj 104 144 prepent set; +#X text 11 31 for each value in the right inlet \, append each value +in the left inlet and merge into one symbol. Used for multiplexing +large numbers of OSC-style addresses.; +#X msg 104 169; +#X text 234 265 2008 Luke Iannini; +#X text 15 8 [list-union-merge]; +#X connect 0 0 3 0; +#X connect 1 0 0 1; +#X connect 2 0 0 0; +#X connect 3 0 5 0; Modified: trunk/abstractions/sfruit/sfruit/list-union-merge.pd =================================================================== --- trunk/abstractions/sfruit/sfruit/list-union-merge.pd 2009-01-03 09:13:36 UTC (rev 10472) +++ trunk/abstractions/sfruit/sfruit/list-union-merge.pd 2009-01-03 09:15:08 UTC (rev 10473) @@ -9,6 +9,7 @@ #X obj 138 33 inlet; #X obj 52 32 inlet; #X obj 52 339 outlet; +#X obj -5 90 route bang; #X connect 0 0 9 0; #X connect 0 1 3 0; #X connect 1 0 2 0; @@ -20,4 +21,6 @@ #X connect 5 0 2 1; #X connect 6 0 0 1; #X connect 7 0 1 1; -#X connect 8 0 0 0; +#X connect 8 0 10 0; +#X connect 10 0 9 0; +#X connect 10 1 0 0; Added: trunk/abstractions/sfruit/sfruit/midi.random-smooth.pd =================================================================== --- trunk/abstractions/sfruit/sfruit/midi.random-smooth.pd (rev 0) +++ trunk/abstractions/sfruit/sfruit/midi.random-smooth.pd 2009-01-03 09:15:08 UTC (rev 10473) @@ -0,0 +1,17 @@ +#N canvas 1001 348 198 230 10; +#X obj 68 98 / 999999; +#X obj 68 76 random 999999; +#X obj 41 167 line 50 5; +#X msg 41 145 \$1 50; +#X obj 41 124 +; +#X obj 41 51 t a b; +#X obj 41 19 inlet; +#X obj 41 189 outlet; +#X connect 0 0 4 1; +#X connect 1 0 0 0; +#X connect 2 0 7 0; +#X connect 3 0 2 0; +#X connect 4 0 3 0; +#X connect 5 0 4 0; +#X connect 5 1 1 0; +#X connect 6 0 5 0; Added: trunk/abstractions/sfruit/sfruit/quantize-help.pd =================================================================== --- trunk/abstractions/sfruit/sfruit/quantize-help.pd (rev 0) +++ trunk/abstractions/sfruit/sfruit/quantize-help.pd 2009-01-03 09:15:08 UTC (rev 10473) @@ -0,0 +1,11 @@ +#N canvas 496 468 450 300 10; +#X text 272 256 2008 Luke Iannini; +#X floatatom 115 107 5 0 0 0 - - -; +#X floatatom 115 188 5 0 0 0 - - -; +#X obj 115 145 quantize 16; +#X text 22 20 [quantize] rounds a number to the next multiple of its +argument; +#X msg 193 145 0.333; +#X connect 1 0 3 0; +#X connect 3 0 2 0; +#X connect 5 0 3 1; Added: trunk/abstractions/sfruit/sfruit/quantize.pd =================================================================== --- trunk/abstractions/sfruit/sfruit/quantize.pd (rev 0) +++ trunk/abstractions/sfruit/sfruit/quantize.pd 2009-01-03 09:15:08 UTC (rev 10473) @@ -0,0 +1,42 @@ +#N canvas 194 246 374 297 10; +#X obj 160 162 / 2; +#X obj 129 192 >; +#X obj 47 209 +; +#X obj 47 236 *; +#X obj 197 192 t a; +#X obj 47 109 t a a; +#X obj 122 162 fmod; +#X obj 47 162 /; +#X obj 47 185 int; +#X obj 126 110 t a a a a; +#X obj 126 39 inlet; +#X obj 47 39 inlet; +#X obj 47 262 outlet; +#X obj 204 22 loadbang; +#X obj 204 49 f \$1; +#X obj 204 70 sel 0; +#X msg 204 93 1; +#X text 193 149 if remainder is > 1/2 \,; +#X text 194 163 quantize to next snappoint; +#X text 182 157 <; +#X connect 0 0 1 1; +#X connect 1 0 2 1; +#X connect 2 0 3 0; +#X connect 3 0 12 0; +#X connect 4 0 3 1; +#X connect 5 0 7 0; +#X connect 5 1 6 0; +#X connect 6 0 1 0; +#X connect 7 0 8 0; +#X connect 8 0 2 0; +#X connect 9 0 7 1; +#X connect 9 1 6 1; +#X connect 9 2 0 0; +#X connect 9 3 4 0; +#X connect 10 0 9 0; +#X connect 11 0 5 0; +#X connect 13 0 14 0; +#X connect 14 0 15 0; +#X connect 15 0 16 0; +#X connect 15 1 9 0; +#X connect 16 0 9 0; Added: trunk/abstractions/sfruit/sfruit/receivemany.pd =================================================================== --- trunk/abstractions/sfruit/sfruit/receivemany.pd (rev 0) +++ trunk/abstractions/sfruit/sfruit/receivemany.pd 2009-01-03 09:15:08 UTC (rev 10473) @@ -0,0 +1,21 @@ +#N canvas 37 448 222 329 10; +#X obj 42 34 inlet; +#X msg 74 189 clear; +#X obj 42 63 t a b; +#X obj 42 88 list-enumerate; +#X obj 42 115 list-dripx 2; +#X msg 42 154 add \$1 \$2; +#X obj 42 235 list split 1; +#X obj 86 285 outlet; +#X obj 42 212 receive2list; +#X obj 42 285 outlet; +#X connect 0 0 2 0; +#X connect 1 0 8 0; +#X connect 2 0 3 0; +#X connect 2 1 1 0; +#X connect 3 0 4 0; +#X connect 4 0 5 0; +#X connect 5 0 8 0; +#X connect 6 0 9 0; +#X connect 6 1 7 0; +#X connect 8 0 6 0; Modified: trunk/abstractions/sfruit/sfruit/setabng.pd =================================================================== --- trunk/abstractions/sfruit/sfruit/setabng.pd 2009-01-03 09:13:36 UTC (rev 10472) +++ trunk/abstractions/sfruit/sfruit/setabng.pd 2009-01-03 09:15:08 UTC (rev 10473) @@ -1,22 +1,20 @@ -#N canvas 766 282 203 271 10; +#N canvas 766 282 224 325 10; #X obj 44 35 inlet; -#X obj 44 199 spigot; -#X msg 44 154 1; -#X msg 83 154 0; -#X obj 44 107 t b b b; -#X obj 95 107 t b; +#X obj 44 229 spigot; +#X msg 44 184 1; +#X msg 83 184 0; +#X obj 44 137 t b b b; +#X obj 44 263 outlet; +#X obj 132 196 inlet; +#X obj 131 172 outlet; #X obj 44 70 route set; -#X obj 44 233 outlet; -#X obj 132 166 inlet; -#X obj 131 142 outlet; -#X connect 0 0 6 0; -#X connect 1 0 7 0; +#X connect 0 0 8 0; +#X connect 1 0 5 0; #X connect 2 0 1 1; #X connect 3 0 1 1; #X connect 4 0 2 0; -#X connect 4 1 9 0; +#X connect 4 1 7 0; #X connect 4 2 3 0; -#X connect 5 0 9 0; -#X connect 6 0 4 0; -#X connect 6 1 5 0; -#X connect 8 0 1 0; +#X connect 6 0 1 0; +#X connect 8 0 4 0; +#X connect 8 1 7 0; Added: trunk/abstractions/sfruit/sfruit/templater-help.pd =================================================================== --- trunk/abstractions/sfruit/sfruit/templater-help.pd (rev 0) +++ trunk/abstractions/sfruit/sfruit/templater-help.pd 2009-01-03 09:15:08 UTC (rev 10473) @@ -0,0 +1,43 @@ +#N canvas 657 235 658 370 10; +#X obj 17 329 sendcanvas; +#X msg 17 251 obj 10 10 templater modcount \, loadbang; +#X text 270 69 arguments:; +#X text 284 88 my_template_name - this will be expanded to "my_template_name-template.pd" +and searched for in your Pd path.; +#X text 282 140 absolute/relative - by default \, templater will start +building the objects in the template file 20 pixels South of the point +where you instantiated [templater]. Give "1" (or anything) as the second +argument for templater to instead create the objects exactly as they +are defined in the template file \, with no offset.; +#X text 522 320 2008 Luke Iannini; +#X text 522 335 proyekto.net; +#X msg 17 281 obj 10 10 templater tmetro \, loadbang; +#X text 282 253 for the moment \, one must manually delete the [templater] +object immediately after spawning it.; +#X text 89 229 try me!; +#X text 40 301 (delete existing to try another); +#N canvas 514 43 411 356 creating-templates 0; +#X obj 10 35 metro 250; +#X obj 10 10 tgl 20 0 empty empty empty 17 7 0 10 -200676 -1 -1 0 1 +; +#X obj 30 58 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1 +-1; +#X text 29 287 As an aside \, an easy way to edit templates is to simply +spawn them as [modcount-template] or similar - they're just Pd patches +in your Pd path.; +#X text 25 140 To make a template \, simply create a patch and save +it as <myname>-template.pd somewhere in your Pd path.; +#X text 26 178 The top-left object should be in the upper-left corner +of the canvas if you plan to use the relative positioning feature of +[templater].; +#X text 28 226 Or \, position objects just as you'd like them to appear +if you plan to use the absolute mode of [templater]. The example above +shows the placement of objects within the "modcount" template.; +#X connect 0 0 2 0; +#X connect 1 0 0 0; +#X restore 301 323 pd creating-templates; +#X text 283 291 subpatches are not yet supported; +#X text 266 32 [templater] - create and connect a set of pd objects +in the current patch based on a template file.; +#X connect 1 0 0 0; +#X connect 7 0 0 0; Added: trunk/abstractions/sfruit/sfruit/templater.pd =================================================================== --- trunk/abstractions/sfruit/sfruit/templater.pd (rev 0) +++ trunk/abstractions/sfruit/sfruit/templater.pd 2009-01-03 09:15:08 UTC (rev 10473) @@ -0,0 +1,94 @@ +#N canvas 804 104 455 638 10; +#X obj 103 318 textfile; +#X obj 103 366 route #X; +#X obj 103 387 route connect; +#X obj 50 271 until; +#X obj 50 145 t b b; +#X obj 50 46 loadbang; +#X obj 103 435 unpack f f f f; +#X obj 103 519 pack f f f f; +#X obj 103 581 sendcanvas 1; +#X obj 208 443 r \$0.index-offset; +#X obj 149 479 +; +#X obj 103 479 +; +#X msg 103 551 connect \$1 \$2 \$3 \$4; +#X obj 69 98 canvasindex; +#X obj 132 125 s \$0.index-offset; +#N canvas 342 115 467 373 offset-coords 0; +#X obj 47 3 inlet; +#X obj 46 334 outlet; +#X obj 47 78 list split 1; +#X obj 96 113 list split 2; +#X obj 110 256 list append; +#X obj 47 282 list append; +#X obj 194 181 +; +#X obj 194 152 unpack f f; +#X obj 209 94 unpack f f; +#X obj 251 182 +; +#X obj 194 211 pack f f; +#X obj 208 62 inlet; +#X obj 46 309 list trim; +#X obj 266 122 + 20; +#X text 301 123 spawn under [templater]; +#X connect 0 0 2 0; +#X connect 2 0 5 0; +#X connect 2 1 3 0; +#X connect 3 0 7 0; +#X connect 3 1 4 1; +#X connect 4 0 5 1; +#X connect 5 0 12 0; +#X connect 6 0 10 0; +#X connect 7 0 6 0; +#X connect 7 1 9 0; +#X connect 8 0 6 1; +#X connect 8 1 13 0; +#X connect 9 0 10 1; +#X connect 10 0 4 0; +#X connect 11 0 8 0; +#X connect 12 0 1 0; +#X connect 13 0 9 1; +#X restore 199 387 pd offset-coords; +#X obj 199 409 sendcanvas 1; +#X obj 292 362 canvasposition; +#X obj 50 74 t b b b; +#X obj 113 75 s \$0.get-position; +#X obj 292 292 r \$0.get-position; +#X obj 102 174 list append \$1; +#X obj 102 198 route float; +#X msg 103 235 read \$1-template.pd \, rewind; +#X obj 292 339 sel 0; +#X text 304 16 *optional; +#X obj 292 316 list append \$2; +#X text 86 16 [templater templatename absolute?*]; +#X text 286 602 2008 Luke Iannini; +#X connect 0 0 1 0; +#X connect 0 1 3 1; +#X connect 1 0 2 0; +#X connect 2 0 6 0; +#X connect 2 1 15 0; +#X connect 3 0 0 0; +#X connect 4 0 3 0; +#X connect 4 1 21 0; +#X connect 5 0 18 0; +#X connect 6 0 11 0; +#X connect 6 1 7 1; +#X connect 6 2 10 0; +#X connect 6 3 7 3; +#X connect 7 0 12 0; +#X connect 9 0 11 1; +#X connect 9 0 10 1; +#X connect 10 0 7 2; +#X connect 11 0 7 0; +#X connect 12 0 8 0; +#X connect 13 1 14 0; +#X connect 15 0 16 0; +#X connect 17 0 15 1; +#X connect 18 0 4 0; +#X connect 18 1 13 0; +#X connect 18 2 19 0; +#X connect 20 0 26 0; +#X connect 21 0 22 0; +#X connect 22 1 23 0; +#X connect 23 0 0 0; +#X connect 24 0 17 0; +#X connect 26 0 24 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data:[10472] trunk/abstractions/sfruit/controctopus
by lukeiannini＠users.sourceforge.net 03 Jan '09

03 Jan '09

Revision: 10472 http://pure-data.svn.sourceforge.net/pure-data/?rev=10472&view=rev Author: lukeiannini Date: 2009-01-03 09:13:36 +0000 (Sat, 03 Jan 2009) Log Message: ----------- bugfixes Modified Paths: -------------- trunk/abstractions/sfruit/controctopus/cc-learner.pd trunk/abstractions/sfruit/controctopus/note-learner.pd Modified: trunk/abstractions/sfruit/controctopus/cc-learner.pd =================================================================== --- trunk/abstractions/sfruit/controctopus/cc-learner.pd 2009-01-02 19:40:36 UTC (rev 10471) +++ trunk/abstractions/sfruit/controctopus/cc-learner.pd 2009-01-03 09:13:36 UTC (rev 10472) @@ -1,9 +1,9 @@ #N canvas 62 131 629 668 10; #X obj 60 46 nbx 3 14 0 127 0 1 \$0.cc.s \$0.cc.r CC 42 8 0 11 -194624 --1 -1 1 256; +-1 -1 111 256; #X obj 63 64 bng 13 250 50 0 \$0.learn-on \$0.nullR empty 0 -6 0 8 -259541 -1 -1; -#X obj 330 208 r \$0.cc.v; +#X obj 330 178 r \$0.cc.v; #X obj 81 67 bng 8 250 50 0 empty \$0.lite1 empty 0 -6 0 8 -1 -262085 -1; #X obj 92 67 bng 8 250 50 0 empty \$0.lite2 empty 0 -6 0 8 -1 -262085 @@ -13,14 +13,13 @@ #X obj 268 49 ctlin; #X obj 60 81 nbx 2 14 1 64 0 0 \$0.device-number.s \$0.device-number.r Dev 32 8 0 11 -110565 -1 -1 1 256; -#X obj 315 181 spigot; #X obj 268 267 spigot; #X obj 268 181 / 127; -#X obj 315 237 ==; +#X obj 315 207 ==; #X obj 349 566 list append; #X obj 333 611 s; -#X msg 294 292 set \$1; -#X obj 268 367 s \$0.data; +#X msg 294 322 set \$1; +#X obj 268 397 s \$0.data; #X obj 210 467 r \$0.data; #X obj 333 431 r \$0.data; #X obj 32 231 loadbang; @@ -31,9 +30,9 @@ #X obj 10 570 r \$1/getControls; #X obj 10 620 s \$1/controlsList; #X obj 10 594 list append \$2; -#X obj 294 312 s \$1\$2/GUIR; +#X obj 294 342 s \$1\$2/GUIR; #X obj 210 567 s \$1\$2; -#X obj 294 343 r \$1\$2/GUI; +#X obj 294 373 r \$1\$2/GUI; #X msg 349 587 symbol \$1\$2/Ch\$3; #X obj 349 478 list append \$1; #X text 208 594 Omni; @@ -44,13 +43,11 @@ #X obj 315 98 t a; #X obj 268 98 t a; #X obj 348 99 t a; -#X obj 32 279 s \$0.channel; #X obj 222 493 outlet; #X obj 51 98 cnv 10 75 10 empty empty \$1 1 6 0 8 -66577 -171136 0 ; #X obj 308 49 nr PDCTLIN 3; #X obj 32 304 r \$1/devNo; -#X obj 32 329 s \$0.device-number.r; #N canvas 0 22 450 300 sssad 0; #X obj 43 89 sssadie/sssadiez \$1 \$2 cc 0 1024 \$0 round; #X obj 43 109 sssadie/sssadiez \$1 \$2 device-number 0 1024 \$0 round @@ -99,7 +96,7 @@ #X connect 17 0 18 0; #X connect 17 0 16 1; #X connect 18 0 17 1; -#X restore 366 133 pd midi-learn; +#X restore 396 133 pd midi-learn; #N canvas 872 119 244 290 parse-channel 0; #X obj 55 34 inlet; #X obj 55 241 outlet; @@ -149,40 +146,47 @@ #X connect 14 0 15 0; #X connect 15 0 12 0; #X restore 485 392 pd midi-sensory; -#X text 195 15 cc-learner /unit /control; -#X connect 2 0 11 1; -#X connect 6 0 36 0; -#X connect 6 1 35 0; -#X connect 6 2 37 0; -#X connect 8 0 11 0; -#X connect 9 0 14 0; -#X connect 9 0 15 0; -#X connect 10 0 9 0; -#X connect 11 0 9 1; -#X connect 12 0 29 0; -#X connect 14 0 26 0; -#X connect 16 0 27 0; -#X connect 16 0 39 0; -#X connect 17 0 13 0; -#X connect 18 0 19 0; -#X connect 19 0 38 0; -#X connect 20 0 30 0; -#X connect 20 1 12 1; -#X connect 21 0 20 0; -#X connect 22 0 12 0; -#X connect 23 0 25 0; -#X connect 25 0 24 0; -#X connect 28 0 15 0; -#X connect 29 0 13 1; -#X connect 30 0 22 0; -#X connect 32 0 33 0; -#X connect 35 0 45 0; -#X connect 35 0 8 0; -#X connect 36 0 10 0; -#X connect 37 0 46 0; -#X connect 41 0 36 0; -#X connect 41 1 35 0; -#X connect 41 2 37 0; -#X connect 42 0 43 0; -#X connect 46 0 8 1; +#X text 195 15 [cc-learner /unit /control]; +#X obj 268 133 midi.random-smooth; +#X obj 32 329 s \$0.device-number.all; +#X obj 32 279 s \$0.device-number.all; +#X obj 268 203 min 1; +#X obj 315 250 &&; +#X connect 2 0 10 1; +#X connect 6 0 35 0; +#X connect 6 1 34 0; +#X connect 6 2 36 0; +#X connect 8 0 13 0; +#X connect 8 0 14 0; +#X connect 9 0 49 0; +#X connect 10 0 50 0; +#X connect 11 0 28 0; +#X connect 13 0 25 0; +#X connect 15 0 26 0; +#X connect 15 0 37 0; +#X connect 16 0 12 0; +#X connect 17 0 18 0; +#X connect 18 0 48 0; +#X connect 19 0 29 0; +#X connect 19 1 11 1; +#X connect 20 0 19 0; +#X connect 21 0 11 0; +#X connect 22 0 24 0; +#X connect 24 0 23 0; +#X connect 27 0 14 0; +#X connect 28 0 12 1; +#X connect 29 0 21 0; +#X connect 31 0 32 0; +#X connect 34 0 42 0; +#X connect 34 0 10 0; +#X connect 35 0 46 0; +#X connect 36 0 43 0; +#X connect 39 0 35 0; +#X connect 39 1 34 0; +#X connect 39 2 36 0; +#X connect 40 0 47 0; +#X connect 43 0 50 1; +#X connect 46 0 9 0; +#X connect 49 0 8 0; +#X connect 50 0 8 1; #X coords 0 -1 1 1 77 79 2 50 30; Modified: trunk/abstractions/sfruit/controctopus/note-learner.pd =================================================================== --- trunk/abstractions/sfruit/controctopus/note-learner.pd 2009-01-02 19:40:36 UTC (rev 10471) +++ trunk/abstractions/sfruit/controctopus/note-learner.pd 2009-01-03 09:13:36 UTC (rev 10472) @@ -6,7 +6,7 @@ #X obj 102 293 nbx 2 14 1 128 0 0 \$0.pad.s \$0.pad.r Pad 32 7 0 11 -154432 -1 -1 1 256; #X obj 102 276 nbx 2 14 0 127 0 0 \$0.note.s \$0.note.r Note 32 7 0 -11 -260624 -1 -1 36 256; +11 -260624 -1 -1 0 256; #X obj 420 523 outlet; #X obj 137 263 bng 13 250 50 0 \$0.learn-on empty empty 0 -6 0 8 -259541 -1 -1; @@ -75,7 +75,7 @@ #X obj 365 104 t a; #X obj 395 104 t a; #X obj 349 53 notein; -#X text 351 17 Intercepts for looping back MIDI (e.g. from sft.schoen) +#X text 345 33 Intercepts for looping back MIDI (e.g. from sft.schoen) ; #X obj 755 273 ==; #X obj 27 18 loadbang; @@ -178,52 +178,52 @@ #X obj 51 90 t b f; #X obj 40 265 s; #X obj 51 177 s \$1\$2/polytouch; -#X msg 55 243 symbol \$1\$2/polytouch/in; #X obj 55 222 list prepend \$3; #X obj 55 202 r \$0.pad.v; #X obj 40 63 inlet; +#X msg 55 243 symbol \$1*\$2/polytouch/in; #X connect 0 0 1 0; #X connect 1 0 6 0; #X connect 2 0 0 0; #X connect 3 0 2 0; #X connect 4 0 0 0; #X connect 4 1 1 1; -#X connect 7 0 5 1; +#X connect 7 0 10 0; #X connect 8 0 7 0; -#X connect 9 0 8 0; -#X connect 10 0 4 0; -#X connect 10 0 5 0; +#X connect 9 0 4 0; +#X connect 9 0 5 0; +#X connect 10 0 5 1; #X restore 722 334 pd send-polytouch; #N canvas 0 22 625 312 group-style-sends 0; #X obj 221 237 s; #X obj 236 172 r \$0.pad.v; #X obj 236 193 list prepend \$3; -#X msg 236 214 symbol \$1\$2/velocity/in; #X obj 221 132 r \$0.velocity; #X obj 61 237 s; #X obj 76 172 r \$0.pad.v; #X obj 76 193 list prepend \$3; -#X msg 76 214 symbol \$1\$2/note/in; #X obj 61 132 r \$0.note; #X obj 412 132 r \$0.trigger; #X obj 412 243 s; #X obj 427 178 r \$0.pad.v; #X obj 427 199 list prepend \$3; -#X msg 427 220 symbol \$1\$2/trigger/in; #X obj 412 154 != 0; +#X msg 76 214 symbol \$1*\$2/note/in; +#X msg 236 214 symbol \$1*\$2/velocity/in; +#X msg 427 220 symbol \$1*\$2/trigger/in; #X connect 1 0 2 0; -#X connect 2 0 3 0; -#X connect 3 0 0 1; -#X connect 4 0 0 0; -#X connect 6 0 7 0; -#X connect 7 0 8 0; -#X connect 8 0 5 1; -#X connect 9 0 5 0; -#X connect 10 0 15 0; -#X connect 12 0 13 0; -#X connect 13 0 14 0; -#X connect 14 0 11 1; -#X connect 15 0 11 0; +#X connect 2 0 14 0; +#X connect 3 0 0 0; +#X connect 5 0 6 0; +#X connect 6 0 13 0; +#X connect 7 0 4 0; +#X connect 8 0 12 0; +#X connect 10 0 11 0; +#X connect 11 0 15 0; +#X connect 12 0 9 0; +#X connect 13 0 4 1; +#X connect 14 0 0 1; +#X connect 15 0 9 1; #X restore 451 457 pd group-style-sends; #N canvas 0 22 220 213 gui-relay 0; #X obj 56 77 prepent set; @@ -243,6 +243,7 @@ #X obj 26 553 sssadie/sssadiez \$1 \$2 note 0 256 \$0; #X obj 26 573 sssadie/sssadiez \$1 \$2 pad 0 256 \$0; #X obj 26 533 sssadie/sssadiez \$1 \$2 device-number 0 256 \$0; +#X text 344 3 [note-learner /device /pad# /group(nonumber)]; #X connect 0 0 3 0; #X connect 1 0 35 0; #X connect 1 0 44 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data:[10471] trunk/pd
by millerpuckette＠users.sourceforge.net 02 Jan '09

02 Jan '09

Revision: 10471 http://pure-data.svn.sourceforge.net/pure-data/?rev=10471&view=rev Author: millerpuckette Date: 2009-01-02 19:40:36 +0000 (Fri, 02 Jan 2009) Log Message: ----------- release 0.42-0 Modified Paths: -------------- trunk/pd/doc/1.manual/x5.htm trunk/pd/extra/bonk~/bonk~-help.pd trunk/pd/extra/bonk~/bonk~.c trunk/pd/src/g_editor.c trunk/pd/src/m_pd.h trunk/pd/src/notes.txt trunk/pd/src/u_main.tk trunk/pd/src/x_gui.c Modified: trunk/pd/doc/1.manual/x5.htm =================================================================== --- trunk/pd/doc/1.manual/x5.htm 2008-12-30 01:53:20 UTC (rev 10470) +++ trunk/pd/doc/1.manual/x5.htm 2009-01-02 19:40:36 UTC (rev 10471) @@ -22,8 +22,51 @@ ------------------ 0.42 --------------------------- - print takes "-n" flag to supperss "print:" in output + The 'struct' object can now be used to catch a small but growing variety of +events (mouse clicks on data, selection/deselection). + The 'tabread4~' object was fixed to allow message-time onset into the table. +This makes it possible (at last) to use tabread4~ effectively with large (> 1 +second) samples. New help files 3.audio.examples/B15 and B16 show how to +use it. It's not pretty but it's at least possible. + + Took patches from Iohannes Zmoelnig to make Pd work when compiled to use +64-bit floating-point audio. I didn't test this; doubtless there will still be +some problems. (This isn't the same thing as running in '64 bit mode' which +already works fine and is the default when compiled on a 64-bit linux machine.) + + New objects in extra, 'pd~', and 'stdout', allow running a separate Pd +instance in a sub-process. Theoretically this should make it possible to use +multiprocessors efficiently in {d. It's still somewhat experimental; it might +not work well to pass large numbers of messages and/or signals back and forth. + + A -batch flag allows Pd to be run efficiently from scripts. You should +probably also specify -nosound. With these flags Pd runs as quickly as it +can without waiting for real time. It's up to the patch to arrange to exit +at the appropriate time via a 'pd quit' message. + + Large and sweeping improvements have been made to bonk~ and sigmund~. The +new bonk~ features are documented in its help window; sigmund~ works better but +has the same old features. + + Closing and quiting Pd now act more politely, querying the user only if +there are edited windows. There's also a query if the user types into a box +holding an edited abstraction to prevent the changes from getting lost +accidentally. A new 'pd perf' message re-enables the old "really close this +window" behavior, which is appropriate for performances where you don't want the +wrong keyclick to stop Pd brusquely. + + The process of reloading multiple copies of a modified abstraction was +sped up. + + The 'find' dialog permits searching for substrings. This is useful for +strings containing "$" arguments, where it's unclear what 'find' does or should +do. + + New pow~, log~, exp~, abs~, and 'wrap' objects. + + The 'print' object takes "-n" flag to supperss "print:" in output + "clear" button in Pd output window ".pdrc" loading suppressed if pd is started with "-noprefs". @@ -34,6 +77,7 @@ Binbufs fixed to handle arbitrary length messages. (This fixed a problem reloading data structures with huge arrays). + various fixes to ------------------ 0.41-3,4 --------------------------- 2 fixes for PC: no bonk~, and the audio device selection Modified: trunk/pd/extra/bonk~/bonk~-help.pd =================================================================== --- trunk/pd/extra/bonk~/bonk~-help.pd 2008-12-30 01:53:20 UTC (rev 10470) +++ trunk/pd/extra/bonk~/bonk~-help.pd 2009-01-02 19:40:36 UTC (rev 10471) @@ -1,13 +1,11 @@ -#N canvas 304 143 967 599 12; -#X obj 358 544 spigot; -#X msg 442 397 bang; -#X obj 428 508 bonk~; -#X msg 442 214 learn 1; -#X msg 442 274 learn 0; -#X msg 446 451 print; -#X obj 390 437 adc~; -#X msg 613 558 \; pd dsp 1; -#X obj 276 544 spigot; +#N canvas 33 37 964 579 12; +#X obj 382 492 spigot; +#X msg 452 292 bang; +#X obj 452 456 bonk~; +#X msg 452 359 print; +#X obj 396 429 adc~; +#X msg 637 506 \; pd dsp 1; +#X obj 300 492 spigot; #N canvas 366 126 604 404 synth 0; #X obj 112 24 r bonk-cooked; #X obj 112 49 unpack; @@ -59,67 +57,36 @@ #X connect 21 0 1 0; #X connect 22 0 6 0; #X connect 23 0 9 0; -#X restore 845 575 pd synth; -#X floatatom 845 552 0 0 0 0 - - -; -#X msg 845 522 0; -#X msg 442 244 learn 10; -#X msg 442 304 forget; -#X msg 442 334 write templates.txt; -#X msg 442 364 read templates.txt; -#X msg 876 522 90; -#X msg 442 81 thresh 6 50; -#X text 8 56 The Bonk object takes an audio signal input and looks -for "attacks" defined as sharp changes in the spectral envelope of -the incoming sound. Optionally \, and less reliably \, you can have -Bonk check the attack against a collection of stored templates to try -to guess which of two or more instruments was hit. Bonk is described -theoretically in the 1998 ICMC proceedings \, reprinted on http://man104nfs.ucsd.edu/~mpuckett. -; -#X text 601 524 click here; -#X text 602 537 to start DSP; -#X text 8 377 In this patch \, after starting DSP \, you can print +#X restore 869 523 pd synth; +#X floatatom 869 500 0 0 0 0 - - -; +#X msg 869 470 0; +#X msg 900 470 90; +#X text 625 472 click here; +#X text 626 485 to start DSP; +#X text 5 284 In this patch \, after starting DSP \, you can print out the raw or cooked output using the two "spigots" or listen to a synthesizer output by raising its volume.; -#X text 746 521 output volume; -#X text 760 539 (0-100); -#X msg 442 150 mask 4 0.7; -#X msg 442 184 debounce 0; -#X text 8 309 Bonk's analysis is carried out on a 256-point window -(6 msec at 44.1 kHz) and by default the analysis period is 128 samples. -The analysis period can be specified as Bonk's creation argument but -must be a multiple of 64; -#X text 532 185 Minimum time (msec) between attacks; -#X text 526 136 Describes how energy in each frequency band masks later +#X text 770 469 output volume; +#X text 784 487 (0-100); +#X msg 452 140 mask 4 0.7; +#X text 547 122 Describes how energy in each frequency band masks later energy in the band. Here the masking is total for 4 analysis periods and then drops by 0.7 each period.; -#X text 530 214 Forget all templates and start learning new ones. The -argument gives the number of times you will hit each instrument (10 -recommended.) Turn on the output volume above for audible feedback -as you train Bonk. "Learn 0" exits learn mode.; -#X text 530 298 Forget the last template. In Learn mode \, use "forget" -to erase and record over a template.; -#X text 595 334 Write templates to a file in text-editable format. -; -#X text 596 364 Read templates from a file.; -#X text 514 450 Print out all settings and templates.; -#X msg 442 120 minvel 10; -#X text 514 392 Poll the current spectrum via "raw" outlet \, You can +#X text 497 288 Poll the current spectrum via "raw" outlet \, You can set a very high threshold if you don't want attacks mixed in.; -#X msg 437 426 debug 0; -#X text 514 426 turn debugging on or off.; -#X obj 325 545 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 +#X msg 452 333 debug 0; +#X text 530 333 turn debugging on or off.; +#X obj 349 493 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1; -#X obj 407 545 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 +#X obj 431 493 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1; -#X obj 358 574 print cooked; -#X obj 276 574 print raw; -#X text 158 545 enable printout:; -#X text 530 121 Minimum "velocity" to output (quieter notes are ignored.) +#X obj 382 522 print cooked; +#X obj 300 522 print raw; +#X text 182 493 enable printout:; +#X text 529 204 Minimum "velocity" to output (quieter notes are ignored.) ; -#X obj 461 533 s bonk-cooked; -#X text 218 12 BONK~ - an attack detector for small percussion instruments -; -#X text 8 174 Bonk's two outputs are the raw spectrum of the attack +#X obj 485 481 s bonk-cooked; +#X text 8 144 Bonk's two outputs are the raw spectrum of the attack (provided as a list of 11 numbers giving the signal "loudness" in the 11 frequency bands used) \, and the "cooked" output which gives only an instrument number (counting up from zero) and a "velocity". This @@ -127,36 +94,116 @@ bands \, normalized so that 100 is an attack of amplitude of about 1 The instrument number is significant only if Bonk has a "template set" in memory.; -#X text 531 47 Set low and high thresholds. Signal growth must exceed +#X text 549 37 Set low and high thresholds. Signal growth must exceed the high one and then fall to the low one to make an attack. The unit is the sum of the proportional growth in the 11 filter bands. Proportional growth is essentially the logarithmic time derivative.; -#X text 238 27 (NOTE: this documentation does not yet describe new -features for Pd 0.42).; -#X msg 446 479 print 1; -#X text 514 481 print out filterbank settings; -#X connect 0 0 40 0; +#X msg 452 386 print 1; +#X text 520 388 print out filterbank settings; +#X text 9 32 The Bonk object takes an audio signal input and looks +for "attacks" defined as sharp changes in the spectral envelope of +the incoming sound. Optionally \, and less reliably \, you can have +Bonk check the attack against a collection of stored templates to try +to guess which of two or more instruments was hit. Bonk is described +theoretically in the 1998 ICMC proceedings \, reprinted on crca.ucsd.edu/~msp +.; +#N canvas 422 63 701 719 creation-arguments 0; +#X text 228 14 creation arguments for bonk~; +#X text 70 272 -npts 256; +#X text 44 244 default value:; +#X text 70 308 -hop 128; +#X text 70 342 -nfilters 11; +#X text 68 380 -halftones 6; +#X text 76 514 -overlap 1; +#X text 79 567 -firstbin 1; +#X text 71 454 -minbandwidth 1.5; +#X text 122 147 All frequency parameters are specified in 'bins'. One +bin is the sample rate divided by the window size. The minimum possible +bandwidth is 1.5 bins. Higher bandwidths give numerically more robust +outputs.; +#X text 43 229 Arguments and; +#X text 212 270 window size in points; +#X text 210 306 analysis period ("hop size") in points; +#X text 212 340 number of filters to use; +#X text 212 379 desired bandwidth of filters in halftones \, effective +in the exponentially spaced region. (At lower center frequencies the +bandwidth is supported by the "minbandwidth" parameter below).; +#X text 212 511 overlap factor between filters. If 1 \, the filters +are spaced to line up at their half-power points. Other values specify +more or fewer filters proportionally.; +#X text 121 49 bonk~ uses a filterbank whose center frequencies are +spaced equally at low frequencies and proportionally at high ones - +i.e. \, they increase linearly \, then exponentially. They are determined +by the filters' bandwidths and overlap. The bandwidths are specified +proportionally to frequency but bounded below by a specified minimum. +; +#X text 210 455 minimum bandwidth in bins. If the bandwidth specified +by "halftones" is smaller than this \, this value is used. This must +be at least 1.5.; +#X text 212 567 center frequency \, in bins \, of the lowest filter. +The others are computed from this.; +#X restore 147 414 pd creation-arguments; +#N canvas 660 173 579 589 templates 0; +#X msg 76 197 learn 0; +#X msg 76 227 forget; +#X msg 76 257 write templates.txt; +#X msg 76 287 read templates.txt; +#X msg 76 107 debounce 0; +#X msg 76 137 learn 10; +#X obj 62 431 outlet; +#X text 155 133 Forget all templates and start learning new ones. The +argument gives the number of times you will hit each instrument (10 +recommended.) Turn on the output volume above for audible feedback +as you train Bonk. "Learn 0" exits learn mode.; +#X text 155 217 Forget the last template. In Learn mode \, use "forget" +to erase and record over a template.; +#X text 220 253 Write templates to a file in text-editable format. +; +#X text 221 283 Read templates from a file.; +#X text 157 104 Minimum time (msec) between attacks in learn mode; +#X connect 0 0 6 0; +#X connect 1 0 6 0; +#X connect 2 0 6 0; +#X connect 3 0 6 0; +#X connect 4 0 6 0; +#X connect 5 0 6 0; +#X restore 469 423 pd templates; +#X msg 452 70 thresh 2.5 5; +#X msg 452 175 attack-frames 1; +#X text 574 176 number of frames over which to measure growth; +#X text 564 423 more messages for managing templates; +#X msg 452 203 minvel 7; +#X msg 452 230 spew 0; +#X text 519 232 Turn spew mode on/off; +#X msg 452 257 useloudness 0; +#X text 558 265 experimental: use alternative loudness units; +#X text 212 9 BONK~ - attack detection and spectral envelope measurement +; +#X text 734 552 Updated for Pd version 0.42; +#X text 5 343 By default bonk's analysis is carried out on a 256-point +window (6 msec at 44.1 kHz) and the analysis period is 128 samples. +These and other parameters may be overridden using creation arguments +as shown in the subpatch below:; +#X text 521 358 Print out settings and templates.; +#X connect 0 0 23 0; #X connect 1 0 2 0; -#X connect 2 0 8 0; +#X connect 2 0 6 0; #X connect 2 1 0 0; -#X connect 2 1 44 0; +#X connect 2 1 27 0; #X connect 3 0 2 0; #X connect 4 0 2 0; -#X connect 5 0 2 0; -#X connect 6 0 2 0; -#X connect 8 0 41 0; -#X connect 10 0 9 0; -#X connect 11 0 10 0; -#X connect 12 0 2 0; -#X connect 13 0 2 0; -#X connect 14 0 2 0; -#X connect 15 0 2 0; -#X connect 16 0 10 0; -#X connect 17 0 2 0; -#X connect 24 0 2 0; -#X connect 25 0 2 0; +#X connect 6 0 24 0; +#X connect 8 0 7 0; +#X connect 9 0 8 0; +#X connect 10 0 8 0; +#X connect 16 0 2 0; +#X connect 19 0 2 0; +#X connect 21 0 6 1; +#X connect 22 0 0 1; +#X connect 30 0 2 0; #X connect 34 0 2 0; +#X connect 35 0 2 0; #X connect 36 0 2 0; -#X connect 38 0 8 1; -#X connect 39 0 0 1; -#X connect 49 0 2 0; +#X connect 39 0 2 0; +#X connect 40 0 2 0; +#X connect 42 0 2 0; Modified: trunk/pd/extra/bonk~/bonk~.c =================================================================== --- trunk/pd/extra/bonk~/bonk~.c 2008-12-30 01:53:20 UTC (rev 10470) +++ trunk/pd/extra/bonk~/bonk~.c 2009-01-02 19:40:36 UTC (rev 10471) @@ -876,7 +876,7 @@ int i; post("thresh %f %f", x->x_lothresh, x->x_hithresh); post("mask %d %f", x->x_masktime, x->x_maskdecay); - post("attack-bins %d", x->x_attackbins); + post("attack-frames %d", x->x_attackbins); post("debounce %f", x->x_debouncedecay); post("minvel %f", x->x_minvel); post("spew %d", x->x_spew); @@ -1143,23 +1143,38 @@ void bonk_tilde_setup(void) { - bonk_class = class_new(gensym("bonk~"), (t_newmethod)bonk_new, (t_method)bonk_free, sizeof(t_bonk), 0, A_GIMME, 0); + bonk_class = class_new(gensym("bonk~"), (t_newmethod)bonk_new, + (t_method)bonk_free, sizeof(t_bonk), 0, A_GIMME, 0); class_addmethod(bonk_class, nullfn, gensym("signal"), 0); class_addmethod(bonk_class, (t_method)bonk_dsp, gensym("dsp"), 0); class_addbang(bonk_class, bonk_bang); - class_addmethod(bonk_class, (t_method)bonk_learn, gensym("learn"), A_FLOAT, 0); + class_addmethod(bonk_class, (t_method)bonk_learn, + gensym("learn"), A_FLOAT, 0); class_addmethod(bonk_class, (t_method)bonk_forget, gensym("forget"), 0); - class_addmethod(bonk_class, (t_method)bonk_thresh, gensym("thresh"), A_FLOAT, A_FLOAT, 0); - class_addmethod(bonk_class, (t_method)bonk_mask, gensym("mask"), A_FLOAT, A_FLOAT, 0); - class_addmethod(bonk_class, (t_method)bonk_debounce, gensym("debounce"), A_FLOAT, 0); - class_addmethod(bonk_class, (t_method)bonk_minvel, gensym("minvel"), A_FLOAT, 0); - class_addmethod(bonk_class, (t_method)bonk_print, gensym("print"), A_DEFFLOAT, 0); - class_addmethod(bonk_class, (t_method)bonk_debug, gensym("debug"), A_DEFFLOAT, 0); - class_addmethod(bonk_class, (t_method)bonk_spew, gensym("spew"), A_DEFFLOAT, 0); - class_addmethod(bonk_class, (t_method)bonk_useloudness, gensym("useloudness"), A_DEFFLOAT, 0); - class_addmethod(bonk_class, (t_method)bonk_attackbins, gensym("attack-bins"), A_DEFFLOAT, 0); - class_addmethod(bonk_class, (t_method)bonk_read, gensym("read"), A_SYMBOL, 0); - class_addmethod(bonk_class, (t_method)bonk_write, gensym("write"), A_SYMBOL, 0); + class_addmethod(bonk_class, (t_method)bonk_thresh, + gensym("thresh"), A_FLOAT, A_FLOAT, 0); + class_addmethod(bonk_class, (t_method)bonk_mask, + gensym("mask"), A_FLOAT, A_FLOAT, 0); + class_addmethod(bonk_class, (t_method)bonk_debounce, + gensym("debounce"), A_FLOAT, 0); + class_addmethod(bonk_class, (t_method)bonk_minvel, + gensym("minvel"), A_FLOAT, 0); + class_addmethod(bonk_class, (t_method)bonk_print, + gensym("print"), A_DEFFLOAT, 0); + class_addmethod(bonk_class, (t_method)bonk_debug, + gensym("debug"), A_DEFFLOAT, 0); + class_addmethod(bonk_class, (t_method)bonk_spew, + gensym("spew"), A_DEFFLOAT, 0); + class_addmethod(bonk_class, (t_method)bonk_useloudness, + gensym("useloudness"), A_DEFFLOAT, 0); + class_addmethod(bonk_class, (t_method)bonk_attackbins, + gensym("attack-bins"), A_DEFFLOAT, 0); + class_addmethod(bonk_class, (t_method)bonk_attackbins, + gensym("attack-frames"), A_DEFFLOAT, 0); + class_addmethod(bonk_class, (t_method)bonk_read, + gensym("read"), A_SYMBOL, 0); + class_addmethod(bonk_class, (t_method)bonk_write, + gensym("write"), A_SYMBOL, 0); post("bonk version 1.3"); } #endif @@ -1225,8 +1240,8 @@ attr = attr_offset_new("useloudness", sym_long, attrflags, (method)0L, (method)bonk_useloudness_set, calcoffset(t_bonk, x_useloudness)); class_addattr(c, attr); - - attr = attr_offset_new("attackbins", sym_long, attrflags, (method)0L, (method)bonk_attackbins_set, calcoffset(t_bonk, x_attackbins)); + + attr = attr_offset_new("attackframes", sym_long, attrflags, (method)0L, (method)bonk_attackbins_set, calcoffset(t_bonk, x_attackbins)); class_addattr(c, attr); attr = attr_offset_new("learn", sym_long, attrflags, (method)0L, (method)bonk_learn_set, calcoffset(t_bonk, x_learn)); Modified: trunk/pd/src/g_editor.c =================================================================== --- trunk/pd/src/g_editor.c 2008-12-30 01:53:20 UTC (rev 10470) +++ trunk/pd/src/g_editor.c 2009-01-02 19:40:36 UTC (rev 10471) @@ -756,11 +756,13 @@ void canvas_reload(t_symbol *name, t_symbol *dir, t_gobj *except) { t_canvas *x; + int dspwas = canvas_suspend_dsp(); glist_amreloadingabstractions = 1; /* find all root canvases */ for (x = canvas_list; x; x = x->gl_next) glist_doreload(x, name, dir, except); glist_amreloadingabstractions = 0; + canvas_resume_dsp(dspwas); } /* ------------------------ event handling ------------------------ */ @@ -1190,8 +1192,9 @@ strcpy(namebuf, class_gethelpname(pd_class(&y->g_pd))); dir = class_gethelpdir(pd_class(&y->g_pd)); } - if (strcmp(namebuf + strlen(namebuf) - 3, ".pd")) - strcat(namebuf, ".pd"); + if (strlen(namebuf) < 4 || + strcmp(namebuf + strlen(namebuf) - 3, ".pd")) + strcat(namebuf, ".pd"); open_via_helppath(namebuf, dir); return; } @@ -1596,8 +1599,9 @@ vmess(&gl2->gl_pd, gensym("menu-open"), ""); x->gl_editor->e_onmotion = MA_NONE; sys_vgui( -"pdtk_check {Discard changes to '%s'?} {.x%lx dirty 0;\n} no\n", - canvas_getrootfor(gl2)->gl_name->s_name, gl2); +"pdtk_check .x%lx.c {Discard changes to '%s'?} {.x%lx dirty 0;\n} no\n", + canvas_getrootfor(gl2), + canvas_getrootfor(gl2)->gl_name->s_name, gl2); return; } /* OK, activate it */ @@ -1725,34 +1729,16 @@ || !strcmp(gotkeysym->s_name, "Left") || !strcmp(gotkeysym->s_name, "Right"))) { - /* special case - carriage return to object "makes" it */ - if (keynum == '\n' && (ob = - pd_checkobject(&x->gl_editor->e_selection->sel_what->g_pd)) && - ob->te_type == T_OBJECT) + /* send the key to the box's editor */ + if (!x->gl_editor->e_textdirty) { - t_gobj *g; - int nobj, indx = - canvas_getindex(x, x->gl_editor->e_selection->sel_what); - glist_noselect(x); - /* "ob" may have disappeared; just search to the last - object and select it */ - for (g = x->gl_list, nobj = 0; g; g = g->g_next, nobj++) - if (nobj == indx) - glist_select(x, g); + canvas_setundo(x, canvas_undo_cut, + canvas_undo_set_cut(x, UCUT_TEXT), "typing"); } - else - { - /* otherwise send the key to the box's editor */ - if (!x->gl_editor->e_textdirty) - { - canvas_setundo(x, canvas_undo_cut, - canvas_undo_set_cut(x, UCUT_TEXT), "typing"); - } - rtext_key(x->gl_editor->e_textedfor, - (int)keynum, gotkeysym); - if (x->gl_editor->e_textdirty) - canvas_dirty(x, 1); - } + rtext_key(x->gl_editor->e_textedfor, + (int)keynum, gotkeysym); + if (x->gl_editor->e_textdirty) + canvas_dirty(x, 1); } /* check for backspace or clear */ else if (keynum == 8 || keynum == 127) @@ -1873,12 +1859,13 @@ { canvas_vis(g2, 1); sys_vgui( -"pdtk_check {Discard changes to '%s'?} {.x%lx menuclose 3;\n} no\n", - canvas_getrootfor(g2)->gl_name->s_name, g2); +"pdtk_check .x%lx.c {Discard changes to '%s'?} {.x%lx menuclose 3;\n} no\n", + canvas_getrootfor(g2), canvas_getrootfor(g2)->gl_name->s_name, g2); return; } if (f == 0 && sys_perf) - sys_vgui("pdtk_check {really quit?} {pd quit;\n} yes\n"); + sys_vgui("pdtk_check .x%lx.c {really quit?} {pd quit;\n} yes\n", + canvas_getrootfor(g2)); else glob_quit(0); } @@ -1902,15 +1889,15 @@ { vmess(&g->gl_pd, gensym("menu-open"), ""); sys_vgui( -"pdtk_check {Discard changes to '%s'?} {.x%lx menuclose 2;\n} no\n", - canvas_getrootfor(g)->gl_name->s_name, g); +"pdtk_check .x%lx.c {Discard changes to '%s'?} {.x%lx menuclose 2;\n} no\n", + canvas_getrootfor(g), canvas_getrootfor(g)->gl_name->s_name, g); return; } else if (sys_perf) { sys_vgui( -"pdtk_check {Close '%s'?} {.x%lx menuclose 1;\n} yes\n", - canvas_getrootfor(x)->gl_name->s_name, x); +"pdtk_check .x%lx.c {Close '%s'?} {.x%lx menuclose 1;\n} yes\n", + canvas_getrootfor(x), canvas_getrootfor(x)->gl_name->s_name, x); } else pd_free(&x->gl_pd); } @@ -1926,8 +1913,8 @@ { vmess(&g->gl_pd, gensym("menu-open"), ""); sys_vgui( -"pdtk_check {Discard changes to '%s'?} {.x%lx menuclose 2;\n} no\n", - canvas_getrootfor(x)->gl_name->s_name, g); +"pdtk_check .x%lx.c {Discard changes to '%s'?} {.x%lx menuclose 2;\n} no\n", + canvas_getrootfor(x), canvas_getrootfor(x)->gl_name->s_name, g); return; } else pd_free(&x->gl_pd); @@ -2357,7 +2344,7 @@ static void canvas_duplicate(t_canvas *x) { - if (x->gl_editor->e_onmotion == MA_NONE) + if (x->gl_editor->e_onmotion == MA_NONE && x->gl_editor->e_selection) { t_selection *y; canvas_copy(x); @@ -2383,6 +2370,41 @@ } } +static void canvas_reselect(t_canvas *x) +{ + t_gobj *g, *gwas; + t_selection *sel; + t_object *ob; + /* if someone is text editing, and if only one object is + selected, deselect everyone and reselect. */ + if (x->gl_editor->e_textedfor) + { + /* only do this if exactly one item is selected. */ + if ((gwas = x->gl_editor->e_selection->sel_what) && + !x->gl_editor->e_selection->sel_next) + { + int nobjwas = glist_getindex(x, 0), + indx = canvas_getindex(x, x->gl_editor->e_selection->sel_what); + glist_noselect(x); + for (g = x->gl_list; g; g = g->g_next) + if (g == gwas) + { + glist_select(x, g); + return; + } + /* "gwas" must have disappeared; just search to the last + object and select it */ + for (g = x->gl_list; g; g = g->g_next) + if (!g->g_next) + glist_select(x, g); + } + } + else if (x->gl_editor->e_selection && + !x->gl_editor->e_selection->sel_next) + /* otherwise activate first item in selection */ + gobj_activate(x->gl_editor->e_selection->sel_what, x, 1); +} + extern t_class *text_class; void canvas_connect(t_canvas *x, t_floatarg fwhoout, t_floatarg foutno, @@ -2663,6 +2685,8 @@ gensym("duplicate"), A_NULL); class_addmethod(canvas_class, (t_method)canvas_selectall, gensym("selectall"), A_NULL); + class_addmethod(canvas_class, (t_method)canvas_reselect, + gensym("reselect"), A_NULL); class_addmethod(canvas_class, (t_method)canvas_undo, gensym("undo"), A_NULL); class_addmethod(canvas_class, (t_method)canvas_redo, Modified: trunk/pd/src/m_pd.h =================================================================== --- trunk/pd/src/m_pd.h 2008-12-30 01:53:20 UTC (rev 10470) +++ trunk/pd/src/m_pd.h 2009-01-02 19:40:36 UTC (rev 10471) @@ -11,7 +11,7 @@ #define PD_MAJOR_VERSION 0 #define PD_MINOR_VERSION 42 #define PD_BUGFIX_VERSION 0 -#define PD_TEST_VERSION "test8" +#define PD_TEST_VERSION "" /* old name for "MSW" flag -- we have to take it for the sake of many old "nmakefiles" for externs, which will define NT and not MSW */ Modified: trunk/pd/src/notes.txt =================================================================== --- trunk/pd/src/notes.txt 2008-12-30 01:53:20 UTC (rev 10470) +++ trunk/pd/src/notes.txt 2009-01-02 19:40:36 UTC (rev 10471) @@ -1,5 +1,4 @@ ---------------- dolist -------------------- -close patch with dirty GOP abstraction can't vis the abstraction to query test: compile on various versions of linux @@ -15,9 +14,8 @@ Gnome: why don't windows pop up when clicked on? problems: -saving as "x.pd" on mac writes to "x.pd.pd" -if .pdsettings asks for an alsa device out of range, dialog - comes up with empty list +get rid of remaining -export-dynamic in makefiles +saving as "x.pd" on mac writes to "x.pd.pd" (can't reproduce this.) find asdf$1 (e.g.) doesn't work check real-time gaps in writesf~ fix declare to update current patch when changed @@ -92,7 +90,6 @@ editing: pasting should look at current mouse location clickless connection (hit 'c' key? see Bouchard paper) - "enter" into object box to create new one (also, change border? forking?) tab to jump to a connected object (first one?) (shift-tab to back up?) arrow keys to shift connections left and right menu item to connect selected objects @@ -104,7 +101,7 @@ data: add -x [-n?] flag to drawnumbers flag to disable edits for arrays -make a 2-pass proecss for finding hot spot closes to any given click +make a 2-pass proecss for finding hot spot closest to any given click replace list element with binbuf?? hooks for table mousing, other changes (scalars?) data to save as succession of "list" messages that textfile can store, etc. Modified: trunk/pd/src/u_main.tk =================================================================== --- trunk/pd/src/u_main.tk 2008-12-30 01:53:20 UTC (rev 10470) +++ trunk/pd/src/u_main.tk 2009-01-02 19:40:36 UTC (rev 10471) @@ -282,9 +282,9 @@ } ##### routine to ask user if OK and, if so, send a message on to Pd ###### -proc pdtk_check {x message default} { - set answer [tk_messageBox \-message $x \-type yesno -default $default \ - -icon question] +proc pdtk_check {canvas x message default} { + set answer [tk_messageBox -message $x -type yesno -default $default \ + -parent $canvas -icon question] if {! [string compare $answer yes]} {pd $message} } @@ -333,9 +333,9 @@ ################## the "Open" menu command ######################### -proc menu_open {} { +proc menu_open {parent} { global pd_opendir - set filename [tk_getOpenFile -defaultextension .pd \ + set filename [tk_getOpenFile -defaultextension .pd -parent $parent\ -filetypes { {{pd files} {.pd}} {{max files} {.pat}}} \ -initialdir $pd_opendir] if {$filename != ""} {open_file $filename} @@ -383,6 +383,9 @@ ######### the "audio" menu command ############### proc menu_audio {flag} {pd [concat pd dsp $flag \;]} +######### the "reselect" menu command ################ +proc menu_reselect {name} {pd [concat $name reselect \;]} + ######### the "documentation" menu command ############### set doc_number 1 @@ -592,7 +595,7 @@ .mbar.file add command -label New -command {menu_new} \ -accelerator [accel_munge "Ctrl+n"] -.mbar.file add command -label Open -command {menu_open} \ +.mbar.file add command -label Open -command {menu_open .} \ -accelerator [accel_munge "Ctrl+o"] .mbar.file add separator .mbar.file add command -label Message -command {menu_send} \ @@ -947,7 +950,7 @@ $name.m.file add command -label New -command {menu_new} \ -accelerator [accel_munge "Ctrl+n"] - $name.m.file add command -label Open -command {menu_open} \ + $name.m.file add command -label Open -command [concat menu_open $name] \ -accelerator [accel_munge "Ctrl+o"] $name.m.file add separator @@ -1014,6 +1017,10 @@ -command [concat menu_selectall $name] \ -accelerator [accel_munge "Ctrl+a"] + $name.m.edit add command -label {Reselect} \ + -command [concat menu_reselect $name] \ + -accelerator "Ctrl+Enter" + $name.m.edit add separator $name.m.edit add command -label {Text Editor} \ @@ -1652,6 +1659,7 @@ if {$key == "5"} {menu_comment $topname 1} if {$key == "slash"} {menu_audio 1} if {$key == "period"} {menu_audio 0} + if {$key == "Return"} {menu_reselect $topname} if {$shift == 1} { if {$key == "q" || $key == "Q"} {menu_really_quit} if {$key == "w" || $key == "W"} {menu_really_close $topname} @@ -1672,7 +1680,7 @@ if {$key == "s" || $key == "S"} {menu_save $topname} if {$key == "z" || $key == "Z"} {menu_undo $topname} if {$key == "n" || $key == "N"} {menu_new} - if {$key == "o" || $key == "O"} {menu_open} + if {$key == "o" || $key == "O"} {menu_open $topname} if {$key == "m" || $key == "M"} {menu_send} if {$key == "w" || $key == "W"} {menu_close $topname} if {$key == "p" || $key == "P"} {menu_print $topname} @@ -1726,7 +1734,7 @@ proc pdtk_canvas_saveas {name initfile initdir} { global pd_nt set filename [tk_getSaveFile -initialfile $initfile \ - -initialdir $initdir -defaultextension .pd \ + -initialdir $initdir -defaultextension .pd -parent $name.c \ -filetypes { {{pd files} {.pd}} {{max files} {.pat}} }] if {$filename != ""} { @@ -3363,7 +3371,7 @@ # puts stderr [concat key $key shift $shift] # .dummy itemconfig goo -text [concat ---> control-key event $key]; if {$key == "n" || $key == "N"} {menu_new} - if {$key == "o" || $key == "O"} {menu_open} + if {$key == "o" || $key == "O"} {menu_open .} if {$key == "m" || $key == "M"} {menu_send} if {$key == "q" || $key == "Q"} { if {$shift == 1} {menu_really_quit} else {menu_quit} Modified: trunk/pd/src/x_gui.c =================================================================== --- trunk/pd/src/x_gui.c 2008-12-30 01:53:20 UTC (rev 10470) +++ trunk/pd/src/x_gui.c 2009-01-02 19:40:36 UTC (rev 10471) @@ -233,6 +233,7 @@ typedef struct _savepanel { t_object x_obj; + t_canvas *x_canvas; t_symbol *x_s; } t_savepanel; @@ -242,6 +243,7 @@ t_savepanel *x = (t_savepanel *)pd_new(savepanel_class); sprintf(buf, "d%lx", (t_int)x); x->x_s = gensym(buf); + x->x_canvas = canvas_getcurrent(); pd_bind(&x->x_obj.ob_pd, x->x_s); outlet_new(&x->x_obj, &s_symbol); return (x); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs January 2009