replacing the old param with the new param

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

1 files changed, 78 insertions, 276 deletions

diff --git a/src/param.h b/src/param.h
index 92a34e8..a6f9686 100644
--- a/src/param.h
+++ b/src/param.h
@@ -1,5 +1,8 @@
 //#define PARAMDEBUG
-#include <stdio.h>
+
+typedef void (*t_paramGetMethod)(void*,t_symbol**,int*,t_atom**);
+typedef void (*t_paramSaveMethod)(void*,t_binbuf*);
+typedef void (*t_paramGUIMethod)(void*,int*,t_atom**);
 
 char param_buf_temp_a[MAXPDSTRING];
 char param_buf_temp_b[MAXPDSTRING];
@@ -7,65 +10,34 @@ char* param_separator = "/";
 
 //char PARAMECHO = 0;
 
-
-struct param {
-   
-   t_symbol*		root;
-   t_symbol* 		path; //Path(name) of the param
-   t_symbol*    	send;
-   t_symbol*		receive; 
-   t_symbol* 		selector; //Type of data stored
-   int			 	alloc; //Memory allocated
-   int 				ac; //Number of values stored
-   t_atom* 			av; //Values stored
-   struct param* 	next; //Next param
-   struct param* 	previous; //Previous param
-   int 				users; //Number of param objects using this param
-   //t_symbol* 		id; //The base id
-   int 				ac_g; //Gui argument count
-   t_atom*			av_g; //Gui argument values
-};
-
-struct paramroot {
+//struct _paramroot;
+
+typedef struct _param {
+   t_symbol*			root;
+   t_symbol* 			path; //Path(name) of the param
+   void*				x;
+   struct _param* 		next; //Next param
+   struct _param* 		previous; //Previous param
+   t_paramGetMethod		get; //Function to get current value
+   t_paramSaveMethod	save; //Function to save
+   t_paramGUIMethod		GUI;
+   //t_symbol*			send;
+   //t_symbol*			receive;
+} t_param;
+
+typedef struct _paramroot {
 	t_symbol*			root;
-	struct param* 		params; //param list
-	struct paramroot* 	next; //Next paramroot
-    struct paramroot* 	previous; //Previous paramroot
-};
-
-struct paramroot* paramroots;
+	t_param* 			params; //param list
+	struct _paramroot* 	next; //Next paramroot
+    struct _paramroot* 	previous; //Previous paramroot
+} t_paramroot;
 
-//struct param* paramlist;
+t_paramroot* PARAMROOTS;
 
 
-static void set_param_anything( struct param* p, t_symbol* s, int ac, t_atom *av) {
+static t_paramroot* param_get_root(t_symbol* root) {
 	
-	if ( s == &s_bang || ac == 0 ) {
-		p->ac = 0;
-		p->selector = s;
-	} else {
-		if(ac > p->alloc) {	
-			p->av = resizebytes(p->av, p->alloc*sizeof(*(p->av)), 
-				(10 + ac)*sizeof(*(p->av)));
-			p->alloc = 10 + ac;
-		}
-		p->ac = ac;
-		p->selector = s;
-		tof_copy_atoms(av, p->av, ac);
-    }
-}
-
-
-static void set_param( struct param* p, int ac, t_atom *av) {
-	t_symbol* s;
-	tof_set_selector(&s,&ac, &av );
-	set_param_anything(p,s,ac,av);
-}
-
-
-static struct paramroot* param_get_root(t_symbol* root) {
-	
-	if (paramroots == NULL) {
+	if (PARAMROOTS == NULL) {
 		#ifdef PARAMDEBUG
 		post("Could not get...not even one root created");
 		#endif
@@ -74,7 +46,7 @@ static struct paramroot* param_get_root(t_symbol* root) {
 	
 	
 	// Pointer to the start of paramroots
-	struct paramroot* branch = paramroots;
+	t_paramroot* branch = PARAMROOTS;
 		
 		while( branch ) {
 			if ( branch->root == root) {
@@ -94,10 +66,10 @@ static struct paramroot* param_get_root(t_symbol* root) {
 }
 
 
-static struct paramroot* param_root_attach(t_symbol* root){
+static t_paramroot* param_root_attach(t_symbol* root){
 		
 		// Pointer to the start of paramroots
-		struct paramroot* branch = paramroots;
+		t_paramroot* branch = PARAMROOTS;
 		
 		while( branch ) {
 			if ( branch->root == root) {
@@ -118,7 +90,7 @@ static struct paramroot* param_root_attach(t_symbol* root){
 		#endif
 		
 		// Create and add paramroot to the end
-		struct paramroot* newbranch = getbytes(sizeof(*newbranch));
+		t_paramroot* newbranch = getbytes(sizeof(*newbranch));
 		newbranch->root = root;
 		newbranch->next = NULL;
 		newbranch->params = NULL;
@@ -134,7 +106,7 @@ static struct paramroot* param_root_attach(t_symbol* root){
 				post("Creating first root");
 			#endif
 			newbranch->previous = NULL;
-			paramroots = newbranch;
+			PARAMROOTS = newbranch;
 		}
 		
 		
@@ -144,10 +116,10 @@ static struct paramroot* param_root_attach(t_symbol* root){
 
 
 
-static struct param* get_param_list(t_symbol* root) {
+static t_param* get_param_list(t_symbol* root) {
 	
 	
-	struct paramroot* branch = param_get_root(root);
+	t_paramroot* branch = param_get_root(root);
 	if (branch) {
 		
 	#ifdef PARAMDEBUG
@@ -165,12 +137,13 @@ static struct param* get_param_list(t_symbol* root) {
 static t_symbol* param_get_name ( int ac, t_atom* av  ) {
 	
 	if (ac  && IS_A_SYMBOL(av, 0)) {
-		char *firstChar =  (atom_getsymbol(av))->s_name;
-		if (*firstChar == *param_separator) {
-			return atom_getsymbol(av);
+		char* name =  atom_getsymbol(av)->s_name;
+		if (*name == *param_separator ) {
+			int length = strlen(name);
+			if (name[length-1] != '_') return atom_getsymbol(av);
 		 }
 	} 
-	post("param requires a name that starts with a \"/\"");
+	post("param names must start with a \"/\" and can not end with a \"_\"!");
 	return NULL;
 }
 
@@ -198,7 +171,7 @@ static t_symbol* param_get_path( t_canvas* i_canvas,  t_symbol* name) {
 	   // Ignore all supatches
 	   if ( tof_canvas_is_not_subpatch(i_canvas) ) {
 		tof_get_canvas_arguments(i_canvas,&i_ac, &i_av);
-		id_temp=tof_get_canvas_name(i_canvas);
+		id_temp=NULL;
 		//id_temp= canvas_realizedollar(i_canvas, gensym("$0"));
 		int ac_a = 0;
 		t_atom* av_a = NULL;
@@ -215,7 +188,12 @@ static t_symbol* param_get_path( t_canvas* i_canvas,  t_symbol* name) {
 				//found_id_flag = 1;
 	           	break;
 			}
-		}	        
+		}
+		
+		if (id_temp == NULL) {
+			
+			id_temp = tof_remove_extension(tof_get_canvas_name(i_canvas));	    
+		}    
         // if ever an /id is missing, this param is not saveable
         //if (found_id_flag == 0)  saveable = 0;
         
@@ -230,8 +208,6 @@ static t_symbol* param_get_path( t_canvas* i_canvas,  t_symbol* name) {
   //strcat(sbuf_name,separator);
   if ( name != NULL) {
 	  strcat(sbuf_name,name->s_name);
-  } else {
-	  strcat(sbuf_name, param_separator);
   }
   
   return gensym(sbuf_name);
@@ -245,25 +221,23 @@ static t_symbol* param_get_path( t_canvas* i_canvas,  t_symbol* name) {
 
 //static struct param* register_param( t_canvas* canvas, int o_ac, t_atom* o_av) {
 
-static struct param* param_register(t_symbol* root, t_symbol* path, int ac, t_atom* av,int ac_g, t_atom* av_g) {
+static t_param* param_register(void* x,t_symbol* root, t_symbol* path,\
+ t_paramGetMethod get, t_paramSaveMethod save, t_paramGUIMethod GUI) {
 	
 			
      //char *separator = "/";
 		
-		
-		
 		/* GET POINTER TO PARAMLIST FOR THAT ROOT  */
-		struct paramroot* branch = param_root_attach(root);
-        struct param* last = branch->params;
+		t_paramroot* branch = param_root_attach(root);
+        t_param* last = branch->params;
 		
 		// Search for param with same path
 		while( last ) {
 			if ( last->path == path) {
-				#ifdef PARAMDEBUG
-				  post("Found param with same name");
-				#endif
-				last->users = last->users + 1;
-				return last;
+				
+				  pd_error(x,"Found param with same name: %s", path->s_name);
+				
+				return NULL;
 			}
 			if ( last->next == NULL ) break;
 			last = last->next; 
@@ -271,29 +245,29 @@ static struct param* param_register(t_symbol* root, t_symbol* path, int ac, t_at
 		
 		// Create and add param to the end
 		
-		
-		
-		
-		struct param* p = getbytes(sizeof(*p));
+		t_param* p = getbytes(sizeof(*p));
 		p->root = root;
-		p->alloc = 0;
+		//p->alloc = 0;
 		p->path = path;
 		
 		// Create receive and send symbols: $0/path
-		strcpy(param_buf_temp_a,p->root->s_name);  
+		//strcpy(param_buf_temp_a,p->root->s_name);  
 		//strcat(param_buf_temp_a,separator);
-		strcat(param_buf_temp_a,p->path->s_name);
-		p->receive = gensym(param_buf_temp_a);
-		strcat(param_buf_temp_a,"_");  
-		p->send = gensym(param_buf_temp_a);
+		//strcat(param_buf_temp_a,p->path->s_name);
+		//p->receive = gensym(param_buf_temp_a);
+		//strcat(param_buf_temp_a,"_");  
+		//p->send = gensym(param_buf_temp_a);
 		
 		p->next = NULL;
-		p->users = 1;
+		p->x = x;
+		p->get = get;
+		p->save = save;
+		p->GUI = GUI;
 		//p->id = id;
-		set_param( p, ac, av);
-		p->ac_g = ac_g;
-		p->av_g = getbytes(ac_g*sizeof(*(p->av_g)));
-		tof_copy_atoms(av_g,p->av_g,ac_g);
+		//set_param( p, ac, av);
+		//p->ac_g = ac_g;
+		//p->av_g = getbytes(ac_g*sizeof(*(p->av_g)));
+		//tof_copy_atoms(av_g,p->av_g,ac_g);
 		if (last) {
 			#ifdef PARAMDEBUG
 			  post("Appending param");
@@ -313,16 +287,16 @@ static struct param* param_register(t_symbol* root, t_symbol* path, int ac, t_at
    
 }
 
-static void param_unregister(struct param* p) {
+static void param_unregister(t_param* p) {
 	
 	//post("unregistering %s", p->path->s_name);
-	struct paramroot* branch = param_get_root(p->root);
-	struct param* paramlist = branch->params;
+	t_paramroot* branch = param_get_root(p->root);
+	t_param* paramlist = branch->params;
 	
 	if ( paramlist) {
 
-		p->users = p->users - 1;
-		if ( p->users == 0 ) {
+		//p->users = p->users - 1;
+		//if ( p->users == 0 ) {
 			// Remove param
 			//post("Removing last param of this name");
 			if (p->previous) {
@@ -339,10 +313,10 @@ static void param_unregister(struct param* p) {
 				paramlist = p->next;
 				if ( p->next != NULL) p->next->previous = NULL;
 			}
-			freebytes(p->av, p->alloc * sizeof *(p->av) );
-			freebytes(p->av_g, p->ac_g * sizeof *(p->av_g) );
+			//freebytes(p->av, p->alloc * sizeof *(p->av) );
+			//freebytes(p->av_g, p->ac_g * sizeof *(p->av_g) );
 			freebytes(p, sizeof *p);
-		}
+		//}
 		
 		// Update the params for that root
 		if (paramlist == NULL) {
@@ -350,7 +324,7 @@ static void param_unregister(struct param* p) {
 				branch->previous->next = branch->next;
 					if (branch->next) branch->next->previous = branch->previous;
 			} else {
-				paramroots = branch->next;
+				PARAMROOTS = branch->next;
 				if ( branch->next != NULL) branch->next->previous = NULL;
 			}
 			#ifdef PARAMDEBUG
@@ -370,175 +344,3 @@ static void param_unregister(struct param* p) {
 
 
 
-
-static void param_send_prepend(struct param *p, t_symbol* s,t_symbol* prepend) {
-	
-	if (p) {
-	   if((p->selector == &s_bang)) {
-			// if (s->s_thing) 
-			  //   pd_bang(s->s_thing);
-	  } else {
-		if (s->s_thing) {
-			if ( p->selector == &s_list || p->selector == &s_float || p->selector == &s_symbol ) {
-				typedmess(s->s_thing, prepend, p->ac, p->av);
-			} else {
-			int ac = p->ac + 1;
-			t_atom *av = getbytes(ac*sizeof(*av));	
-			tof_copy_atoms(p->av,av+1,p->ac);
-			SETSYMBOL(av, p->selector);
-			typedmess(s->s_thing, prepend, ac, av);
-			freebytes(av, ac*sizeof(*av));
-		}
-		}
-	  }
-	}
-}
-
-static void param_output(struct param *p, t_outlet* outlet) {
-	// SHOULD I COPY THIS DATA BEFORE SENDING IT OUT?
-	// OR IS THE NORM TO ONLY COPY ON INPUT?
-	if (p) {
-		if(!(p->selector == &s_bang) ) {
-			
-			outlet_anything(outlet, p->selector, p->ac, p->av);
-		}
-	}	
-}
-
-
-static void param_output_prepend(struct param* p, t_outlet* outlet, t_symbol* s) {
-	
-	if (p->selector == &s_list || p->selector == &s_float  || p->selector == &s_symbol) {
-			//t_atom *av = (t_atom *)getbytes(p->ac*sizeof(t_atom));	
-			//tof_copy_atoms(p->av,av,p->ac);
-			outlet_anything(outlet,s,p->ac,p->av);
-			//freebytes(av, p->ac*sizeof(t_atom));
-	} else if (p->selector != &s_bang) {
-			int ac = p->ac + 1;
-			t_atom *av = (t_atom *)getbytes(ac*sizeof(t_atom));	
-			tof_copy_atoms(p->av,av+1,p->ac);
-			SETSYMBOL(av, p->selector);
-			outlet_anything(outlet,s,ac,av);
-			freebytes(av, ac*sizeof(t_atom));
-	} else if (p->selector == &s_bang) {
-		outlet_anything(outlet,s,0,NULL);
-	}
-	
-}
-
-
-// Write will only save the params that share the same root
-static int param_write(t_canvas* canvas, t_symbol* filename) {
-	
-	
-	int w_error;
-	
-	//t_symbol* filename = param_makefilename(basename, n);
-		
-	t_binbuf *bbuf = binbuf_new();
-	
-	struct param *p = get_param_list(tof_get_dollarzero(canvas));
-	while(p) {
-	    if ((p->selector != &s_bang)) {
-			int ac = p->ac + 2;
-			t_atom *av = getbytes(ac*sizeof(*av));	
-			tof_copy_atoms(p->av,av+2,p->ac);
-			SETSYMBOL(av, p->path);
-			SETSYMBOL(av+1, p->selector);
-			binbuf_add(bbuf, ac, av);
-			binbuf_addsemi(bbuf);
-			
-			freebytes(av, ac*sizeof(*av));
-		}
-		p = p->next;
-	}
-	
-	
-    char buf[MAXPDSTRING];
-    canvas_makefilename(canvas, filename->s_name,
-        buf, MAXPDSTRING);
-		
-	
-    w_error = (binbuf_write(bbuf, buf, "", 0));
-            //pd_error("%s: write failed", filename->s_name);
-			
-	binbuf_free(bbuf);
-	
-	return w_error;
-    
-}
-
-
-static int param_read(t_canvas* canvas, t_symbol* filename)
-{
-	
-	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, canvas, 0));
-            //pd_error(x, "%s: read failed", filename->s_name);
-			
-    t_symbol* root = tof_get_dollarzero(canvas);
-	
-	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);
-	
-	return r_error;
-}
-
-
-
-