From 73df371302b0f6a37895928c7d1672efbe8dbad7 Mon Sep 17 00:00:00 2001 From: Ivica Ico Bukvic <ico@vt.edu> Date: Mon, 12 Aug 2013 11:14:59 -0400 Subject: [PATCH] removed unnecessary dealloc/realloc, updated/cleaned-up preset* help files --- pd/doc/5.reference/preset_hub-help.pd | 14 +++++++------- pd/doc/5.reference/preset_node-help.pd | 23 +++++++++++------------ pd/src/x_preset.c | 5 ----- 3 files changed, 18 insertions(+), 24 deletions(-) diff --git a/pd/doc/5.reference/preset_hub-help.pd b/pd/doc/5.reference/preset_hub-help.pd index 0fc3fbdb4..fedfb412c 100644 --- a/pd/doc/5.reference/preset_hub-help.pd +++ b/pd/doc/5.reference/preset_hub-help.pd @@ -41,9 +41,10 @@ to conform to the PDDP template for Pd version 0.42.; #X text 11 20 universal preset system for pd-l2ork; #X obj 20 202 preset_hub test %hidden% %node% 2 31 1 %preset% 1 problems %preset% 2 skidoo %preset% 3 nights %preset% 0 stooges %node% 1 33 -%preset% 0 aaa 32 1 %preset% 1 2.24 nlah 1 %preset% 2 1 2 3 4 %node% -2 39 0 %preset% 0 1 %preset% 1 5 %preset% 2 9 %node% 1 61 %preset% -0 22.1 %preset% 1 0.5 %preset% 2 3.14 %node% 1 59; +%preset% 0 aaa 32 1 %preset% 1 2.24 nlah 1 %preset% 2 1 2 3 4 %preset% +3 1 2 3 4 %node% 2 39 0 %preset% 0 1 %preset% 1 5 %preset% 2 9 %preset% +3 1337 %node% 1 61 %preset% 0 22.1 %preset% 1 0.5 %preset% 2 3.14 %node% +1 59 %preset% 0 999 %preset% 1 777 %preset% 2 555 %preset% 3 333; #X msg 80 125 store \$1; #X msg 80 74 recall \$1; #X msg 30 73 purge; @@ -61,7 +62,7 @@ to conform to the PDDP template for Pd version 0.42.; #X floatatom 447 166 5 0 0 0 - - -; #X obj 386 217 preset_hub another %hidden% %node% 1 32 %preset% 0 99 %preset% 1 65 %preset% 2 123 %preset% 3 0 %node% 2 39 2 %preset% 0 -19 %preset% 1 0.23 %preset% 2 999; +19 %preset% 1 0.23 %preset% 2 999 %preset% 3 0.01; #X obj 386 244 print hub_another_says; #X obj 20 268 hub_node_abs; #X obj 386 270 preset_node another; @@ -71,7 +72,7 @@ to conform to the PDDP template for Pd version 0.42.; #X msg 236 91 2.24 nlah 1; #X obj 188 157 print ----result----; #X msg 241 111 list 1 2 3 4; -#N canvas 444 419 404 229 sub 0; +#N canvas 778 51 404 229 sub 0; #X obj 237 69 preset_node test; #X floatatom 237 92 5 0 0 0 - - -; #X obj 113 69 preset_node another; @@ -110,7 +111,6 @@ of that patch's children (i.e. \, subpatches and abstractions).; #X msg 189 189 reset; #X msg 249 210 clearall \$1; #X floatatom 249 189 5 0 0 0 - - -; -#X obj 233 300 print middle_node; #X msg 232 244 set another; #X msg 311 244 set test; #X text 171 625 - OPTIONAL scope for this preset (defaults to null @@ -292,5 +292,5 @@ looking one level up.; #X connect 62 0 59 0; #X connect 63 0 59 0; #X connect 64 0 63 0; +#X connect 65 0 59 0; #X connect 66 0 59 0; -#X connect 67 0 59 0; diff --git a/pd/doc/5.reference/preset_node-help.pd b/pd/doc/5.reference/preset_node-help.pd index 3eb0b7ea7..3d89187f9 100644 --- a/pd/doc/5.reference/preset_node-help.pd +++ b/pd/doc/5.reference/preset_node-help.pd @@ -42,8 +42,8 @@ to conform to the PDDP template for Pd version 0.42.; #X obj 472 3 preset_node; #X obj 18 202 preset_hub test %hidden% %node% 1 25 %preset% 1 55.2 %preset% 2 21.4 %preset% 0 123 %node% 2 42 1 %preset% 0 zero %preset% -1 one %preset% 2 two %node% 1 45 %preset% 0 aaa 32 1 %preset% 1 2.24 -nlah 1 %preset% 2 1 2 3 4 %node% 2 51 0 %preset% 0 0 %preset% 1 1 %preset% +1 one %preset% 2 two %node% 1 44 %preset% 0 aaa 32 1 %preset% 1 2.24 +nlah 1 %preset% 2 1 2 3 4 %node% 2 50 0 %preset% 0 0 %preset% 1 1 %preset% 2 2; #X msg 78 74 store \$1; #X msg 78 124 recall \$1; @@ -71,12 +71,11 @@ nlah 1 %preset% 2 1 2 3 4 %node% 2 51 0 %preset% 0 0 %preset% 1 1 %preset% #X msg 448 184 clear \$1; #X floatatom 448 160 5 0 0 0 - - -; #X obj 387 217 preset_hub another %hidden% %node% 1 43 %preset% 0 -5.1 -%preset% 1 22 %preset% 2 1.001 %node% 2 51 2 %preset% 0 41 %preset% +%preset% 1 22 %preset% 2 1.001 %node% 2 50 2 %preset% 0 41 %preset% 1 101 %preset% 2 7.13; #X obj 387 244 print hub_another_says; #X obj 18 263 hub_node_abs; #X obj 387 270 preset_node another; -#X obj 231 295 print middle_node; #X obj 185 55 preset_node test; #X obj 185 139 list; #X msg 223 75 aaa 32 1; @@ -225,12 +224,12 @@ abstraction to read/write to/from arrays. For additional info see; #X connect 38 0 40 0; #X connect 39 0 38 0; #X connect 40 0 41 0; -#X connect 43 0 74 0; -#X connect 45 0 46 0; -#X connect 46 0 49 0; -#X connect 47 0 46 0; -#X connect 48 0 46 0; -#X connect 50 0 46 0; +#X connect 43 0 73 0; +#X connect 44 0 45 0; +#X connect 45 0 48 0; +#X connect 46 0 45 0; +#X connect 47 0 45 0; +#X connect 49 0 45 0; +#X connect 70 0 25 0; #X connect 71 0 25 0; -#X connect 72 0 25 0; -#X connect 86 0 25 0; +#X connect 85 0 25 0; diff --git a/pd/src/x_preset.c b/pd/src/x_preset.c index 2a14400e1..7fbcaa455 100644 --- a/pd/src/x_preset.c +++ b/pd/src/x_preset.c @@ -610,11 +610,6 @@ static void preset_node_set(t_preset_node *x, t_symbol *s, int argc, t_atom *arg { if(PH_DEBUG) fprintf(stderr,"preset_node_set %d\n", argc); - if (x->pn_hub_name->a_type == A_SYMBOL && x->pn_hub_name->a_w.w_symbol == &s_) - freebytes(x->pn_hub_name, sizeof(t_atom)); - - x->pn_hub_name = (t_atom *)getbytes(sizeof(t_atom)); - if (argc == 0) { x->pn_hub_name->a_type = A_SYMBOL; x->pn_hub_name->a_w.w_symbol = &s_; -- GitLab