Removed the multi file version of param

svn path=/trunk/externals/tof/; revision=12642

10 files changed, 10 insertions, 1204 deletions

diff --git a/src/folderpanel.c b/src/folderpanel.c
index 51d735b..e4a5a8f 100644
--- a/src/folderpanel.c
+++ b/src/folderpanel.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "m_pd.h"
-#include "g_canvas.h"
+//#include "g_canvas.h"
 
 // tk_chooseDirectory
 /*
diff --git a/src/get~.c b/src/get~.c
index 4d6356d..33e761e 100644
--- a/src/get~.c
+++ b/src/get~.c
@@ -68,7 +68,9 @@ static void get_tilde_free( t_get_tilde *x) {
 void *get_tilde_new(t_symbol* s)
 {
   t_get_tilde *x = (t_get_tilde *)pd_new(get_tilde_class);
-
+  
+count = count + 1;
+post("c:%i",count);
   
  if (gensym("") != s ) x->pg = putget_register(s,0);
  
diff --git a/src/param.c b/src/param.c
deleted file mode 100644
index 669b6f0..0000000
--- a/src/param.c
+++ /dev/null
@@ -1,318 +0,0 @@
-/*
- *      param.c
- *      
- *      Copyright 2009 Thomas O Fredericks <tom@hp>
- *      
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *      
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *      
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- *      MA 02110-1301, USA.
- */
-
-
-#include "param.h"
-
-extern int sys_noloadbang;
-
-static t_class *param_class;
-static t_class *param_inlet2_class;
-struct _paramClass_inlet2;
-
-typedef struct _paramClass {
-  t_object                  	x_obj;
-  struct _paramClass_inlet2     *inlet2;
-  t_param*						param;
-  int 							noloadbang;
-  t_symbol*						selector;
-  int							alloc;
-  int 							ac;
-  t_atom*						av;
-  int							gac;  // gui options count
-  t_atom*						gav;  // gui options
-  t_outlet*						outlet;
-  t_symbol*						receive;
-  t_symbol*						send;
-  t_symbol*						set_s;
-  int							nowaitforbang;
-  int							nopresets;
-} t_paramClass;
-
-typedef struct _paramClass_inlet2
-{
-  t_object       		 x_obj;
-  t_paramClass  		*p_owner;
-} t_paramClass_inlet2;
-
-
-
-static void paramClass_bang(t_paramClass *x)
-{
-	outlet_anything(x->outlet, x->selector, x->ac, x->av);
-	
-	if(x->selector != &s_bang ) tof_send_anything_prepend(x->send,x->selector,x->ac,x->av,x->set_s );
-   
-}
-
-static void paramClass_loadbang(t_paramClass *x)
-{
-    if (!sys_noloadbang && !x->noloadbang)
-        paramClass_bang(x);
-}
-
-static void paramClass_anything(t_paramClass *x, t_symbol *s, int ac, t_atom *av)
-{
- #ifdef PARAMDEBUG
-  post("RECEIVING SOMETHING");
- #endif
- if ( s == &s_bang || ac == 0 ) {
-		x->ac = 0;
-		x->selector = s;
-	} else {
-		if(ac > x->alloc) {	
-			x->av = resizebytes(x->av, x->alloc*sizeof(*(x->av)), 
-				(10 + ac)*sizeof(*(x->av)));
-			x->alloc = 10 + ac;
-		}
-		x->ac = ac;
-		x->selector = s;
-		tof_copy_atoms(av, x->av, ac);
-   }
-  
-  if (x->nowaitforbang) paramClass_bang(x);
-    
-}
-
-
-
-
-// SECOND INLET METHOD
-
-static void paramClass_inlet2_anything(t_paramClass_inlet2 *p, t_symbol *s, int ac, t_atom *av)
-{
-  paramClass_anything(p->p_owner, s,ac,av);
-}  
-
-// DECONSTRUCTOR
-
-static void paramClass_free(t_paramClass *x)
-{
-	
-	if(x->inlet2) pd_free((t_pd *)x->inlet2);
-
-    if (x->receive) pd_unbind(&x->x_obj.ob_pd, x->receive);
-
-	if (x->param) param_unregister(x->param);
-	
-	freebytes(x->gav, x->gac * sizeof(*(x->gav)));
-	
-	freebytes(x->av, x->alloc * sizeof(*(x->av)));
-    
-}
-
-// SPECIAL PARAM GET FUNCTION
-static void paramClass_get(t_paramClass *x, t_symbol** s, int* ac, t_atom** av) {
-	*s = x->selector;
-	*ac = x->ac;
-	*av = x->av;
-}
-
-// SPECIAL PARAM SAVE FUNCTION
-static void paramClass_save(t_paramClass *x, t_binbuf* bb,int f) {
-	
-	//post("save:%i",f);
-	
-	
-	// f = -1 for the main save file
-	// f => 0 if it is a preset
-	if ( f >= 0 && x->nopresets) return;
-	
-	//Put my data in binbuf
-	if ((x->selector != &s_bang)) {
-		int ac = x->ac + 2;
-		t_atom *av = getbytes(ac*sizeof(*av));	
-		tof_copy_atoms(x->av,av+2,x->ac);
-		SETSYMBOL(av, x->param->path);
-		SETSYMBOL(av+1, x->selector);
-		binbuf_add(bb, ac, av);
-		binbuf_addsemi(bb);
-		freebytes(av, ac*sizeof(*av));
-	}
-}
-
-// SPECIAL PARAM GUI FUNCTION
-static void paramClass_GUI(t_paramClass *x, int* ac, t_atom** av, t_symbol** send,t_symbol** receive) {
-	*ac = x->gac;
-	*av = x->gav;
-    *send = x->receive;
-    *receive = x->send;
-}
-
-/*
-// SPECIAL PARAM GUI FUNCTION
-static void paramClass_GUIUpdate(t_paramClass *x) {
-	if(x->selector != &s_bang ) tof_send_anything_prepend(x->send,x->selector,x->ac,x->av,x->set_s );
-}
-*/
-
-// CONSTRUCTOR
-static void* paramClass_new(t_symbol *s, int ac, t_atom *av)
-{
-	t_paramClass *x = (t_paramClass *)pd_new(param_class);
-  
-       
-	// GET THE CURRENT CANVAS
-	t_canvas* canvas=tof_get_canvas();
-  
-	// GET THE NAME
-	t_symbol* name = param_get_name(ac,av);
-  
-	if (!name) return NULL;
-	  
-	t_symbol* path = param_get_path(canvas,name);
-	t_symbol* root = tof_get_dollarzero(tof_get_root_canvas(canvas));
-	  
-	  
-	 //FIND THE GUI OPTIONS: /g
-	 int ac_temp = 0;
-	 t_atom* av_temp = NULL;
-	 
-	 tof_find_tagged_argument('/',gensym("/g"), ac-1, av+1,&ac_temp,&av_temp);
-	 x->gac = ac_temp;
-	 x->gav = getbytes(x->gac * sizeof(*(x->gav)));
-	 tof_copy_atoms(av_temp,x->gav,x->gac);	  
-	  
-	  // FIND THE NO LOADBANG TAG: /nlb
-	x->noloadbang = tof_find_tag('/',gensym("/nlb"), ac-1, av+1);
-	  //post("nlb: %i",x->noloadbang);
-	  
-	  
-	  
-	  // FIND THE WAIT FOR BANG TAG: /wfb
-	  x->nowaitforbang = !(tof_find_tag('/',gensym("/wfb"), ac-1, av+1));
-	    // FIND THE NO SAVE TAG: /ns
-	int nosave = tof_find_tag('/',gensym("/ns"), ac-1, av+1);
-	  //post("ns: %i",nosave);
-	  
-	   // FIND THE NO PRESET TAG: /nps
-	  x->nopresets = tof_find_tag('/',gensym("/nps"), ac-1, av+1);
-	  
-	  
-	  // REGISTER PARAM
-	 t_paramSaveMethod paramSaveMethod = NULL;
-	 t_paramGUIMethod paramGUIMethod = NULL;
-	 
-	 
-	 //post("no save:%i",nosave);
-	 
-	if ( x->gac > 0 ) paramGUIMethod = (t_paramGUIMethod) paramClass_GUI;
-	if ( nosave == 0 ) paramSaveMethod = (t_paramSaveMethod) paramClass_save;
-		
-	x->param = param_register(x,root,path, \
-	(t_paramGetMethod) paramClass_get, \
-	paramSaveMethod, \
-	paramGUIMethod);
-  
-	if (!x->param) return NULL;
-	 
-	// FIND PARAM VALUE
-	// A. In canvas' arguments
-	// B. In object's arguments
-	// C. Defaults to a bang
-
-	int ac_p = 0;
-	t_atom* av_p = NULL;
-
-		  
-	// A. In canvas' arguments
-	int ac_c = 0;
-	t_atom* av_c = NULL;
-
-	t_canvas * before = tof_get_canvas_before_root(canvas);
-	tof_get_canvas_arguments(before,&ac_c , &av_c);
-	tof_find_tagged_argument('/',name, ac_c, av_c,&ac_p,&av_p);
-
-	// B. I object's arguments
-	if ( ac_p == 0  && ac > 1) {
-	int ac_a = 0;
-	t_atom* av_a = NULL;
-	tof_find_tagged_argument('/',name, ac, av,&ac_p,&av_p);
-	//tof_get_tagged_argument('/',ac,av,&start,&count);
-	//if (count > 1) {
-	//	ac_p = ac_a;
-	//	av_p = av_a + 1;
-	//}
-	}
-		  
-
-	  
-	  int l = strlen(path->s_name) + strlen(root->s_name) + 2;
-	  char* receiver = getbytes( l * sizeof(*receiver));
-	  strcat(receiver,root->s_name);
-	  strcat(receiver,path->s_name);
-	  x->receive = gensym(receiver);
-	  strcat(receiver,"_");
-	  x->send = gensym(receiver);
-	  freebytes(receiver,  l * sizeof(*receiver));
-	  #ifdef PARAMDEBUG
-			post("receive:%s",x->receive->s_name);
-			post("send:%s",x->send->s_name);
-	  #endif
-	  
-	  
-	  // BIND RECEIVER
-  	  pd_bind(&x->x_obj.ob_pd, x->receive );
-	  
-	  
-	  // Create memory space
-	  t_symbol* selector;
-	  tof_set_selector(&selector,&ac_p,&av_p);
-	  x->selector = selector;
-	  x->alloc = ac_p + 10;
-	  x->ac = ac_p;
-	  x->av = getbytes(x->alloc * sizeof(*(x->av)));
-	  tof_copy_atoms(av_p, x->av, x->ac);	  
-	  
-     
-    
-	x->set_s = gensym("set");
-  
-  // Set up second inlet proxy
-  t_paramClass_inlet2 *p = (t_paramClass_inlet2 *)pd_new(param_inlet2_class);
-  x->inlet2 = p;
-  p->p_owner = x;
-  
-   // CREATE INLETS AND OUTLETS
-      inlet_new((t_object *)x, (t_pd *)p, 0, 0);
-      x->outlet = outlet_new(&x->x_obj, &s_list);
-  
-  return (x);
-}
-
-void param_setup(void)
-{
-  param_class = class_new(gensym("param"),
-    (t_newmethod)paramClass_new, (t_method)paramClass_free,
-    sizeof(t_paramClass), 0, A_GIMME, 0);
-
-
-  class_addanything(param_class, paramClass_anything);
-  class_addbang(param_class, paramClass_bang);
-  
-  class_addmethod(param_class, (t_method)paramClass_loadbang, gensym("loadbang"), 0);
-  
-  param_inlet2_class = class_new(gensym("_param_inlet2"),
-    0, 0, sizeof(t_paramClass_inlet2), CLASS_PD | CLASS_NOINLET, 0);
-	
-  class_addanything(param_inlet2_class, paramClass_inlet2_anything);
-  
-}
diff --git a/src/paramCustom.c b/src/paramCustom.c
deleted file mode 100644
index 4f6c9c2..0000000
--- a/src/paramCustom.c
+++ /dev/null
@@ -1,203 +0,0 @@
-
-
-#include "tof.h"
-#include "param.h"
-
-static t_class *paramCustom_class;
-static t_class *paramCustom_receive_class;
-struct _paramCustom_receive;
-
-typedef struct _paramCustom {
-  t_object                  	x_obj;
-  t_param*						param;
-  t_outlet*						outlet;
-  t_outlet*						outlet2;
-  t_binbuf*						bb;
-  t_symbol*						receive;
-  struct _paramCustom_receive*  r;
-  int 							nopresets;
-} t_paramCustom;
-
-typedef struct _paramCustom_receive
-{
-  t_object       		 x_obj;
-  t_paramCustom 		*owner;
-} t_paramCustom_receive;
-
-
-
-static void paramCustom_bang(t_paramCustom *x)
-{
-	/*
-	outlet_anything(x->outlet, x->selector, x->ac, x->av);
-	
-	if(x->selector != &s_bang ) tof_send_anything_prepend(x->send,x->selector,x->ac,x->av,x->set_s );
-   */
-}
-/*
-
-static void paramClass_loadbang(t_paramClass *x)
-{
-    if (!sys_noloadbang && !x->noloadbang)
-        paramClass_bang(x);
-}
-*/
-
-static void paramCustom_anything(t_paramCustom *x, t_symbol *selector, int argc, t_atom *argv)
-{
-	if (x->bb) {
-		if ((selector != &s_bang)) {
-			int ac = argc + 2;
-			t_atom *av = getbytes(ac*sizeof(*av));	
-			tof_copy_atoms(argv,av+2,argc);
-			SETSYMBOL(av, x->param->path);
-			SETSYMBOL(av+1, selector);
-			binbuf_add(x->bb, ac, av);
-			binbuf_addsemi(x->bb);
-			freebytes(av, ac*sizeof(*av));
-		}
-	} else {
-		pd_error(x,"No save triggered");
-	}
-}
-
-
-
-
-// DECONSTRUCTOR
-
-static void paramCustom_free(t_paramCustom *x)
-{
-	
-	if (x->receive)  pd_unbind(&x->r->x_obj.ob_pd, x->receive);
-
-	if (x->param) param_unregister(x->param);
-	
-    
-}
-
-// SPECIAL PARAM GET FUNCTION
-/*
-static void paramClass_get(t_paramClass *x, t_symbol** s, int* ac, t_atom** av) {
-	*s = x->selector;
-	*ac = x->ac;
-	*av = x->av;
-}
-*/
-
-// SPECIAL PARAM SAVE FUNCTION
-static void paramCustom_save(t_paramCustom *x, t_binbuf* bb, int f) {
-	
-	// f = -1 for the main save file
-	// f => 0 if it is a preset
-	if ( f >= 0 && x->nopresets) return;
-	
-	
-	if ( !x->bb ) {
-	
-	x->bb = bb;
-	// TRIGGER OUTPUT
-	outlet_bang(x->outlet);
-	x->bb = NULL;
-	
-	} else {
-		pd_error(x,"paramCustom is already saving");
-	}
-	
-}
-
-
-
-static void paramCustom_receive_anything(t_paramCustom_receive *r, t_symbol *s, int ac, t_atom *av){
-	
-	outlet_anything(r->owner->outlet2,s,ac,av);
-	
-	
-}
-
-
-
-// CONSTRUCTOR
-static void* paramCustom_new(t_symbol *s, int ac, t_atom *av)
-{
-	t_paramCustom *x = (t_paramCustom *)pd_new(paramCustom_class);
-  
-       
-	// GET THE CURRENT CANVAS
-	t_canvas* canvas=tof_get_canvas();
-  
-	// GET THE NAME
-	t_symbol* name = param_get_name(ac,av);
-  
-	if (!name) return NULL;
-	  
-	t_symbol* path = param_get_path(canvas,name);
-	t_symbol* root = tof_get_dollarzero(tof_get_root_canvas(canvas));
-	  
-	  // FIND THE NO PRESET TAG: /nps
-	 x->nopresets = tof_find_tag('/',gensym("/nps"), ac-1, av+1);
-	  
-	  
-
-	x->param = param_register(x,root,path, NULL,\
-	(t_paramSaveMethod) paramCustom_save,NULL);
-	  
-	if (!x->param) return NULL;
-	 
-		
-	  
-	  int l = strlen(path->s_name) + strlen(root->s_name) + 2;
-	  char* receiver = getbytes( l * sizeof(*receiver));
-	  strcat(receiver,root->s_name);
-	  strcat(receiver,path->s_name);
-	  x->receive = gensym(receiver);
-	  //strcat(receiver,"_");
-	 // x->send = gensym(receiver);
-	  freebytes(receiver,  l * sizeof(*receiver));
-	  
-	  #ifdef PARAMDEBUG
-			post("receive:%s",x->receive->s_name);
-			//post("send:%s",x->send->s_name);
-	  #endif
-	  
-	  
-	  x->bb = NULL;
-	  
-	  
-	   // Set up receive proxy
-		t_paramCustom_receive *r = (t_paramCustom_receive *)pd_new(paramCustom_receive_class);
-		x->r = r;
-		r->owner = x;
-	  
-		// BIND RECEIVER
-		pd_bind(&r->x_obj.ob_pd, x->receive );
-	  
-	  
-
-  
-	// CREATE INLETS AND OUTLETS
-      //inlet_new((t_object *)x, (t_pd *)p, 0, 0);
-      x->outlet = outlet_new(&x->x_obj, &s_list);
-	  x->outlet2 = outlet_new(&x->x_obj, &s_list);
-  
-  return (x);
-}
-
-void paramCustom_setup(void)
-{
-  paramCustom_class = class_new(gensym("paramCustom"),
-    (t_newmethod)paramCustom_new, (t_method)paramCustom_free,
-    sizeof(t_paramCustom), 0, A_GIMME, 0);
-
-
-  class_addanything(paramCustom_class, paramCustom_anything);
-  class_addbang(paramCustom_class, paramCustom_bang);
-  
-  //class_addmethod(param_class, (t_method)paramClass_loadbang, gensym("loadbang"), 0);
-  
-  paramCustom_receive_class = class_new(gensym("_paramCustom_receive"),
-    0, 0, sizeof(t_paramCustom_receive), CLASS_PD | CLASS_NOINLET, 0);
-	
-  class_addanything(paramCustom_receive_class, paramCustom_receive_anything);
-  
-}
diff --git a/src/paramDump.c b/src/paramDump.c
deleted file mode 100644
index 2d488f8..0000000
--- a/src/paramDump.c
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- *      paramDump.c
- *      
- *      Copyright 2009 Thomas O Fredericks <tom@hp>
- *      
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *      
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *      
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- *      MA 02110-1301, USA.
- */
-
-
-#include "tof.h"
-#include "param.h"
-
-
-static t_class *paramDump_class;
- 
-
-typedef struct _paramDump
-{
-  t_object                  x_obj;
-  t_outlet*			        outlet;
-  t_symbol*					empty_s;
-  t_symbol*					root;
-
-} t_paramDump;
-
-/*
-static void paramDump_updateguis(t_paramDump *x, t_symbol* s) {
-	
-	t_param* p = get_param_list(x->root);
-	int ac;
-	t_atom* av;
-	
-	if ( s == x->empty_s ) {
-		while (p) {
-			if (p->GUIUpdate) {
-				p->GUIUpdate(p->x);
-			}
-		p = p->next;
-		}
-	} else {
-		int length = strlen(s->s_name);
-		while (p) {
-			if (p->GUIUpdate && (strncmp(p->path->s_name,s->s_name,length)==0) ) {
-				p->GUIUpdate(p->x);
-				
-			}
-		p = p->next;
-		}
-	}
-		
-}
-*/
-static void paramDump_guis(t_paramDump *x, t_symbol* s) {
-	
-	t_param* p = get_param_list(x->root);
-	int ac;
-	t_atom* av;
-    t_symbol* send;
-     t_symbol* receive;
-	
-	if ( s == x->empty_s ) {
-		while (p) {
-			if (p->GUI ) {
-				p->GUI(p->x,&ac,&av,&send,&receive);
-				outlet_anything(x->outlet,p->path,ac,av);
-				
-			}
-		p = p->next;
-		}
-	} else {
-		int length = strlen(s->s_name);
-		while (p) {
-			if (p->GUI && (strncmp(p->path->s_name,s->s_name,length)==0) ) {
-				p->GUI(p->x,&ac,&av,&send,&receive);
-				outlet_anything(x->outlet,p->path,ac,av);
-				
-			}
-		p = p->next;
-		}
-	}
-		
-}
-
-
-static void paramDump_symbol(t_paramDump *x, t_symbol* s) {
-	
-	t_param* p = get_param_list(x->root);
-	#ifdef PARAMDEBUG
-	if (p == NULL) {
-		post("No params found");
-	} else {
-		post("Found params");
-	}
-	#endif
-	
-	t_symbol* selector;
-	int ac;
-	t_atom* av;
-	
-	
-	
-	int length = strlen(s->s_name);
-	
-	while (p) {
-		if ( p->get && (strncmp(p->path->s_name,s->s_name,length)==0) ) {
-			p->get(p->x, &selector, &ac, &av);
-			tof_outlet_anything_prepend(x->outlet,selector,ac,av,p->path);
-		}
-		p = p->next;
-	}
-    
-}
-
-// Dump out
-static void paramDump_bang(t_paramDump *x) {
-	
-	t_param* p = get_param_list(x->root);
-	#ifdef PARAMDEBUG
-	if (p == NULL) {
-		post("No params found");
-	} else {
-		post("Found params");
-	}
-	#endif
-	
-	t_symbol* selector;
-	int ac;
-	t_atom* av;
-	
-	
-	while (p) {
-		if ( p->get ) {
-			p->get(p->x, &selector, &ac, &av);
-			tof_outlet_anything_prepend(x->outlet,selector,ac,av,p->path);
-		}
-		p = p->next;
-	}
-	
-    
-}
-
-
-
-static void paramDump_free(t_paramDump *x)
-{
-	
-	
-}
-
-
-static void *paramDump_new(t_symbol *s, int ac, t_atom *av) {
-  t_paramDump *x = (t_paramDump *)pd_new(paramDump_class);
-  
-  x->root = tof_get_dollarzero(tof_get_root_canvas(tof_get_canvas()));
-  x->empty_s = gensym("");
-  
-    //x->s_set = gensym("set");
-	
-    x->outlet = outlet_new(&x->x_obj, &s_list);
-    
-  return (x);
-}
-
-void paramDump_setup(void) {
-  paramDump_class = class_new(gensym("paramDump"),
-    (t_newmethod)paramDump_new, (t_method)paramDump_free,
-    sizeof(t_paramDump), 0, A_GIMME, 0);
-
- class_addbang(paramDump_class, paramDump_bang);
- class_addsymbol(paramDump_class, paramDump_symbol);
-
- //class_addmethod(paramDump_class, (t_method) paramDump_values, gensym("values"), A_DEFSYMBOL,0);
- 
- class_addmethod(paramDump_class, (t_method) paramDump_guis, gensym("guis"), A_DEFSYMBOL,0);
- //class_addmethod(paramDump_class, (t_method) paramDump_updateguis, gensym("updateguis"), A_DEFSYMBOL,0);
-
- 
- //class_addmethod(paramDump_class, (t_method) paramDump_update_guis, gensym("update"), A_DEFSYMBOL,0);
-
-}
diff --git a/src/paramFile.c b/src/paramFile.c
deleted file mode 100644
index ed7eaeb..0000000
--- a/src/paramFile.c
+++ /dev/null
@@ -1,273 +0,0 @@
-
-#include "tof.h"
-#include "param.h"
-#include <stdio.h>
-#include <fcntl.h>
-
-
-
-static t_class *paramFile_class;
-static t_class *paramFile_inlet2_class;
-struct _paramFile_inlet2;
-
-typedef struct _paramFile
-{
-  t_object                    	x_obj;
-  t_canvas			          	*canvas;
-  t_symbol*						basename;
-  t_symbol*						root;
-  struct _paramFile_inlet2	   *inlet2;
-  int 							working;
-} t_paramFile;
-
-
-typedef struct _paramFile_inlet2 {
-	t_object                    x_obj;
-	t_paramFile					*x;
-} t_paramFile_inlet2;
-
-static t_symbol* paramFile_makefilename(t_paramFile* x, t_float f) {
-	t_symbol* filename;
-	
-	int i = (int) f;
-	
-	if (i<0) {
-		int length = strlen(x->basename->s_name)+7;
-		char* buf = getbytes( length * sizeof (*buf));	
-		sprintf(buf,"%s.param",x->basename->s_name);
-		filename = gensym(buf);
-		freebytes(buf, length * sizeof (*buf));
-	} else {
-		int length = strlen(x->basename->s_name)+11;
-		char* buf = getbytes( length * sizeof (*buf));	
-		sprintf(buf,"%s-%03d.param",x->basename->s_name,i);
-		filename = gensym(buf);
-		freebytes(buf, length * sizeof (*buf));
-	}
-	return filename;
-}
-
-static void paramFile_do_save(t_paramFile* x, t_float f) {
-	
-	
-	
-	if ( x->working ) {
-		pd_error(x,"paramFile can only save or load to one file at a time");
-		return;
-	}
-	t_symbol* filename = paramFile_makefilename(x,f);
-	
-	x->working = 1;
-	
-	
-	post("Writing: %s",filename->s_name);
-	
-	int w_error;
-			
-	t_binbuf *bbuf = binbuf_new();
-	
-	t_param *p = get_param_list(x->root);
-	
-	while(p) {
-		
-		if ( p->save ) p->save(p->x,bbuf,f);
-		
-		p = p->next;
-	}
-	
-	
-    char buf[MAXPDSTRING];
-    canvas_makefilename(x->canvas, filename->s_name,buf, MAXPDSTRING);
-		
-	
-    w_error = (binbuf_write(bbuf, buf, "", 0));
- 
-			
-	binbuf_free(bbuf);
-	
-	if (w_error) pd_error(x,"%s: write failed", filename->s_name);
-	
-	x->working = 0;
-	
-}
-
-
-
-
-
-static void paramFile_do_load(t_paramFile* x, t_float f) {
-	
-		if ( x->working ) {
-		pd_error(x,"paramFile can only save or load to one file at a time");
-		return;
-	}
-	x->working = 1;
-	
-	t_symbol* filename = paramFile_makefilename(x,f);
-	post("Reading: %s",filename->s_name);
-	
-	int r_error;
-	
-	//t_symbol* filename = param_makefilename(basename, n);
-	
-	t_binbuf *bbuf = binbuf_new();
-	
-    r_error= (binbuf_read_via_canvas(bbuf, filename->s_name, x->canvas, 0));
-            //pd_error(x, "%s: read failed", filename->s_name);
-			
-    t_symbol* root = x->root;
-	
-	int bb_ac = binbuf_getnatom(bbuf);
-	int ac = 0;
-    t_atom *bb_av = binbuf_getvec(bbuf);
-    t_atom *av = bb_av;
-	
-	  while (bb_ac--) {
-		if (bb_av->a_type == A_SEMI) {
-			if ( IS_A_SYMBOL(av,0) && ac > 1) {
-				t_symbol* path = atom_getsymbol(av);
-				strcpy(param_buf_temp_a,root->s_name);
-				strcat(param_buf_temp_a,path->s_name);
-			   t_symbol* s = gensym(param_buf_temp_a);
-			   #ifdef PARAMDEBUG
-				post("Restoring:%s",s->s_name);
-			   #endif
-			   
-			   // STUPID SYMBOL WITH SPACES MANAGEMENT
-			   if ( s->s_thing && ac > 3 && IS_A_SYMBOL(av,1) &&  atom_getsymbol(av+1) == &s_symbol) {
-				   // This whole block is simply to convert symbols saved with spaces to complete symbols
-				   
-				   t_binbuf *bbuf_stupid = binbuf_new();
-				   binbuf_add(bbuf_stupid, ac-2, av+2);
-				   
-				   char *char_buf;
-				   int char_length;
-				   binbuf_gettext(bbuf_stupid, &char_buf, &char_length);
-				   char_buf = resizebytes(char_buf, char_length, char_length+1);
-				   char_buf[char_length] = 0;
-				   t_symbol* stupid_symbol = gensym(char_buf);
-				   //post("STUPID: %s",stupid_symbol->s_name);
-				   freebytes(char_buf, char_length+1);
-				   binbuf_free(bbuf_stupid);
-				   t_atom* stupid_atom = getbytes(sizeof(*stupid_atom));
-				   SETSYMBOL(stupid_atom, stupid_symbol);
-				   pd_typedmess(s->s_thing, &s_symbol, 1, stupid_atom);
-				   freebytes(stupid_atom, sizeof(*stupid_atom));
-				   
-			   } else {
-					if ( s->s_thing) pd_forwardmess(s->s_thing, ac-1, av+1);
-				}
-		    }
-		  
-		  ac = 0;
-		  av = bb_av + 1;
-		} else {
-		  
-		  ac = ac + 1;
-		}
-		bb_av++;
-	  }
-	
-	binbuf_free(bbuf);
-	
-	if ( r_error) pd_error(x, "%s: read failed", filename->s_name);
-	
-	x->working = 0;
-	
-}
-
-
-
-
-
-static void paramFile_bang(t_paramFile *x) {
-	
-	paramFile_do_save(x,-1);	
-}
-
-
-static void paramFile_float(t_paramFile *x, t_float f) {
-	
-	if (f < 0 || f > 999 ) {
-		pd_error(x,"paramFile preset number must be between 0 and 999");
-		return;
-	}
-	
-	paramFile_do_save(x,f);
-		
-}
-
-
-static void paramFile_inlet2_bang(t_paramFile_inlet2 *inlet2) {
-	
-	paramFile_do_load(inlet2->x,-1);
-	
-}
-
-static void paramFile_inlet2_float(t_paramFile_inlet2 *inlet2,t_float f) {
-	
-	if (f < 0 || f > 999 ) {
-		pd_error(inlet2->x,"paramFile preset number must be between 0 and 999");
-		return;
-	}
-	
-	paramFile_do_load(inlet2->x,f);
-	
-}
-
-static void paramFile_free(t_paramFile *x)
-{
-	
-	if(x->inlet2) pd_free((t_pd *)x->inlet2);
-	
- 
-}
-
-
-static void* paramFile_new(t_symbol *s, int ac, t_atom *av) {
-  t_paramFile *x = (t_paramFile *)pd_new(paramFile_class);
-  t_paramFile_inlet2 *inlet2 = (t_paramFile_inlet2 *)pd_new(paramFile_inlet2_class);
-  
-  inlet2->x = x;
-  x->inlet2 = inlet2;
-  
-  t_canvas* canvas = tof_get_canvas();
-  x->canvas = tof_get_root_canvas(canvas);
-  t_symbol* canvasname = tof_get_canvas_name(x->canvas);
-  
-  // remove the .pd (actually removes everything after the .)
-  x->basename = tof_remove_extension(canvasname);
-  
-  x->working = 0;
-  
-  x->root = tof_get_dollarzero(x->canvas);
-  
-   //x->outlet = outlet_new(&x->x_obj, &s_list);
-   
-   inlet_new((t_object *)x, (t_pd *)inlet2, 0, 0);
-   
-  return (x);
-  
-}
-
-
-void paramFile_setup(void) {
-  paramFile_class = class_new(gensym("paramFile"),
-    (t_newmethod)paramFile_new, (t_method)paramFile_free,
-    sizeof(t_paramFile), 0, A_GIMME, 0);
-  
- class_addbang(paramFile_class, paramFile_bang);
- class_addfloat(paramFile_class, paramFile_float);
- 
- paramFile_inlet2_class = class_new(gensym("paramFile_inlet2"),
-    0, 0, sizeof(t_paramFile_inlet2), CLASS_PD | CLASS_NOINLET, 0);
- 
- class_addbang(paramFile_inlet2_class, paramFile_inlet2_bang);
- class_addfloat(paramFile_inlet2_class, paramFile_inlet2_float);
- 
- //class_addmethod(paramFile_class, (t_method) paramFile_load, gensym("load"), A_DEFFLOAT,0);
- //class_addmethod(paramFile_class, (t_method) paramFile_float, gensym("save"), A_DEFFLOAT,0);
- 
-}
-
-
diff --git a/src/paramId.c b/src/paramId.c
deleted file mode 100644
index fbd3d29..0000000
--- a/src/paramId.c
+++ /dev/null
@@ -1,77 +0,0 @@
-
-/*
- *      paramId.c
- *      
- *      Copyright 2009 Thomas O Fredericks <tom@hp>
- *      
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *      
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *      
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- *      MA 02110-1301, USA.
- */
-
-
-#include "tof.h"
-#include "param.h"
-
-
-static t_class *paramId_class;
- 
-
-typedef struct _paramId
-{
-  t_object                    x_obj;
-  t_outlet*			          outlet;
-  t_symbol*						path;
-  //t_symbol*					root;
-} t_paramId;
-
-
-
-// Dump out everything (OR THE ID'S OR JUST THE NAMES?)
-static void paramId_bang(t_paramId *x) {
-	
-	outlet_symbol(x->outlet,x->path);
-	
-    
-}
-
-
-
-static void paramId_free(t_paramId *x)
-{
-	
-	
-}
-
-
-static void *paramId_new(t_symbol *s, int ac, t_atom *av) {
-  t_paramId *x = (t_paramId *)pd_new(paramId_class);
-  
-  //x->root = tof_get_dollarzero(tof_get_root_canvas(tof_get_canvas()));
-   t_canvas* canvas = tof_get_canvas();
-	x->path = param_get_path(canvas,NULL);
-	
-    x->outlet = outlet_new(&x->x_obj, &s_list);
-    
-  return (x);
-}
-
-void paramId_setup(void) {
-  paramId_class = class_new(gensym("paramId"),
-    (t_newmethod)paramId_new, (t_method)paramId_free,
-    sizeof(t_paramId), 0, A_GIMME, 0);
-
- class_addbang(paramId_class, paramId_bang);
- 
-}
diff --git a/src/paramRoute.c b/src/paramRoute.c
deleted file mode 100644
index 92628b1..0000000
--- a/src/paramRoute.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- *      paramRoute.c
- *      
- *      Copyright 2009 Thomas O Fredericks <tom@hp>
- *      
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *      
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *      
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- *      MA 02110-1301, USA.
- */
-
-
-
-
-#include "tof.h"
-#include "param.h"
-
-
-static t_class *paramRoute_class;
-
-typedef struct _paramRoute
-{
-  t_object                    x_obj;
-  t_symbol                    *path;
-  t_outlet					  *x_outlet;
-  t_symbol 					*s_save;
-  t_symbol 					*s_load;
-  t_symbol*					s_empty;
-  t_canvas*					canvas;
-  t_symbol*					root;
- 
-} t_paramRoute;
-
-
-static void paramRoute_anything(t_paramRoute *x, t_symbol *s, int ac, t_atom *av) { 
-  
-  //I DEACTIVATED THE SAVE & LOAD FEATURES UNTIL I BETTER DEFINE PARAMROUTE'S STATE SAVING
-  
-  if (s == x->s_save) { // Save
-  
-	//~ if (x->id) {
-      //~ int n = 0;
-	  //~ if ( ac  ) n = atom_getfloat(av);
-	  //~ t_symbol* filename = paramRoute_makefilename(x->id,n);
-	  //~ if ( param_write(x->canvas,filename, x->id) ) 
-		//~ pd_error("[paramRoute] could not write %s",filename->s_name);
-	//~ } else {
-		//~ pd_error(x,"[paramRoute] requires an /id");
-	//~ }
-  } else if ( s == x->s_load) { // Load
-	//~ if (x->id) {
-	  //~ int n = 0;
-	  //~ if ( ac  ) n = atom_getfloat(av);
-	  //~ t_symbol* filename = paramRoute_makefilename(x->id,n);
-	  //~ if ( param_read(x->canvas,  paramRoute_makefilename(x->id,n)) )
-		//~ pd_error("[paramRoute] could not read %s",filename->s_name);;
-	//~ } else {
-		//~ pd_error(x,"[paramRoute] requires an /id");
-	//~ }
-  } else { // Try to send
-	  
-	  if (ac) {
-		//int sendBufLength = strlen(x->path->s_name) + strlen(s->s_name) + 1;
-		//char *sendBuf = (char*)getbytes((sendBufLength)*sizeof(char));
-	   if ( s->s_name[0] == '/' && strlen(s->s_name) > 1) {
-	    strcpy(param_buf_temp_a, x->root->s_name);
-		strcpy(param_buf_temp_b, x->path->s_name);
-		
-		strcat(param_buf_temp_b, s->s_name+1);
-		t_symbol* path = gensym(param_buf_temp_b);
-		strcat(param_buf_temp_a, param_buf_temp_b);
-		t_symbol* target = gensym(param_buf_temp_a);
-		//freebytes(sendBuf, (sendBufLength)*sizeof(char));
-		//post("target:%s",target->s_name);
-		if (target->s_thing) {
-			pd_forwardmess(target->s_thing, ac, av);
-		   } else {
-			 outlet_anything(x->x_outlet,path,ac,av);
-		   }
-		} else {
-			pd_error(x,"Target name must start with a \"/\"");
-		}
-	  }
-	
-	  }
-	
-}
-
-// DECONSTRUCTOR
-static void paramRoute_free(t_paramRoute*x)
-{
-	
-}
-
-// CONSTRUCTOR
-static void *paramRoute_new(t_symbol *s, int ac, t_atom *av) {
- t_paramRoute *x = (t_paramRoute *)pd_new(paramRoute_class);
-
-     x->s_save = gensym("save");
-	 x->s_load = gensym("load");
-     x->s_empty = gensym("");
-
-	
-	// GET THE CURRENT CANVAS
-    t_canvas *canvas=tof_get_canvas();
-   
-   // Get the root  canvas
-   x->canvas = tof_get_root_canvas(canvas);
-   
-   x->root = tof_get_dollarzero(x->canvas);
-   
-   x->path = param_get_path(canvas,NULL);
-   
-    // INLETS AND OUTLETS
-    x->x_outlet = outlet_new(&x->x_obj, &s_list);
-  return (x);
-}
-
-void paramRoute_setup(void) {
-  paramRoute_class = class_new(gensym("paramRoute"),
-    (t_newmethod)paramRoute_new, (t_method)paramRoute_free,
-    sizeof(t_paramRoute), 0, A_GIMME, 0);
-
- class_addanything(paramRoute_class, paramRoute_anything);
- 
-}
diff --git a/src/putget~.h b/src/putget~.h
index e585791..a796653 100644
--- a/src/putget~.h
+++ b/src/putget~.h
@@ -22,11 +22,14 @@ struct putget {
     struct putget* 	previous; 
 	t_clock*		clock;
 	int 			armed;
+    
 };
 
 
 struct putget* PUTGETS;
 
+int count = 42;
+
 // This should be triggered by the clock
 static void putget_swap(struct putget* pg) {
 	//post("clock");
diff --git a/src/put~.c b/src/put~.c
index 9074888..0eb5415 100644
--- a/src/put~.c
+++ b/src/put~.c
@@ -68,8 +68,9 @@ static void *put_tilde_new(t_symbol* s)
   t_put_tilde *x = (t_put_tilde *)pd_new(put_tilde_class);
 
   if (gensym("") != s ) x->pg = putget_register(s,1);
-
-
+ 
+ count = count + 1;
+post("c:%i",count);
   return (void *)x;
 }